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

main/devicepkg-dev: automatically package modules into initramfs (MR 4193)

Browse source 
To simplify the future removal of deviceinfo_modules_initfs
This commit is contained in:
Pablo Correa Gómez 2023-06-09 20:55:52 +02:00 committed by Clayton Craft
parent 53ea67b177
commit 65be0d7e81
No known key found for this signature in database
GPG key ID: 4A4CED6D7EDF950A
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
main/devicepkg-dev/APKBUILD
View file

@ -1,6 +1,6 @@
pkgname=devicepkg-dev
pkgver=0.14.3
pkgrel=1
pkgver=0.15.0
pkgrel=0
pkgdesc="Provides default device package functions"
url="https://postmarketos.org"
arch="noarch"
@ -62,10 +62,10 @@ package() {
sha512sums="
d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c compiler-gcc.h
54b369ff87e017114edae03986dec79742280c55a156a98ea8c6a1c740632e904e51c01810e7dac99add0d9d06c0fcebb040fed595348f180233b3ec810443ba devicepkg_build.sh
c6547e42999dd6b9a1f48b4cf7b533dc280664ebfe2b90af0788db08c9838642929ba3fa934820e6be8c67a630689349f13a49c2f7f306c614bc3294a8d7d0f2 devicepkg_package.sh
4941330d9b7f494c37d89f4733622085dfec15c538d4b6d2dfd57466c74f05a639157560ccb7686781e4f9f64e86e60b19481389764e5ba66a33a754eafb459a devicepkg_package.sh
f81e74e45ae8e55686ae459f550e229e7398daeafa72bd023c2d8c3a0d50e60bf53d5bbdfec931e9fbabe1cd71de57b2192805aaef091ab90bc7203cbaf66ba6 downstreamkernel_prepare.sh
107242a3da38a574c46cb779e0c75afbeef4cfe659e1b85971973ac55843df06f70f53a5985ca623d4123f05f2984f5dace4a53a3509ecefd7dfdc3c8b705cfe downstreamkernel_package.sh
cf5ee240cd1c1e9d30cdec833b4a007fd2e00f9a32ba3f265f99aa2e3dd3601cf43c08d3f3e01bade1d5b2648a6754b2f236e5cb4a9945e18e5c4e97aa2ed7c8 devicepkg_subpackage_kernel.sh
c79f1099d0b10c4b4c2bf00a65ffde8233fbaf1cd57b13dd920707df6b1aa1c2170508739451fbeb6b1b739004c52f6d9986b00caea7fb4ac2dcaa7363f24af0 devicepkg_subpackage_kernel.sh
9bb7f2a0930f397a713e9f4b6d5b83a426d9a2a3f692dcc42ac30717bf26ead869d8823a38f3ad388af12b2b9a02e8ec4d4418e9c2062389ed06d2b891a49ff3 deviceinfo
136247a16ec91dc0c7241eeddb28c2196ae3b29946a9bc7e9566f848491ef1c53b12d05bf2dbc1cc352986712fd76f25c1510bcc8f301af540a2f01c33b299e1 expected-deviceinfo-downstream
8cdbf149e1bdfaf4d4a246a208732836956fd81a3aa01ef968e4c2e2cca4027f71cfc38e22debade83ddfca4e05267983c1c8a9c1aa9461a8cf493ef7e893097 expected-deviceinfo-mainline

5
main/devicepkg-dev/devicepkg_package.sh
View file

@ -33,6 +33,11 @@ if [ -f "$srcdir/initfs-hook.sh" ]; then
"$pkgdir/usr/share/mkinitfs/hooks/00-$pkgname.sh"
fi
if [ -f "$srcdir/modules" ]; then
install -Dm644 "$srcdir/modules" \
"$pkgdir/usr/share/mkinitfs/modules/00-$pkgname.modules"
fi
if [ -f "$srcdir/modules-load.conf" ]; then
install -Dm644 "$srcdir/modules-load.conf" \
"$pkgdir/etc/modules-load.d/00-$pkgname.conf"

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

@ -23,6 +23,11 @@ install -Dm644 "$srcdir/deviceinfo" \
# Get the kernel type ("downstream", "mainline")
kernel=$(echo "$subpkgname" | sed -n "s/.*-kernel-\(.*\)/\1/p" | tr - _)
if [ -f "$srcdir/modules.$kernel" ]; then
install -Dm644 "$srcdir/modules.$kernel" \
"$subpkgdir/usr/share/mkinitfs/modules/00-$pkgname.modules"
fi
# Iterate over deviceinfo variables that have the kernel type as suffix
# var looks like: deviceinfo_kernel_cmdline, ...
grep -E "(.+)_$kernel=.*" "$subpkgdir/etc/deviceinfo" | \