From 02f73e7e8a102873bcea4cb299096fcca4f369ff Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Fri, 4 Jan 2019 01:49:40 +0100
Subject: [PATCH] sony-amami: use armv7 (!126)

Tested it with Weston and it boots fine.

[skip ci]: already built in CI, no need to build again
---
 device/device-sony-amami/APKBUILD                         | 8 ++++----
 device/device-sony-amami/deviceinfo                       | 2 +-
 device/linux-sony-amami/APKBUILD                          | 6 +++---
 .../{config-sony-amami.armhf => config-sony-amami.armv7}  | 0
 firmware/firmware-sony-amami/APKBUILD                     | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)
 rename device/linux-sony-amami/{config-sony-amami.armhf => config-sony-amami.armv7} (100%)

diff --git a/device/device-sony-amami/APKBUILD b/device/device-sony-amami/APKBUILD
index d08b963c3..a1a29a971 100644
--- a/device/device-sony-amami/APKBUILD
+++ b/device/device-sony-amami/APKBUILD
@@ -1,9 +1,9 @@
 pkgname=device-sony-amami
-pkgver=2
-pkgrel=3
+pkgver=3
+pkgrel=0
 pkgdesc="Sony Xperia Z1 Compact"
 url="https://postmarketos.org"
-arch="armhf"
+arch="armv7"
 license="MIT"
 depends="postmarketos-base mkbootimg mdss-fb-init-hack mesa-dri-swrast"
 makedepends=""
@@ -43,6 +43,6 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="4a608461dbc39bb83f354b95caf655b7d137fec8b449e66359471fd5d39c323a045645c1b554619fd8e856b0da3820a282beae893edf5c729047d542de04c2b5  deviceinfo
+sha512sums="44b411fcb17f4bf08f917e5a06895818843bc6b7eceb5ca5945b6a865fcb857925dc355029438d5e9ad0a797b437dbfce2a5218426700a7e11412fe1711ae49f  deviceinfo
 8b6034c0338ab4c7d648f47983aad6da07e427e7dba47baabf85a1b3ddeeda47c8d7fbcd547a302c9a759b2943ee30d3e82c3b368d8582833a058e4671638a9e  90-android-touch-dev.rules
 4dc5b6a2d9de6b97e4033b14771b8a6afe922afcd0bc4c97481cfad775726109dd0570058b94b2cd805691343076e7d4d886218787ba883cc31dd1e6e3abb0af  fb.modes"
diff --git a/device/device-sony-amami/deviceinfo b/device/device-sony-amami/deviceinfo
index 489115a85..096526f1f 100644
--- a/device/device-sony-amami/deviceinfo
+++ b/device/device-sony-amami/deviceinfo
@@ -12,7 +12,7 @@ deviceinfo_dtb="qcom-msm8974-sony-xperia-amami"
 deviceinfo_modules_initfs=""
 deviceinfo_external_storage="true"
 deviceinfo_flash_method="fastboot"
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
 deviceinfo_generate_bootimg="true"
 
 # Splash screen
diff --git a/device/linux-sony-amami/APKBUILD b/device/linux-sony-amami/APKBUILD
index 1f6e5eb10..c1b3ccf16 100644
--- a/device/linux-sony-amami/APKBUILD
+++ b/device/linux-sony-amami/APKBUILD
@@ -3,9 +3,9 @@
 
 pkgname="linux-sony-amami"
 pkgver=3.10.84
-pkgrel=4
+pkgrel=5
 pkgdesc="Sony Xperia Z1 Compact kernel fork"
-arch="armhf"
+arch="armv7"
 _carch="arm"
 _flavor="sony-amami"
 url="https://kernel.org"
@@ -63,7 +63,7 @@ package() {
 }
 
 sha512sums="fae2299d9d36956be71f40ae724ac0a5069b53d440c114184f82495550c76743e9275e37ad00f6d4a012d32e91a580f424cdb1a1222647c5f2fd678a405a225f  linux-sony-amami-2134cafba220b32c43701368413ee333b41b7fe0.tar.gz
-0896618a3bb536dc5f8d9932fe704e8f279000207054039bf8df25e89fb9b2d7d70175cbc4af2ee42982ff7af39fd98c41ec5d79d517a36d9ac3fad5344ce615  config-sony-amami.armhf
+0896618a3bb536dc5f8d9932fe704e8f279000207054039bf8df25e89fb9b2d7d70175cbc4af2ee42982ff7af39fd98c41ec5d79d517a36d9ac3fad5344ce615  config-sony-amami.armv7
 77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7  gcc7-give-up-on-ilog2-const-optimizations.patch
 197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch
 b921570e799682d3ac6bff5dae2c7a69da24cd6988e57605fea0bd039e8b677e8335e11846c51798a5fb15011eaf0495fe6a410833a244319140798d7b70fea1  downstream-backport-getrandom.patch"
diff --git a/device/linux-sony-amami/config-sony-amami.armhf b/device/linux-sony-amami/config-sony-amami.armv7
similarity index 100%
rename from device/linux-sony-amami/config-sony-amami.armhf
rename to device/linux-sony-amami/config-sony-amami.armv7
diff --git a/firmware/firmware-sony-amami/APKBUILD b/firmware/firmware-sony-amami/APKBUILD
index 6a0eed821..da82abc31 100644
--- a/firmware/firmware-sony-amami/APKBUILD
+++ b/firmware/firmware-sony-amami/APKBUILD
@@ -1,9 +1,9 @@
 pkgname=firmware-sony-amami
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 pkgdesc="Firmware files for Xperia Z1 Compact"
 url="https://github.com/TheMuppets/proprietary_vendor_sony"
-arch="armhf"
+arch="armv7"
 license="proprietary"
 depends="wcnss-wlan"
 options="!strip !check !archcheck"