From 2ec1db16b5958498e6f60203ea6915490e6b4a7e Mon Sep 17 00:00:00 2001
From: Dolphin von Chips <DoIphinChips@protonmail.com>
Date: Thu, 5 Mar 2020 17:26:23 +0500
Subject: [PATCH] main/devicepkg-dev: allow specifying kernel image in
 downstreamkernel_prepare (!1026)

---
 main/devicepkg-dev/APKBUILD                   |  4 +--
 .../devicepkg-dev/downstreamkernel_package.sh | 29 +++++++++++++------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/main/devicepkg-dev/APKBUILD b/main/devicepkg-dev/APKBUILD
index 842c6408f..6861cf7d7 100644
--- a/main/devicepkg-dev/APKBUILD
+++ b/main/devicepkg-dev/APKBUILD
@@ -1,5 +1,5 @@
 pkgname="devicepkg-dev"
-pkgver=0.11.2
+pkgver=0.11.3
 pkgrel=0
 pkgdesc="Provides default device package functions"
 url="https://postmarketos.org"
@@ -64,7 +64,7 @@ sha512sums="d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32
 332f693abfb3260ad6c1ef5d245062af8cc8eedba7db360d54db5a7fcf7b301a37a299a0004e9ff4de80b5dfcd260d0cd0f99f96ed6d56080bb4dea81116cc82  devicepkg_build.sh
 5ac4a5087c598582cb12278a4ce0c2dccfe7f91c1620d3328d1d0944c89eff81f8afcc681506d73a80d69615401f96a99fb1fdaa755fea101e0d36ec6ef2d5d0  devicepkg_package.sh
 69dad4bde05377ec235d72789c80cdfbdaa5a19b97defe9d4c19e0e12aa2c081d6dcf19fb80ebe33c2d6539ce8a39d36d98413404852d6bb2d56cc75d2f1ee95  downstreamkernel_prepare.sh
-40ba3cf21ace39e8171030fb2bf23c879a4d734f1a054ebb7a299e587e8845d71d9f0d5777a3cf9ee147f9b148ccc05865ea8f9ba238a6ab883d36d28af4abe8  downstreamkernel_package.sh
+8a6a0afa6e499b59c5433194298d13eb07712c4344e1dd4f71fdc34a2836950a12247c61aa7563bd646efff6118b377ceb387f09170282896809a160b3d9cd04  downstreamkernel_package.sh
 cf5ee240cd1c1e9d30cdec833b4a007fd2e00f9a32ba3f265f99aa2e3dd3601cf43c08d3f3e01bade1d5b2648a6754b2f236e5cb4a9945e18e5c4e97aa2ed7c8  devicepkg_subpackage_kernel.sh
 9bb7f2a0930f397a713e9f4b6d5b83a426d9a2a3f692dcc42ac30717bf26ead869d8823a38f3ad388af12b2b9a02e8ec4d4418e9c2062389ed06d2b891a49ff3  deviceinfo
 136247a16ec91dc0c7241eeddb28c2196ae3b29946a9bc7e9566f848491ef1c53b12d05bf2dbc1cc352986712fd76f25c1510bcc8f301af540a2f01c33b299e1  expected-deviceinfo-downstream
diff --git a/main/devicepkg-dev/downstreamkernel_package.sh b/main/devicepkg-dev/downstreamkernel_package.sh
index 8f9de7214..ef589a446 100644
--- a/main/devicepkg-dev/downstreamkernel_package.sh
+++ b/main/devicepkg-dev/downstreamkernel_package.sh
@@ -22,13 +22,24 @@ install -D "$builddir/include/config/kernel.release" \
 # shellcheck disable=SC2164
 cd "$builddir/arch/$_carch/boot"
 _target="$pkgdir/boot/vmlinuz-$_flavor"
-for _zimg in zImage-dtb Image.gz-dtb *zImage Image; do
-	[ -e "$_zimg" ] || continue
-	echo "zImage found: $_zimg"
-	install -Dm644 "$_zimg" "$_target"
-	break
-done
-if ! [ -e "$_target" ]; then
-	echo "Could not find zImage in $PWD!"
-	exit 1
+
+if [ -n "$KERNEL_IMAGE_NAME" ]; then
+	if ! [ -e "$KERNEL_IMAGE_NAME" ]; then
+		echo "Could not find \$KERNEL_IMAGE_NAME in $PWD!"
+		exit 1
+	else
+		echo "NOTE: using $KERNEL_IMAGE_NAME as kernel image."
+		install -Dm644 "$KERNEL_IMAGE_NAME" "$_target"
+	fi
+else
+	for _zimg in zImage-dtb Image.gz-dtb *zImage Image; do
+		[ -e "$_zimg" ] || continue
+		echo "zImage found: $_zimg"
+		install -Dm644 "$_zimg" "$_target"
+		break
+	done
+	if ! [ -e "$_target" ]; then
+		echo "Could not find zImage in $PWD!"
+		exit 1
+	fi
 fi