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

postmarketos-mkinitfs: disable correct shellcheck test (MR 2260)

Browse source 
Shellcheck 0.7.2 has a change that gives many error conditions their own
SC30** codes, instead of including them in SC2039. This updates the
scripts in this package that "disable SC2039" to disable the new code.

New codes added in shellcheck: cfd68ee0c2ebfd0ab08a1d4bf628162b454dc207
This commit is contained in:
Clayton Craft 2021-06-17 17:47:07 -07:00
parent 99c95f57d2
commit c6a5e885c0
No known key found for this signature in database
GPG key ID: 7A3461CA187CEA54
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
main/postmarketos-mkinitfs/APKBUILD
View file

@ -1,7 +1,7 @@
# Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
pkgname=postmarketos-mkinitfs
pkgver=0.26
pkgrel=1
pkgrel=2
pkgdesc="Tool to generate initramfs images for postmarketOS"
url="https://postmarketos.org"
depends="
@ -54,8 +54,8 @@ check() {
sha512sums="
4717bf24bd13fd4d90f3ab000ab43f7d61529515de224ebc86458ae709ebe0b5065655457e34f5952126bac6ab45143a91cddb09a8ad2d0a55c5cecd564a0135 00-default.modules
1a267dd958609263a4f24657f602ac0e4e0c724bf1284adec85e82d05c9b07553085edea5a56f7fa09d1652af232c72d4d39a06858c2a580ff830577b5f37d67 init.sh.in
e72adfb06745ad596a02837c8d52837490a7940f4d5589b8937155ee1be1bc4176d79d3f24c40882d20592d00c23c2daf3ef1ceba6ef05cadb76906084373f1b init_functions.sh
393791a7db328d45db7c3b7836ed93208f8b64a6c08a219d31f5a51a167b75ac32407179ae33ef3f72e33fae35c48f676cf526dae190b231d1a766b9a0ad0fb6 init_functions.sh
54c8ea6c4b5313c0ca82bbc40498a35d4b5cbcdbf950dc01b5025238ea6b8caa2f9a9ee57a269fb78673fbcac186c33243188458ecda45deb3354d5d8a77fdfe mkinitfs.sh
0b89d1c43516d1be154fcf51082a89ab9dbff7de5f8dc3964399514584752b2356d34958923e66250af4639eb98b94f51ac9046c2d69c608fcf12794f78c2cca mkinitfs_functions.sh
d092986d6700ba823d968a576d73db128b1180889fae5f973cd012536c30746141f890b8f05e6a17b49812851e25f3df19ef08c70d4dff6bb1e85b5f4fab6b07 mkinitfs_functions.sh
c7a3c33daeb12b33ac72207191941c4d634f15c22958273b52af381a70ebaba1d3a9299483f0c447d9e66c560151fe7b9588bb4bbef2c8914f83185984ee4622 mkinitfs_test.sh
"

2
main/postmarketos-mkinitfs/init_functions.sh
View file

@ -49,7 +49,7 @@ setup_firmware_path() {
echo "Kernel does not support setting the firmware image search path. Skipping."
return
fi
# shellcheck disable=SC2039
# shellcheck disable=SC3037
echo -n /lib/firmware/postmarketos >$SYS
}

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

@ -313,12 +313,12 @@ create_uboot_files()
require_package "mkimage" "u-boot-tools" "generate_legacy_uboot_initfs"
echo "==> initramfs: creating uInitrd"
# shellcheck disable=SC2039
# shellcheck disable=SC3060
mkimage -A $arch -T ramdisk -C none -n uInitrd -d "$outfile" \
"${outfile/initramfs-/uInitrd-}" || exit 1
echo "==> kernel: creating uImage"
# shellcheck disable=SC2039
# shellcheck disable=SC3060
kernelfile="${outfile/initramfs-/vmlinuz-}"
if [ "${deviceinfo_append_dtb}" = "true" ]; then
kernelfile="${kernelfile}-dtb"
@ -328,7 +328,7 @@ create_uboot_files()
deviceinfo_legacy_uboot_load_address="80008000"
fi
# shellcheck disable=SC2039
# shellcheck disable=SC3060
mkimage -A $arch -O linux -T kernel -C none -a "$deviceinfo_legacy_uboot_load_address" \
-e "$deviceinfo_legacy_uboot_load_address" \
-n postmarketos -d "$kernelfile" "${outfile/initramfs-/uImage-}" || exit 1
@ -338,7 +338,7 @@ create_uboot_files()
create_bootimg()
{
[ "${deviceinfo_generate_bootimg}" = "true" ] || return
# shellcheck disable=SC2039
# shellcheck disable=SC3060
bootimg="${outfile/initramfs-/boot.img-}"
if [ "${deviceinfo_bootimg_pxa}" = "true" ]; then
@ -353,7 +353,7 @@ create_bootimg()
_base="${deviceinfo_flash_offset_base}"
[ -z "$_base" ] && _base="0x10000000"
# shellcheck disable=SC2039
# shellcheck disable=SC3060
kernelfile="${outfile/initramfs-/vmlinuz-}"
if [ "${deviceinfo_append_dtb}" = "true" ]; then
kernelfile="${kernelfile}-dtb"
@ -419,15 +419,15 @@ create_bootimg()
if [ "${deviceinfo_bootimg_blobpack}" = "sign" ]; then
_flags="-s"
fi
# shellcheck disable=SC2039
# shellcheck disable=SC3060
blobpack $_flags "${outfile/initramfs-/blob-}" \
LNX "$bootimg" || exit 1
# shellcheck disable=SC2039
# shellcheck disable=SC3060
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
# shellcheck disable=SC3037
echo -n "SEANDROIDENFORCE" >> "$bootimg"
fi
}
@ -460,7 +460,7 @@ append_or_copy_dtb()
fi
dtb="$dtb /usr/share/dtb/$filename.dtb"
done
# shellcheck disable=SC2039
# shellcheck disable=SC3060
kernel="${outfile/initramfs-/vmlinuz-}"
if [ "${deviceinfo_append_dtb}" = "true" ]; then
echo "==> kernel: appending device-tree ${deviceinfo_dtb}"
@ -485,7 +485,7 @@ add_mtk_header()
rm "$outfile-orig"
echo "==> kernel: adding Mediatek header"
# shellcheck disable=SC2039
# shellcheck disable=SC3060
kernel="${outfile/initramfs-/vmlinuz-}"
rm -f "${kernel}-mtk"
mtk-mkimage KERNEL "$kernel" "${kernel}-mtk"