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

main/devicepkg-dev: Fix deviceinfo variables for kernels with "-" in name (!892)

Browse source 
Kernel subpackages may contain a "-" (e.g. -kernel-mainline-modem);
replace it with an underscore to make sure that we find the
kernel-specific variables in deviceinfo.
This commit is contained in:
Minecrell 2020-01-18 11:43:16 +01:00
parent 26cfbcc4c9
commit 81d8d03d5f
No known key found for this signature in database
GPG key ID: 699D16185DAFAE61
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main/devicepkg-dev/APKBUILD
View file

@ -1,5 +1,5 @@
pkgname="devicepkg-dev"
pkgver=0.9.1
pkgver=0.9.2
pkgrel=0
pkgdesc="Provides default device package functions"
url="https://postmarketos.org"
@ -60,7 +60,7 @@ sha512sums="d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32
5230b3d8a61fe0e83deef17072df732c1413abedefbda56a9d2d8f8148b82dc7437a62c3e45115ee21f5208f1e17308506b002c504058552d37e7b5053bb69fa devicepkg_build.sh
cc567d1cc236b06240a9bf58d7aadabc44bbe8bb6c8e50c721531d00a1996bdf961ed0a1a9031489d419778e4d16afc6b7f7d176eec5e928b5b91ea2a91059d1 devicepkg_package.sh
1b038d0bca1e130674497cf7aeb26fac2bcec510ce094fa6f6700fcdcabc778741541c1aa89d3588ed42908f60708a2d9b83ffd5e50e99db619d366458e82256 downstreamkernel_prepare.sh
bedf319a74bff01780192cd11c872c41a451915cc7e7542c467cd84fa1784236401f57e197258c3aae734f478c31a2052129838861ea204c0985630501f152ca devicepkg_subpackage_kernel.sh
cf5ee240cd1c1e9d30cdec833b4a007fd2e00f9a32ba3f265f99aa2e3dd3601cf43c08d3f3e01bade1d5b2648a6754b2f236e5cb4a9945e18e5c4e97aa2ed7c8 devicepkg_subpackage_kernel.sh
9bb7f2a0930f397a713e9f4b6d5b83a426d9a2a3f692dcc42ac30717bf26ead869d8823a38f3ad388af12b2b9a02e8ec4d4418e9c2062389ed06d2b891a49ff3 deviceinfo
136247a16ec91dc0c7241eeddb28c2196ae3b29946a9bc7e9566f848491ef1c53b12d05bf2dbc1cc352986712fd76f25c1510bcc8f301af540a2f01c33b299e1 expected-deviceinfo-downstream
8cdbf149e1bdfaf4d4a246a208732836956fd81a3aa01ef968e4c2e2cca4027f71cfc38e22debade83ddfca4e05267983c1c8a9c1aa9461a8cf493ef7e893097 expected-deviceinfo-mainline"

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

@ -21,7 +21,7 @@ install -Dm644 "$srcdir/deviceinfo" \
"$subpkgdir/etc/deviceinfo"
# Get the kernel type ("downstream", "mainline")
kernel=$(echo "$subpkgname" | sed -n "s/.*-kernel-\(.*\)/\1/p")
kernel=$(echo "$subpkgname" | sed -n "s/.*-kernel-\(.*\)/\1/p" | tr - _)
# Iterate over deviceinfo variables that have the kernel type as suffix
# var looks like: deviceinfo_kernel_cmdline, ...