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

postmarketos-mkinitfs: use variable for bootimg (MR 2215)

Browse source 
Use a variable for "bootimg" in create_bootimg rather than repeat the
same pattern replacement.
This commit is contained in:
Caleb Connolly 2021-06-03 01:29:14 +01:00 committed by Clayton Craft
parent 65ced8fdd1
commit 48e8b93ac6
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

2
main/postmarketos-mkinitfs/APKBUILD
View file

@ -56,6 +56,6 @@ sha512sums="
1a267dd958609263a4f24657f602ac0e4e0c724bf1284adec85e82d05c9b07553085edea5a56f7fa09d1652af232c72d4d39a06858c2a580ff830577b5f37d67 init.sh.in
e72adfb06745ad596a02837c8d52837490a7940f4d5589b8937155ee1be1bc4176d79d3f24c40882d20592d00c23c2daf3ef1ceba6ef05cadb76906084373f1b init_functions.sh
4f74995c52b3fd18ef77347dbbca4b3575d23fd339b62a257c1c4b45a16feb5a95f391d6189f62e94ac00d8da3077d192c678554a5f9b8190e34bf3fa6c86e95 mkinitfs.sh
93dfd3516870d388d5d124c162c43a327aa716eeabbc8cbed3378711e9347ef76919c09dac051f833230caff7607008d4c38022cc1d910c7392012e22818e890 mkinitfs_functions.sh
adf021623cfcb8fba4e71f1a5b373bcce1a8cf5946c51dd801ea7b80daf628f9f9c2bc017db930f4b1a61fefcc471602cb1be31cea52dbbe65526f82c7cdce89 mkinitfs_functions.sh
c7a3c33daeb12b33ac72207191941c4d634f15c22958273b52af381a70ebaba1d3a9299483f0c447d9e66c560151fe7b9588bb4bbef2c8914f83185984ee4622 mkinitfs_test.sh
"

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

@ -337,6 +337,8 @@ create_uboot_files()
create_bootimg()
{
[ "${deviceinfo_generate_bootimg}" = "true" ] || return
# shellcheck disable=SC2039
bootimg="${outfile/initramfs-/boot.img-}"
if [ "${deviceinfo_bootimg_pxa}" = "true" ]; then
require_package "pxa-mkbootimg" "pxa-mkbootimg" "bootimg_pxa"
@ -406,7 +408,7 @@ create_bootimg()
--pagesize "${deviceinfo_flash_pagesize}" \
${_second} \
${_dt} \
-o "${outfile/initramfs-/boot.img-}" || exit 1
-o "$bootimg" || exit 1
if [ "${deviceinfo_mkinitfs_postprocess}" != "" ]; then
sh "${deviceinfo_mkinitfs_postprocess}" "$outfile"
fi
@ -418,14 +420,14 @@ create_bootimg()
fi
# shellcheck disable=SC2039
blobpack $_flags "${outfile/initramfs-/blob-}" \
LNX "${outfile/initramfs-/boot.img-}" || exit 1
LNX "$bootimg" || exit 1
# shellcheck disable=SC2039
mv "${outfile/initramfs-/blob-}" "${outfile/initramfs-/boot.img-}"
mv "${outfile/initramfs-/blob-}" "$bootimg"
fi
if [ "${deviceinfo_bootimg_append_seandroidenforce}" = "true" ]; then
echo "==> initramfs: appending 'SEANDROIDENFORCE' to boot.img"
# shellcheck disable=SC2039 disable=SC2039
echo -n "SEANDROIDENFORCE" >> "${outfile/initramfs-/boot.img-}"
echo -n "SEANDROIDENFORCE" >> "$bootimg"
fi
}