postmarketos-mkinitfs: Handle "deviceinfo_bootimg_qcdt" boolean properly (#914)

This commit is contained in:
Pablo Castellano 2017-11-19 15:25:10 +01:00 committed by Oliver Smith
parent 2d393209cc
commit 4c1836e9a1
2 changed files with 8 additions and 3 deletions

View File

@ -1,5 +1,5 @@
pkgname=postmarketos-mkinitfs
pkgver=0.5.3
pkgver=0.5.4
pkgrel=0
pkgdesc="Tool to generate initramfs images for postmarketOS"
url="https://github.com/postmarketOS"
@ -10,6 +10,7 @@ source="init.sh.in init_functions.sh mkinitfs.sh"
arch="noarch"
license="GPL2"
provides="mkinitfs=0.0.1"
options="!check"
package() {
mkdir -p "$pkgdir/usr/share/postmarketos-mkinitfs/"
@ -23,4 +24,4 @@ package() {
}
sha512sums="e1849a13ee696e76dc6c734eda984bcc6a6e2e3d8a62a4df0778a8e338dc0bf9d967fa263ae6e57c14a0cb516c6004c6e251262a1711ad47f1ce4c622727a1d7 init.sh.in
1512d052890d6d8528f6dbca90eacd76664b56a00c24c980a5be900fdf290f24dbf42c8f3ebf43ea2c832046b4a81ed5d69401ddf5cea2516f8265b083a15ff3 init_functions.sh
1048ebb20e2534c9ac3c259443b89323e09f87a68eab9f1c8b8c42130bf9fe2ea99cdca32be0595c65e827007c4171be047441156dd03e1d81c0554f947828f8 mkinitfs.sh"
76d0f11fbd7207e3fc7382d2cc554c280a015157b182fe6ddfc31d861066cfba2be39ebc05970207853c9fae81f950c361cae4aaeafff0873ce99f2c3268ad8f mkinitfs.sh"

View File

@ -197,6 +197,10 @@ create_bootimg()
if [ -n "${deviceinfo_dtb}" ]; then
kernelfile="${kernelfile}-dtb"
fi
_dt=""
if [ "${deviceinfo_bootimg_qcdt}" == "true" ]; then
_dt="--dt /boot/dt.img"
fi
mkbootimg \
--kernel "${kernelfile}" \
--ramdisk "$outfile" \
@ -207,7 +211,7 @@ create_bootimg()
--ramdisk_offset "${deviceinfo_flash_offset_ramdisk}" \
--tags_offset "${deviceinfo_flash_offset_tags}" \
--pagesize "${deviceinfo_flash_pagesize}" \
${deviceinfo_bootimg_qcdt:+ --dt /boot/dt.img} \
${_dt} \
-o "${outfile/initramfs-/boot.img-}"
}