diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-07 12:57:36 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-09-09 22:14:41 +0100 |
| commit | 6fd8af0d30e555da55e5ca954009f32a84ced4a6 (patch) | |
| tree | a8f0f66819459f548a9631161adc366bdc0da908 /meta/recipes-core | |
| parent | 32c98e6a8cd60aa5d2e60ab7b573ec6abae85ed4 (diff) | |
| download | poky-6fd8af0d30e555da55e5ca954009f32a84ced4a6.tar.gz | |
classes: Drop ';' delimiter from ROOTFS/IMAGE*COMMAND variables
Originally these were shell functions but they have long since been processed by
bb.build.exec_func(). Since we no longer need shell syntax, we can drop the ';'
delimiters and just use a space separated string.
This cleans up the variable and quietly removes any stray ';' that do happen to
still make it in.
(From OE-Core rev: c3365dfd9ddd7fbe70b62e0f11166e57a8ca6f73)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/images/build-appliance-image_15.0.0.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-core/images/core-image-tiny-initramfs.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb index b078b19a9d..de041a7b7b 100644 --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/meta/recipes-core/images/build-appliance-image_15.0.0.bb | |||
| @@ -117,7 +117,7 @@ fakeroot do_tweak_image () { | |||
| 117 | ln -rs ${IMAGE_ROOTFS}/lib ${IMAGE_ROOTFS}/lib64 | 117 | ln -rs ${IMAGE_ROOTFS}/lib ${IMAGE_ROOTFS}/lib64 |
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; do_tweak_image; " | 120 | IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src do_tweak_image" |
| 121 | # For pip usage above | 121 | # For pip usage above |
| 122 | do_image[network] = "1" | 122 | do_image[network] = "1" |
| 123 | 123 | ||
diff --git a/meta/recipes-core/images/core-image-tiny-initramfs.bb b/meta/recipes-core/images/core-image-tiny-initramfs.bb index 96b56a2f59..8af25f1b1f 100644 --- a/meta/recipes-core/images/core-image-tiny-initramfs.bb +++ b/meta/recipes-core/images/core-image-tiny-initramfs.bb | |||
| @@ -40,6 +40,6 @@ python tinyinitrd () { | |||
| 40 | init.write(newinit) | 40 | init.write(newinit) |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | IMAGE_PREPROCESS_COMMAND += "tinyinitrd;" | 43 | IMAGE_PREPROCESS_COMMAND += "tinyinitrd" |
| 44 | 44 | ||
| 45 | QB_KERNEL_CMDLINE_APPEND += "debugshell=3 init=/bin/busybox sh init" | 45 | QB_KERNEL_CMDLINE_APPEND += "debugshell=3 init=/bin/busybox sh init" |
