diff --git a/main/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD index 050fb3a88..6dfc897a2 100644 --- a/main/postmarketos-mkinitfs/APKBUILD +++ b/main/postmarketos-mkinitfs/APKBUILD @@ -1,5 +1,5 @@ pkgname=postmarketos-mkinitfs -pkgver=0.12.3 +pkgver=0.13.0 pkgrel=0 pkgdesc="Tool to generate initramfs images for postmarketOS" url="https://postmarketos.org" @@ -42,5 +42,5 @@ sha512sums="5037cb7285bb7c0c40ca9e6df332d882ef9a8b379756c785f921e062dab1b7e7f313 995b4d15e6b248d55d53221ec52674e62d74f0be539ac2ab26d4279544e2bece7aa58810dd831e1b2f08f0520fc9a8dff3ad4df52a46ef73f61e462f74f68c48 init.sh.in 683b1784cc6572717dd805caabea38fac1780b03ff3540b888aab4fd91ccae404634874e6c9fa39f723186821a849844c6df1235bdcbf47b2de6b7f483c42178 init_functions.sh 7201d4640a3e9ead8a47ffd9916b068476b7d950760a84c37e02268c942d49896bc986da6bdee27e832639c90775354d68046a6475205d8d1da995b068120d8f mkinitfs.sh -5105fcc5f2094009937b378c8d383270f4fcd0133d0e60268806a7d09966613f4ebfa93d7e1b90b5d83d0c5b1664a0b3fc7562e52cc1e0ca6cd54ff442b03e84 mkinitfs_functions.sh +d593b921bd6c0204af874266060667d78a232c0131ce7f0ad4124f9b240fcbb6ac2a8a2b8ee30d27d78bed8c1a506c4e6cb13b57c33cee3a00a7d96eca45a7f3 mkinitfs_functions.sh c7a3c33daeb12b33ac72207191941c4d634f15c22958273b52af381a70ebaba1d3a9299483f0c447d9e66c560151fe7b9588bb4bbef2c8914f83185984ee4622 mkinitfs_test.sh" diff --git a/main/postmarketos-mkinitfs/mkinitfs_functions.sh b/main/postmarketos-mkinitfs/mkinitfs_functions.sh index 403ae8d11..e9bbd07da 100644 --- a/main/postmarketos-mkinitfs/mkinitfs_functions.sh +++ b/main/postmarketos-mkinitfs/mkinitfs_functions.sh @@ -405,20 +405,25 @@ create_bootimg() append_or_copy_dtb() { [ -n "${deviceinfo_dtb}" ] || return - dtb="/usr/share/dtb/${deviceinfo_dtb}.dtb" + echo "==> kernel: device-tree blob operations" + dtb="" + for filename in $deviceinfo_dtb; do + if ! [ -e "/usr/share/dtb/$filename.dtb" ]; then + echo "ERROR: File not found: $dtb" + exit 1 + fi + dtb="$dtb /usr/share/dtb/$filename.dtb" + done # shellcheck disable=SC2039 kernel="${outfile/initramfs-/vmlinuz-}" - echo "==> kernel: device-tree blob operations" - if ! [ -e "$dtb" ]; then - echo "ERROR: File not found: $dtb" - exit 1 - fi if [ "${deviceinfo_append_dtb}" = "true" ]; then echo "==> kernel: appending device-tree ${deviceinfo_dtb}" - cat "$kernel" "$dtb" > "${kernel}-dtb" + # shellcheck disable=SC2086 + cat "$kernel" $dtb > "${kernel}-dtb" else echo "==> kernel: copying dtb ${deviceinfo_dtb} to boot partition" - cp "$dtb" "$(dirname "${outfile}")" + # shellcheck disable=SC2086 + cp $dtb "$(dirname "${outfile}")" fi }