user/linux-rm: package zImage

user/linux-rm/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=linux-rm
 pkgver=5.4.70
 _rmver=1.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux kernel with reMarkable patches"
 url=https://github.com/reMarkable/linux
 depends="initramfs-generator linux-firmware-brcm linux-firmware-cypress"
@@ -141,18 +141,7 @@ _package() {
 
 	mkdir -p "$_outdir"/boot "$_outdir"/lib/modules
 
-	local _install
-	case "$CARCH" in
-	arm*)
-		_install="zinstall dtbs_install"
-		;;
-	aarch64)
-		_install="install dtbs_install"
-		;;
-	*)
-		_install=install
-		;;
-	esac
+	local _install="zinstall dtbs_install"
 
 	cd "$srcdir"/build-$_flavor
 	# modules_install seems to regenerate a defect Modules.symvers. Work
@@ -168,18 +157,15 @@ _package() {
 		INSTALL_DTBS_PATH="$INSTALL_DTBS_PATH"
 	cp Module.symvers.backup Module.symvers
 
+	cp "$_builddir"/arch/arm/boot/zImage "$_outdir"/boot/zImage
+	rm "$_outdir"/boot/vmlinuz-$_flavor
+
 	rm -f "$_outdir"/lib/modules/$_abi_release/build \
 		"$_outdir"/lib/modules/$_abi_release/source
 	rm -rf "$_outdir"/lib/firmware
 
 	install -D -m644 include/config/kernel.release \
 		"$_outdir"/usr/share/kernel/$_flavor/kernel.release
-
-	if [ "$CARCH" = "aarch64" ]; then
-		mv -f "$INSTALL_DTBS_PATH"/broadcom/*.dtb \
-			"$INSTALL_DTBS_PATH"
-		rmdir "$INSTALL_DTBS_PATH"/broadcom
-	fi
 }
 
 # main flavor installs in $pkgdir