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/classes/create-spdx-2.2.bbclass | |
| 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/classes/create-spdx-2.2.bbclass')
| -rw-r--r-- | meta/classes/create-spdx-2.2.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/create-spdx-2.2.bbclass b/meta/classes/create-spdx-2.2.bbclass index 844b674f6f..aed1a94132 100644 --- a/meta/classes/create-spdx-2.2.bbclass +++ b/meta/classes/create-spdx-2.2.bbclass | |||
| @@ -930,12 +930,12 @@ spdx_get_src[vardepsexclude] += "STAGING_KERNEL_DIR" | |||
| 930 | do_rootfs[recrdeptask] += "do_create_spdx do_create_runtime_spdx" | 930 | do_rootfs[recrdeptask] += "do_create_spdx do_create_runtime_spdx" |
| 931 | do_rootfs[cleandirs] += "${SPDXIMAGEWORK}" | 931 | do_rootfs[cleandirs] += "${SPDXIMAGEWORK}" |
| 932 | 932 | ||
| 933 | ROOTFS_POSTUNINSTALL_COMMAND =+ "image_combine_spdx ; " | 933 | ROOTFS_POSTUNINSTALL_COMMAND =+ "image_combine_spdx" |
| 934 | 934 | ||
| 935 | do_populate_sdk[recrdeptask] += "do_create_spdx do_create_runtime_spdx" | 935 | do_populate_sdk[recrdeptask] += "do_create_spdx do_create_runtime_spdx" |
| 936 | do_populate_sdk[cleandirs] += "${SPDXSDKWORK}" | 936 | do_populate_sdk[cleandirs] += "${SPDXSDKWORK}" |
| 937 | POPULATE_SDK_POST_HOST_COMMAND:append:task-populate-sdk = " sdk_host_combine_spdx; " | 937 | POPULATE_SDK_POST_HOST_COMMAND:append:task-populate-sdk = " sdk_host_combine_spdx" |
| 938 | POPULATE_SDK_POST_TARGET_COMMAND:append:task-populate-sdk = " sdk_target_combine_spdx; " | 938 | POPULATE_SDK_POST_TARGET_COMMAND:append:task-populate-sdk = " sdk_target_combine_spdx" |
| 939 | 939 | ||
| 940 | python image_combine_spdx() { | 940 | python image_combine_spdx() { |
| 941 | import os | 941 | import os |
