forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

main/devicepkg-dev: don't use kernel 'flavor' in kernel filename (MR 2426)

Browse source 
Kernel file names will be generic (/boot/vmlinuz).
Release path still has the 'flavor' in it so that pmbootstrap can still
get a reference to which kernel package is installed
This commit is contained in:
Clayton Craft 2021-08-17 16:25:46 -07:00
parent 1bbb98347d
commit 50ee94d8e3
No known key found for this signature in database
GPG key ID: 7A3461CA187CEA54
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
main/devicepkg-dev/APKBUILD
View file

@ -1,5 +1,5 @@
pkgname=devicepkg-dev
pkgver=0.12.4
pkgver=0.13.0
pkgrel=0
pkgdesc="Provides default device package functions"
url="https://postmarketos.org"
@ -60,12 +60,14 @@ package() {
install -Dm644 "$srcdir/compiler-gcc.h" \
"$pkgdir/usr/share/devicepkg-dev/compiler-gcc.h"
}
sha512sums="d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c compiler-gcc.h
sha512sums="
d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c compiler-gcc.h
801154d608c4bd22e9d4d8a80c07c500ae83c337ed710930ba11fd5d81fe2aafff8a74ce89aef46ce29da0716cf162692646e6e9a0b7cbc921d2707036811e8c devicepkg_build.sh
74c1b9b265a943604d5d538ca66d4b7bcad9adcf40710ab19d795b55aac39669bf1089f7f0ec81aa7a01b537784bef4310e4acc3d7a6ba1f282ab01652bdc4d4 devicepkg_package.sh
53aa129da5bd52376271bbd37ed7205f2dac971d442c5085260ed1c4a9b014a656cbe28ea45d242be60a2d0f8851611f3b8352c880c017995cda6ae093e5d324 downstreamkernel_prepare.sh
776d7c36afc7bedbd531641abe90fa4bf06a519ad9e300dedf67b6d3b4997b57a398938dd528d5eeda6d17e0d34644472702a4fdd8ff41e0a4a7ad0671f4a216 downstreamkernel_package.sh
107242a3da38a574c46cb779e0c75afbeef4cfe659e1b85971973ac55843df06f70f53a5985ca623d4123f05f2984f5dace4a53a3509ecefd7dfdc3c8b705cfe downstreamkernel_package.sh
cf5ee240cd1c1e9d30cdec833b4a007fd2e00f9a32ba3f265f99aa2e3dd3601cf43c08d3f3e01bade1d5b2648a6754b2f236e5cb4a9945e18e5c4e97aa2ed7c8 devicepkg_subpackage_kernel.sh
9bb7f2a0930f397a713e9f4b6d5b83a426d9a2a3f692dcc42ac30717bf26ead869d8823a38f3ad388af12b2b9a02e8ec4d4418e9c2062389ed06d2b891a49ff3 deviceinfo
136247a16ec91dc0c7241eeddb28c2196ae3b29946a9bc7e9566f848491ef1c53b12d05bf2dbc1cc352986712fd76f25c1510bcc8f301af540a2f01c33b299e1 expected-deviceinfo-downstream
8cdbf149e1bdfaf4d4a246a208732836956fd81a3aa01ef968e4c2e2cca4027f71cfc38e22debade83ddfca4e05267983c1c8a9c1aa9461a8cf493ef7e893097 expected-deviceinfo-mainline"
8cdbf149e1bdfaf4d4a246a208732836956fd81a3aa01ef968e4c2e2cca4027f71cfc38e22debade83ddfca4e05267983c1c8a9c1aa9461a8cf493ef7e893097 expected-deviceinfo-mainline
"

2
main/devicepkg-dev/downstreamkernel_package.sh
View file

@ -22,7 +22,7 @@ install -D "$builddir/$_outdir/include/config/kernel.release" \
# zImage (find the right one)
# shellcheck disable=SC2164
cd "$builddir/$_outdir/arch/$_carch/boot"
_target="$pkgdir/boot/vmlinuz-$_flavor"
_target="$pkgdir/boot/vmlinuz"
if [ -n "$KERNEL_IMAGE_NAME" ]; then
if ! [ -e "$KERNEL_IMAGE_NAME" ]; then