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

main/mkinitfs: Pass signing flag to blobpack (MR 1803)

Browse source 
This patch checks if deviceinfo_bootimg_blobpack is "sign"
in that case it passes signing flag for devices that require.

Devices (tf101) that don't use signing will continue working
when passing "true" as now.
This commit is contained in:
Ion Agorria 2020-12-28 13:25:57 +01:00 committed by Oliver Smith
parent 0141b19438
commit 4351a5bc1c
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main/postmarketos-mkinitfs/APKBUILD
View file

@ -1,6 +1,6 @@
# Maintainer: Oliver Smith <ollieparanoid@postmarketos.org> # Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
pkgname=postmarketos-mkinitfs pkgname=postmarketos-mkinitfs
pkgver=0.19 pkgver=0.20
pkgrel=0 pkgrel=0
pkgdesc="Tool to generate initramfs images for postmarketOS" pkgdesc="Tool to generate initramfs images for postmarketOS"
url="https://postmarketos.org" url="https://postmarketos.org"
@ -57,5 +57,5 @@ sha512sums="5037cb7285bb7c0c40ca9e6df332d882ef9a8b379756c785f921e062dab1b7e7f313
bafd06286594102b8b3b126c3ae0a77a97f004ab804f03426154310c5107a1acaf3636bdba92626333adfe4fb0df32ff42c6d8d9e7adf35f6da620c6e14407a1 init.sh.in bafd06286594102b8b3b126c3ae0a77a97f004ab804f03426154310c5107a1acaf3636bdba92626333adfe4fb0df32ff42c6d8d9e7adf35f6da620c6e14407a1 init.sh.in
e4b5bb7206a4a8f99a23414d6830ccf6ecaf2990ca4923842e99fa14dc50a0a4ae88e0368129b423f9e7e7b446f25b641ad629b7aa08682f269aed7a234762cb init_functions.sh e4b5bb7206a4a8f99a23414d6830ccf6ecaf2990ca4923842e99fa14dc50a0a4ae88e0368129b423f9e7e7b446f25b641ad629b7aa08682f269aed7a234762cb init_functions.sh
dfc01ee0547ea88b7aa45a005e842b636e9e19bbf1705f3dad53a66d57af7c5c513c092b5469a06d9b00322e56a4d25f1b47e4c5324aafa99f5291679968d1f1 mkinitfs.sh dfc01ee0547ea88b7aa45a005e842b636e9e19bbf1705f3dad53a66d57af7c5c513c092b5469a06d9b00322e56a4d25f1b47e4c5324aafa99f5291679968d1f1 mkinitfs.sh
7c6dcc94575c7c862b2d14dface466b4f549fdda4f64b42aaff7ac3f2a46bdb8bd092730c50ba1a5aeb7b327a0ba38e707299e650f61fc1d8220c3b0c6ecac89 mkinitfs_functions.sh 6a034e52e7e0d2eb4db632d1a08a47e58ccfc82780e3d1fbc08759ae0c7a1c7c6a222ad91fe346c45d82bec4487cc9c4b71adad96061865153c0e98e1e8e1c37 mkinitfs_functions.sh
c7a3c33daeb12b33ac72207191941c4d634f15c22958273b52af381a70ebaba1d3a9299483f0c447d9e66c560151fe7b9588bb4bbef2c8914f83185984ee4622 mkinitfs_test.sh" c7a3c33daeb12b33ac72207191941c4d634f15c22958273b52af381a70ebaba1d3a9299483f0c447d9e66c560151fe7b9588bb4bbef2c8914f83185984ee4622 mkinitfs_test.sh"

12
main/postmarketos-mkinitfs/mkinitfs_functions.sh
View file

@ -406,11 +406,17 @@ create_bootimg()
${_second} \ ${_second} \
${_dt} \ ${_dt} \
-o "${outfile/initramfs-/boot.img-}" || exit 1 -o "${outfile/initramfs-/boot.img-}" || exit 1
if [ "${deviceinfo_bootimg_blobpack}" = "true" ]; then if [ "${deviceinfo_bootimg_blobpack}" = "true" ] || [ "${deviceinfo_bootimg_blobpack}" = "sign" ]; then
echo "==> initramfs: creating blob" echo "==> initramfs: creating blob"
_flags=""
if [ "${deviceinfo_bootimg_blobpack}" = "sign" ]; then
_flags="-s"
fi
# shellcheck disable=SC2039 # shellcheck disable=SC2039
blobpack "${outfile/initramfs-/blob-}" LNX \ blobpack $_flags "${outfile/initramfs-/blob-}" \
"${outfile/initramfs-/boot.img-}" || exit 1 LNX "${outfile/initramfs-/boot.img-}" || exit 1
# shellcheck disable=SC2039
mv "${outfile/initramfs-/blob-}" "${outfile/initramfs-/boot.img-}"
fi fi
if [ "${deviceinfo_bootimg_append_seandroidenforce}" = "true" ]; then if [ "${deviceinfo_bootimg_append_seandroidenforce}" = "true" ]; then
echo "==> initramfs: appending 'SEANDROIDENFORCE' to boot.img" echo "==> initramfs: appending 'SEANDROIDENFORCE' to boot.img"