From 29d3abe94dde67d05103f759f3022f9c0020e8e5 Mon Sep 17 00:00:00 2001
From: Brendan Hardy <bhardy0630@gmail.com>
Date: Fri, 9 Sep 2022 15:11:10 -0700
Subject: [PATCH] motorola-shamu: port from armhf to armv7 (MR 3415)

[ci:skip-vercheck]
---
 device/testing/device-motorola-shamu/APKBUILD        |  8 ++++----
 device/testing/device-motorola-shamu/deviceinfo      |  2 +-
 device/testing/linux-motorola-shamu/APKBUILD         | 12 +++++++-----
 ...orola-shamu.armhf => config-motorola-shamu.armv7} |  0
 4 files changed, 12 insertions(+), 10 deletions(-)
 rename device/testing/linux-motorola-shamu/{config-motorola-shamu.armhf => config-motorola-shamu.armv7} (100%)

diff --git a/device/testing/device-motorola-shamu/APKBUILD b/device/testing/device-motorola-shamu/APKBUILD
index 9c312e17f..b1b99c7b4 100644
--- a/device/testing/device-motorola-shamu/APKBUILD
+++ b/device/testing/device-motorola-shamu/APKBUILD
@@ -1,11 +1,11 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-motorola-shamu
 pkgdesc="Motorola Google Nexus 6"
-pkgver=0.3
-pkgrel=14
+pkgver=0.4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
-arch="armhf"
+arch="armv7"
 options="!check !archcheck"
 depends="postmarketos-base linux-motorola-shamu mkbootimg msm-fb-refresher"
 makedepends="devicepkg-dev"
@@ -20,6 +20,6 @@ package() {
 }
 
 sha512sums="
-2b4c741cdbb699ca1ecbd19020f706ced7a7f83d527eceba8bbc84a26a5c48b34e4f0a9b69d79c68c91d00495b09911ffc8068129c0d0f8a0d556efa3d1c46cc  deviceinfo
+ad2ae6c1f19ad5cc548b32dbd592c9da876a3964844606c72eb2478208c3f13429148f6a9925786a02a9c33da953cbc011561277a5543d34aeb5f84e11d4788e  deviceinfo
 c4f4785a9fea1d8b461e1de4dcd04daae45bd9df94f8123655b981de5ac5718f082a59169c39c506aa996c1642f465249fbc8b6e1c0463aeca6abf74ff523d9c  initfs-hook.sh
 "
diff --git a/device/testing/device-motorola-shamu/deviceinfo b/device/testing/device-motorola-shamu/deviceinfo
index 249bdf176..cc2994078 100644
--- a/device/testing/device-motorola-shamu/deviceinfo
+++ b/device/testing/device-motorola-shamu/deviceinfo
@@ -6,7 +6,7 @@ deviceinfo_name="Google Nexus 6"
 deviceinfo_manufacturer="Motorola"
 deviceinfo_codename="motorola-shamu"
 deviceinfo_year="2014"
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 
 # Device related
 deviceinfo_chassis="handset"
diff --git a/device/testing/linux-motorola-shamu/APKBUILD b/device/testing/linux-motorola-shamu/APKBUILD
index 55443940a..d48e8b99c 100644
--- a/device/testing/linux-motorola-shamu/APKBUILD
+++ b/device/testing/linux-motorola-shamu/APKBUILD
@@ -2,9 +2,9 @@
 
 pkgname=linux-motorola-shamu
 pkgver=3.10.40
-pkgrel=5
+pkgrel=0
 pkgdesc="Motorola Google Nexus 6 kernel fork"
-arch="armhf"
+arch="armv7"
 _carch="arm"
 _flavor="motorola-shamu"
 url="https://kernel.org"
@@ -48,7 +48,9 @@ package() {
 	downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor"
 }
 
-sha512sums="2349f1ea66d3bf05675d91a8cf959bf683818c4aafc04b3ec60f8d0ee07dae1d38ade24b14a2457df733ed2db8249dba680a70992d5748806375b76b9cc47dc5  linux-motorola-shamu-0f791f84d1951e144f1e466ba97dd692d33d93c7.tar.gz
-698412fdf8c9e0ac4436ccc9eb9b206a831f88bab45f664ebe53aeaaa51143ce377694cc1ce55aa079aee80a6dc2661b266d4d76c7fb81d6d1eec5b4bf810fc3  config-motorola-shamu.armhf
+sha512sums="
+2349f1ea66d3bf05675d91a8cf959bf683818c4aafc04b3ec60f8d0ee07dae1d38ade24b14a2457df733ed2db8249dba680a70992d5748806375b76b9cc47dc5  linux-motorola-shamu-0f791f84d1951e144f1e466ba97dd692d33d93c7.tar.gz
+698412fdf8c9e0ac4436ccc9eb9b206a831f88bab45f664ebe53aeaaa51143ce377694cc1ce55aa079aee80a6dc2661b266d4d76c7fb81d6d1eec5b4bf810fc3  config-motorola-shamu.armv7
 ea1d3b5a234fa565e3c1a792de48f4fc4e6023d281d303c8e319c7ef28edc5739ab0e4dea0139a41f0a5c7d03e27921ccaa214fd0ac5c72245a094ce60128864  00_fix_return_address.patch
-2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch"
+2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb  gcc10-extern_YYLOC_global_declaration.patch
+"
diff --git a/device/testing/linux-motorola-shamu/config-motorola-shamu.armhf b/device/testing/linux-motorola-shamu/config-motorola-shamu.armv7
similarity index 100%
rename from device/testing/linux-motorola-shamu/config-motorola-shamu.armhf
rename to device/testing/linux-motorola-shamu/config-motorola-shamu.armv7