diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2023-05-26 18:36:14 -0500 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2023-06-01 16:24:07 -1000 |
| commit | b32d7da361b475fd7fec019a51fbf93e23a1d406 (patch) | |
| tree | 7ffe8dbec5d03148e613281870334b6b8e6d47a8 | |
| parent | ab21fd0ec11adb6f6f30c3f4c4a38cdaa1ea4903 (diff) | |
| download | poky-b32d7da361b475fd7fec019a51fbf93e23a1d406.tar.gz | |
kernel-devicetree: make shell scripts posix compliant
Use the notation suggested by Martin Jansa to avoid a bashism. Also
switch KERNEL_DTBVENDORED to the more common 0/1 notation instead of
true/false.
Fixes: 04ab57d200 (kernel-devicetree: allow specification of dtb
directory, 2023-05-02)
(From OE-Core rev: b7d6fc07462e6fca09d0db7f43a62920250ef053)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Randolph Sapp <rs@ti.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/classes/kernel-devicetree.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/kernel.bbclass | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass index 11b57adc92..e1e67cbc56 100644 --- a/meta/classes/kernel-devicetree.bbclass +++ b/meta/classes/kernel-devicetree.bbclass | |||
| @@ -76,7 +76,7 @@ do_install:append() { | |||
| 76 | for dtbf in ${KERNEL_DEVICETREE}; do | 76 | for dtbf in ${KERNEL_DEVICETREE}; do |
| 77 | dtb=`normalize_dtb "$dtbf"` | 77 | dtb=`normalize_dtb "$dtbf"` |
| 78 | dtb_path=`get_real_dtb_path_in_kernel "$dtb"` | 78 | dtb_path=`get_real_dtb_path_in_kernel "$dtb"` |
| 79 | if [ ${KERNEL_DTBVENDORED} == "false" ]; then | 79 | if "${@'false' if oe.types.boolean(d.getVar('KERNEL_DTBVENDORED')) else 'true'}"; then |
| 80 | dtb_ext=${dtb##*.} | 80 | dtb_ext=${dtb##*.} |
| 81 | dtb_base_name=`basename $dtb .$dtb_ext` | 81 | dtb_base_name=`basename $dtb .$dtb_ext` |
| 82 | dtb=$dtb_base_name.$dtb_ext | 82 | dtb=$dtb_base_name.$dtb_ext |
| @@ -91,7 +91,7 @@ do_deploy:append() { | |||
| 91 | dtb_ext=${dtb##*.} | 91 | dtb_ext=${dtb##*.} |
| 92 | dtb_base_name=`basename $dtb .$dtb_ext` | 92 | dtb_base_name=`basename $dtb .$dtb_ext` |
| 93 | install -d $deployDir | 93 | install -d $deployDir |
| 94 | if [ ${KERNEL_DTBVENDORED} == "false" ]; then | 94 | if "${@'false' if oe.types.boolean(d.getVar('KERNEL_DTBVENDORED')) else 'true'}"; then |
| 95 | dtb=$dtb_base_name.$dtb_ext | 95 | dtb=$dtb_base_name.$dtb_ext |
| 96 | fi | 96 | fi |
| 97 | install -m 0644 ${D}/${KERNEL_DTBDEST}/$dtb $deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext | 97 | install -m 0644 ${D}/${KERNEL_DTBDEST}/$dtb $deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext |
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 87dd46e6fa..3d5422b09e 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
| @@ -211,7 +211,7 @@ KERNEL_RELEASE ?= "${KERNEL_VERSION}" | |||
| 211 | KERNEL_OUTPUT_DIR ?= "arch/${ARCH}/boot" | 211 | KERNEL_OUTPUT_DIR ?= "arch/${ARCH}/boot" |
| 212 | KERNEL_IMAGEDEST ?= "boot" | 212 | KERNEL_IMAGEDEST ?= "boot" |
| 213 | KERNEL_DTBDEST ?= "${KERNEL_IMAGEDEST}" | 213 | KERNEL_DTBDEST ?= "${KERNEL_IMAGEDEST}" |
| 214 | KERNEL_DTBVENDORED ?= "false" | 214 | KERNEL_DTBVENDORED ?= "0" |
| 215 | 215 | ||
| 216 | # | 216 | # |
| 217 | # configuration | 217 | # configuration |
