From 3fe7e1601c81648bf542d43db1db1611bdf9267a Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Sat, 29 Feb 2020 20:45:23 +0100 Subject: [PATCH] main/devicepkg-dev: remove Image.gz from list of kernels to consider (!1014) This breaks booting on Librem 5 and is not needed on any device currently using downstreamkernel_package, so remove it. --- main/devicepkg-dev/APKBUILD | 4 ++-- main/devicepkg-dev/downstreamkernel_package.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main/devicepkg-dev/APKBUILD b/main/devicepkg-dev/APKBUILD index 906afa5f7..842c6408f 100644 --- a/main/devicepkg-dev/APKBUILD +++ b/main/devicepkg-dev/APKBUILD @@ -1,5 +1,5 @@ pkgname="devicepkg-dev" -pkgver=0.11.1 +pkgver=0.11.2 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 -c912156a257ad55d1d72e8e50e1f0e9620497d0ffbb8cba332d2510644b6aeb8c50b9b3cf3f43316a086ab81c3a7c2e6f54aaa4d825b8af811d84c4e5cc520d9 downstreamkernel_package.sh +40ba3cf21ace39e8171030fb2bf23c879a4d734f1a054ebb7a299e587e8845d71d9f0d5777a3cf9ee147f9b148ccc05865ea8f9ba238a6ab883d36d28af4abe8 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 73fe523d8..8f9de7214 100644 --- a/main/devicepkg-dev/downstreamkernel_package.sh +++ b/main/devicepkg-dev/downstreamkernel_package.sh @@ -22,7 +22,7 @@ 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 Image.gz *zImage Image; do +for _zimg in zImage-dtb Image.gz-dtb *zImage Image; do [ -e "$_zimg" ] || continue echo "zImage found: $_zimg" install -Dm644 "$_zimg" "$_target"