From 16c617997788fca1708120ebf96b53675b7fd9be Mon Sep 17 00:00:00 2001
From: magnouvean <c6af1d08-d039-472f-b890-6eaf2e96e961@anonaddy.me>
Date: Sun, 22 May 2022 12:49:40 +0200
Subject: [PATCH] motorola-lux: changed arch from armhf to armv7 (MR 3145)
Note from merger (Newbyte):
While this device is aarch64, switching to aarch64 comes with issues
and would need more work than a vendor kernel like this is worth.
Use armv7 for now and hopefully mainline it in the future and switch
to aarch64 then.
[ci:skip-build] Already built successfuly on CI in MR
---
device/testing/device-motorola-lux/APKBUILD | 8 ++++----
device/testing/device-motorola-lux/deviceinfo | 2 +-
device/testing/linux-motorola-lux/APKBUILD | 12 +++++++-----
...-motorola-lux.armhf => config-motorola-lux.armv7} | 0
4 files changed, 12 insertions(+), 10 deletions(-)
rename device/testing/linux-motorola-lux/{config-motorola-lux.armhf => config-motorola-lux.armv7} (100%)
diff --git a/device/testing/device-motorola-lux/APKBUILD b/device/testing/device-motorola-lux/APKBUILD
index 3e98a48f965..c12bb9ce30e 100644
--- a/device/testing/device-motorola-lux/APKBUILD
+++ b/device/testing/device-motorola-lux/APKBUILD
@@ -1,11 +1,11 @@
# Reference: <https://postmarketos.org/devicepkg>
pkgname=device-motorola-lux
pkgdesc="Motorola Moto X Play"
-pkgver=0.2
-pkgrel=7
+pkgver=0.3
+pkgrel=0
url="https://postmarketos.org"
license="MIT"
-arch="armhf"
+arch="armv7"
options="!check !archcheck"
depends="postmarketos-base linux-motorola-lux mkbootimg mesa-dri-gallium msm-fb-refresher"
makedepends="devicepkg-dev"
@@ -20,6 +20,6 @@ package() {
}
sha512sums="
-55120fadb739a97cedd12572643b2bfa3970ee813ed7a8badb688824bdafc19883b278360e356b857d476b1462f00ea343727418447e9fc9ad65656f4dd929ef deviceinfo
+dd7b7f9e5cd065f6a569ba27df3e1dafe1ec648d426e60df486217b78d298606381a3656003a09c633a3e34f864535c3a2aed3a59a8548213866c15bd7cfb21f deviceinfo
1777c382a73b6e45ee6b4f34b1fd996ad1bae42801dec6de6742f9bf6bf0a0fb5648a7b51ac5b79b7df6d026deca3d4b14a13fae02938e845ed564a9a741c171 initfs-hook.sh
"
diff --git a/device/testing/device-motorola-lux/deviceinfo b/device/testing/device-motorola-lux/deviceinfo
index a0389f6fdc2..0617fce30b3 100644
--- a/device/testing/device-motorola-lux/deviceinfo
+++ b/device/testing/device-motorola-lux/deviceinfo
@@ -6,7 +6,7 @@ deviceinfo_name="Motorola Moto X Play"
deviceinfo_manufacturer="Motorola"
deviceinfo_codename="motorola-lux"
deviceinfo_year="2015"
-deviceinfo_arch="armhf"
+deviceinfo_arch="armv7"
# Device related
deviceinfo_chassis="handset"
diff --git a/device/testing/linux-motorola-lux/APKBUILD b/device/testing/linux-motorola-lux/APKBUILD
index 39e77ebdf5f..c75a554bb65 100644
--- a/device/testing/linux-motorola-lux/APKBUILD
+++ b/device/testing/linux-motorola-lux/APKBUILD
@@ -3,9 +3,9 @@
pkgname=linux-motorola-lux
pkgver=3.10.49
-pkgrel=3
+pkgrel=4
pkgdesc="Motorola Moto X Play kernel fork"
-arch="armhf"
+arch="armv7"
_carch="arm"
_flavor="motorola-lux"
url="https://kernel.org"
@@ -49,9 +49,11 @@ package() {
"$pkgdir/boot/dt.img"
}
-sha512sums="eb22bf2f84cdac011563c5d92e38e1b5b25f5247fd8aa658175518846a44841c8c30d7d7279c92400cd0e7e2cb48100c79815361851f9081224d1d1d63f45e38 linux-motorola-lux-d86037d30519f2e1f26af75bdcf11a74d08dfed4.tar.gz
-ac927cf8811b705ed9c7405ea68d2415b8150abd7f23e460359abaccd4311d3ad2472c38b6030a8c1513e14c0be56bc8e3257c21fabb3eef6736a8a72790f90e config-motorola-lux.armhf
+sha512sums="
+eb22bf2f84cdac011563c5d92e38e1b5b25f5247fd8aa658175518846a44841c8c30d7d7279c92400cd0e7e2cb48100c79815361851f9081224d1d1d63f45e38 linux-motorola-lux-d86037d30519f2e1f26af75bdcf11a74d08dfed4.tar.gz
+ac927cf8811b705ed9c7405ea68d2415b8150abd7f23e460359abaccd4311d3ad2472c38b6030a8c1513e14c0be56bc8e3257c21fabb3eef6736a8a72790f90e config-motorola-lux.armv7
77eba606a71eafb36c32e9c5fe5e77f5e4746caac292440d9fb720763d766074a964db1c12bc76fe583c5d1a5c864219c59941f5e53adad182dbc70bf2bc14a7 gcc7-give-up-on-ilog2-const-optimizations.patch
197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967 gcc8-fix-put-user.patch
2b48f1bf0e3f70703d2cdafc47d5e615cc7c56c70bec56b2e3297d3fa4a7a1321d649a8679614553dde8fe52ff1051dae38d5990e3744c9ca986d92187dcdbeb gcc10-extern_YYLOC_global_declaration.patch
-ad0182a483791fc88e058838bc331b2f04a75ba291e763767babdb815efadfc3b4fda97e69e2e3f00a426cabea088e35297a92bd287592597d1e309be68ee92c kernel-use-the-gnu89-standard-explicitly.patch"
+ad0182a483791fc88e058838bc331b2f04a75ba291e763767babdb815efadfc3b4fda97e69e2e3f00a426cabea088e35297a92bd287592597d1e309be68ee92c kernel-use-the-gnu89-standard-explicitly.patch
+"
diff --git a/device/testing/linux-motorola-lux/config-motorola-lux.armhf b/device/testing/linux-motorola-lux/config-motorola-lux.armv7
similarity index 100%
rename from device/testing/linux-motorola-lux/config-motorola-lux.armhf
rename to device/testing/linux-motorola-lux/config-motorola-lux.armv7
--
GitLab