motorola-montana: use aarch64 (!581)

[ci:skip-build]

device/device-motorola-montana/APKBUILD

@@ -2,10 +2,10 @@
 pkgname="device-motorola-montana"
 pkgdesc="Motorola Moto G5s"
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
-arch="armv7"
+arch="aarch64"
 options="!check !archcheck"
 depends="postmarketos-base linux-motorola-montana mkbootimg mesa-dri-swrast msm-fb-refresher"
 makedepends="devicepkg-dev"
@@ -20,5 +20,5 @@ package() {
 }
 
 
-sha512sums="4d1d55b0205f506e0f85f00e0a02ff294ff37bac928da98d7b9935971afb6a98adf3af4099e3149cf57c4bfc8ca782885afe580ab2938883db3b2fab1eaf6e11  deviceinfo
+sha512sums="ae8c2996ca7e9143b4c86c0591a58084c1a81148c4bb61d9dfa0cdba7a7a788d5fce0e6df8086b2cdeeffa0dde6d4df8fe5db0f72249d84d4bdaa57d72d66753  deviceinfo
 aa012cf1940af94fd7b9ec9da6ebe94ce9315d8fb920c4c39e9c08bf409fff3c697d0f045f2d1a2adaa40c99dc9748a0aeb64f55d1dd4ae9999276c70db3314b  initfs-hook.sh"

device/device-motorola-montana/deviceinfo

@@ -8,7 +8,7 @@ deviceinfo_codename="motorola-montana"
 deviceinfo_date=""
 deviceinfo_dtb=""
 deviceinfo_modules_initfs=""
-deviceinfo_arch="armv7"
+deviceinfo_arch="aarch64"
 
 # Device related
 deviceinfo_keyboard="false"

device/linux-motorola-montana/APKBUILD

@@ -1,12 +1,12 @@
 # Reference: <https://postmarketos.org/vendorkernel>
-# Kernel config based on: arch/arm/configs/montana_defconfig
+# Kernel config based on: arch/arm64/configs/montana_defconfig
 
 pkgname="linux-motorola-montana"
-pkgver=3.18.71
+pkgver=3.18.140
 pkgrel=0
 pkgdesc="Motorola Moto G5s kernel fork"
-arch="armv7"
-_carch="arm"
+arch="aarch64"
+_carch="arm64"
 _flavor="motorola-montana"
 url="https://kernel.org"
 license="GPL-2.0-only"
@@ -18,19 +18,18 @@ HOSTCC="${CC:-gcc}"
 HOSTCC="${HOSTCC#${CROSS_COMPILE}}"
 
 # Source
-_repository="kernel-msm"
-_commit="oreo-8.1.0-release"
+_repository="android_kernel_motorola_msm8937"
+_commit="1e8993177823e4ddf3b5d91da6335d75ad513dec"
 _config="config-${_flavor}.${arch}"
 source="
-	$pkgname-$_commit.tar.gz::https://github.com/kubast2/${_repository}/archive/${_commit}.tar.gz 
+	$pkgname-$_commit.tar.gz::https://github.com/MontanaDevelopment/${_repository}/archive/${_commit}.tar.gz 
 	$_config
-	gcc8-fix-put-user.patch
 "
 builddir="$srcdir/${_repository}-${_commit}"
 
 prepare() {
 	default_prepare
-	REPLACE_GCCH=0 downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
+	downstreamkernel_prepare "$srcdir" "$builddir" "$_config" "$_carch" "$HOSTCC"
 }
 
 build() {
@@ -50,7 +49,7 @@ package() {
 	# zImage (find the right one)
 	cd "$builddir/arch/$_carch/boot"
 	_target="$pkgdir/boot/vmlinuz-$_flavor"
-	for _zimg in zImage-dtb Image.gz-dtb *zImage Image; do
+	for _zimg in zImage-dtb Image.gz-dtb *zImage Image.gz Image; do
 		[ -e "$_zimg" ] || continue
 		msg "zImage found: $_zimg"
 		install -Dm644 "$_zimg" "$_target"
@@ -66,6 +65,5 @@ package() {
 		"$pkgdir/boot/dt.img"
 }
 
-sha512sums="d84030635b95fde39fe92e5eb79c288c1096a276930cd204ad18119d759f785ca7a0647bb16fd2eaa17c0635ed66e5c2324ef454324e83b5fd678e29e05c926c  linux-motorola-montana-oreo-8.1.0-release.tar.gz
-cd15d24513982b5ce1332cd353f84774eab0d7ac76a8b20a920fc78ee57d3925d25f63171474e959e2018a03401ba7acfa35f4f668f7b1d10d69bd5839b73b2f  config-motorola-montana.armv7
-197d40a214ada87fcb2dfc0ae4911704b9a93354b75179cd6b4aadbb627a37ec262cf516921c84a8b1806809b70a7b440cdc8310a4a55fca5d2c0baa988e3967  gcc8-fix-put-user.patch"
+sha512sums="369dfffb8088958226b1a259705f4af1e5e9b02d32fde4cd9f9c50f2165658a187f5aa74badff77761a02c2c088484789267db6afbcc3e802dd62b1e819553c0  linux-motorola-montana-1e8993177823e4ddf3b5d91da6335d75ad513dec.tar.gz
+3d05f43f3c3ca5afc5bc46aeb7b08ffda78ca6b146bf9d8969c14da3b62ae9fa83dab85cac291aadf9ee4d182e98d6d56f8da9324681a6b697e22456c9fbbee5  config-motorola-montana.aarch64"

device/linux-motorola-montana/gcc8-fix-put-user.patch

@@ -1 +0,0 @@
-../../.shared-patches/linux/gcc8-fix-put-user.patch