cross/musl-aarch64/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=musl-aarch64
 pkgver=1.2.1
-pkgrel=0
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-aarch64:package_dev"
 
@@ -55,5 +55,5 @@ package_dev() {
 	done
 }
 
-sha512sums="a13254467276c66d76fb9e11b8b122438283ebdeec6bee0717aa4100585088cb00d6a20b275fa654067c867a345a886fe599e4b2ef6d3e37503596f2592421ef  musl-1.2.1-r0-aarch64-edge.apk
-b8c322bcbe329c16532a1a211ff0b78c6e4e054377e8d7cafa722cb8b679f7259355c8cf8a58fbc6c4d769bc7078750f644d8229b2c1abdbc457e9090d24e483  musl-dev-1.2.1-r0-aarch64-edge.apk"
+sha512sums="18ff8ec3e6602c87aced5c331afccca6a10baf601fb69a59c6e1a74abe4703d6205fc0db742a59aaa8d4b28050e7a62300cd533576ca52186ba61b1f2619a7a4  musl-1.2.1-r1-aarch64-edge.apk
+28decf7390436548c8c17ec3e8c792e2f46a4111a77ff3293173f537080db844a3c4afe52a211e7c813cdfb317ddd9210d9265f33d5d2a0333f367c1d7b64a5d  musl-dev-1.2.1-r1-aarch64-edge.apk"

cross/musl-armhf/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=musl-armhf
 pkgver=1.2.1
-pkgrel=0
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-armhf:package_dev"
 
@@ -55,5 +55,5 @@ package_dev() {
 	done
 }
 
-sha512sums="73200460c7cb8ea47a2e942293f83074960683de8a82ec8b3e9a545a03595d876eb18bbe1e4f971c5b8d07a6d3c404be28e0e2620e00bf1e0db173aba87aa2ec  musl-1.2.1-r0-armhf-edge.apk
-f5e46d6561f7dfbd7a1e79b0c3cb69e0c72b88d04eb41b07375a1fee935d09b0cdb4522800b7a942d8a6e114b21dd249062cf4ab3353ec76443f78265a17c07f  musl-dev-1.2.1-r0-armhf-edge.apk"
+sha512sums="50372b70260b52630766fbb36e5cac6f47f8c6d7a68651199290da917b3c540ff02644fc9830d8ae4f2fd94b016b2a2c602540bd91684f080bba412699b875a4  musl-1.2.1-r1-armhf-edge.apk
+ed226e5586a072020597d808a9f41f7e2e5b9b36a25a05f991dff57ec7915fdc6160e2be4c3f6e36376adc7da4fc3e6ba064ee876eff47cb81c6804c5932931c  musl-dev-1.2.1-r1-armhf-edge.apk"

cross/musl-armv7/APKBUILD

@@ -8,7 +8,7 @@ fi
 
 pkgname=musl-armv7
 pkgver=1.2.1
-pkgrel=0
+pkgrel=1
 arch="x86_64"
 subpackages="musl-dev-armv7:package_dev"
 
@@ -55,5 +55,5 @@ package_dev() {
 	done
 }
 
-sha512sums="88f309de312534f8200b5dd81019665b34f7befee8c2f24ed083e5cdaaeb05df8c08b10b966bbd60cc5cbd7e84295e8e4db2399159b266818a0e34518f8e474f  musl-1.2.1-r0-armv7-edge.apk
-01a968b057c16f736b5170348f3f6344a80525f45b7d94bbd3a5ac895998a3735d6637f3f5e8481b1078df6a297fd801ec56f72f050df751999fa0c95cfc1b24  musl-dev-1.2.1-r0-armv7-edge.apk"
+sha512sums="91a17267495395f9eb845ae719083f2b89b8b97a2c3bcf5b6e571ffb0c96b998916081fe4ff84c6d54b91ee5a34071641bf0a13b1e58301c1ba44817efa54e36  musl-1.2.1-r1-armv7-edge.apk
+432cb923a34bd6c41b2e18f2a59f61cbdb1730743f85d1353b1da6582c5cc5ac75185059062feb18b90738d8e1e8aa4983dbc073681928433dabe3c8acaaf2b5  musl-dev-1.2.1-r1-armv7-edge.apk"

device/testing/device-asus-grouper/APKBUILD

 # Maintainer: David Heidelberg <david@ixit.cz>
 pkgname=device-asus-grouper
 pkgdesc="Google Nexus 7 2012 (grouper)"
-pkgver=2
-pkgrel=8
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-asus-grouper mkbootimg mesa-dri-gallium"
+depends="postmarketos-base mkbootimg mesa-dri-gallium"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-phosh
-	     $pkgname-nonfree-firmware:nonfree_firmware"
+	$pkgname-kernel-e1565:kernel_e1565
+	$pkgname-kernel-pm269:kernel_pm269
+	$pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo
 	rootston.ini"
 
@@ -28,6 +30,18 @@ phosh() {
 		"$subpkgdir"/etc/phosh/rootston.ini
 }
 
+kernel_e1565() {
+	pkgdesc="Mainline kernel for HW rev. E1565 (newer devices)"
+	depends="linux-asus-grouper"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
+kernel_pm269() {
+	pkgdesc="Mainline kernel for HW rev. PM269 (older devices)"
+	depends="linux-asus-grouper"
+	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
+}
+
 nonfree_firmware() {
 	pkgdesc="Google Nexus 7 (2012) WiFi & BT firmware"
 	depends="firmware-asus-grouper firmware-aosp-broadcom-wlan-mainline"
@@ -35,5 +49,5 @@ nonfree_firmware() {
 	mkdir "$subpkgdir"
 }
 
-sha512sums="8df34852eb0d9e1a33dc14cfc8f6f37819b8e70ed9be4b21fb6b1a3d15b7eb28460f16022f316fc39a0d3624d0a7d357dd8635283c697a05f41ca43fac8d1965  deviceinfo
+sha512sums="44b7f4fda803b64802fb562b08d6ec8eb249959c4ca7b29aaa6b2248b42bfda876aa721987bc3385993e7f3fb70fe48e8dd4fdaa23a343bfb499cf0a20635a31  deviceinfo
 6ec993e278d2a73c72fb96f001716ded63543d99183847d22d172cd81ac410791c79370ecf391d0c24822c975d91b84dc1db296e1b28dbf66d5c227bff8d4011  rootston.ini"

device/testing/device-asus-grouper/deviceinfo

@@ -6,7 +6,8 @@ deviceinfo_name="Google Nexus 7 2012 Wifi"
 deviceinfo_manufacturer="Asus"
 deviceinfo_codename="asus-grouper"
 deviceinfo_year="2012"
-deviceinfo_dtb="tegra30-asus-nexus7-grouper-E1565"
+deviceinfo_dtb_e1565="tegra30-asus-nexus7-grouper-E1565"
+deviceinfo_dtb_pm269="tegra30-asus-nexus7-grouper-PM269"
 deviceinfo_append_dtb="true"
 deviceinfo_modules_initfs=""
 deviceinfo_arch="armv7"