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/buildhistory.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/buildhistory.bbclass')
-rw-r--r-- | meta/classes/buildhistory.bbclass | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 395f594278..fd53e92402 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass | |||
@@ -691,28 +691,28 @@ python buildhistory_get_extra_sdkinfo() { | |||
691 | 691 | ||
692 | # By using ROOTFS_POSTUNINSTALL_COMMAND we get in after uninstallation of | 692 | # By using ROOTFS_POSTUNINSTALL_COMMAND we get in after uninstallation of |
693 | # unneeded packages but before the removal of packaging files | 693 | # unneeded packages but before the removal of packaging files |
694 | ROOTFS_POSTUNINSTALL_COMMAND += "buildhistory_list_installed_image ;" | 694 | ROOTFS_POSTUNINSTALL_COMMAND += "buildhistory_list_installed_image" |
695 | ROOTFS_POSTUNINSTALL_COMMAND += "buildhistory_get_image_installed ;" | 695 | ROOTFS_POSTUNINSTALL_COMMAND += "buildhistory_get_image_installed" |
696 | ROOTFS_POSTUNINSTALL_COMMAND[vardepvalueexclude] .= "| buildhistory_list_installed_image ;| buildhistory_get_image_installed ;" | 696 | ROOTFS_POSTUNINSTALL_COMMAND[vardepvalueexclude] .= "| buildhistory_list_installed_image| buildhistory_get_image_installed" |
697 | ROOTFS_POSTUNINSTALL_COMMAND[vardepsexclude] += "buildhistory_list_installed_image buildhistory_get_image_installed" | 697 | ROOTFS_POSTUNINSTALL_COMMAND[vardepsexclude] += "buildhistory_list_installed_image buildhistory_get_image_installed" |
698 | 698 | ||
699 | IMAGE_POSTPROCESS_COMMAND += "buildhistory_get_imageinfo ;" | 699 | IMAGE_POSTPROCESS_COMMAND += "buildhistory_get_imageinfo" |
700 | IMAGE_POSTPROCESS_COMMAND[vardepvalueexclude] .= "| buildhistory_get_imageinfo ;" | 700 | IMAGE_POSTPROCESS_COMMAND[vardepvalueexclude] .= "| buildhistory_get_imageinfo" |
701 | IMAGE_POSTPROCESS_COMMAND[vardepsexclude] += "buildhistory_get_imageinfo" | 701 | IMAGE_POSTPROCESS_COMMAND[vardepsexclude] += "buildhistory_get_imageinfo" |
702 | 702 | ||
703 | # We want these to be the last run so that we get called after complementary package installation | 703 | # We want these to be the last run so that we get called after complementary package installation |
704 | POPULATE_SDK_POST_TARGET_COMMAND:append = " buildhistory_list_installed_sdk_target;" | 704 | POPULATE_SDK_POST_TARGET_COMMAND:append = " buildhistory_list_installed_sdk_target" |
705 | POPULATE_SDK_POST_TARGET_COMMAND:append = " buildhistory_get_sdk_installed_target;" | 705 | POPULATE_SDK_POST_TARGET_COMMAND:append = " buildhistory_get_sdk_installed_target" |
706 | POPULATE_SDK_POST_TARGET_COMMAND[vardepvalueexclude] .= "| buildhistory_list_installed_sdk_target;| buildhistory_get_sdk_installed_target;" | 706 | POPULATE_SDK_POST_TARGET_COMMAND[vardepvalueexclude] .= "| buildhistory_list_installed_sdk_target| buildhistory_get_sdk_installed_target" |
707 | POPULATE_SDK_POST_TARGET_COMMAND[vardepsexclude] += "buildhistory_list_installed_sdk_target buildhistory_get_sdk_installed_target" | 707 | POPULATE_SDK_POST_TARGET_COMMAND[vardepsexclude] += "buildhistory_list_installed_sdk_target buildhistory_get_sdk_installed_target" |
708 | 708 | ||
709 | POPULATE_SDK_POST_HOST_COMMAND:append = " buildhistory_list_installed_sdk_host;" | 709 | POPULATE_SDK_POST_HOST_COMMAND:append = " buildhistory_list_installed_sdk_host" |
710 | POPULATE_SDK_POST_HOST_COMMAND:append = " buildhistory_get_sdk_installed_host;" | 710 | POPULATE_SDK_POST_HOST_COMMAND:append = " buildhistory_get_sdk_installed_host" |
711 | POPULATE_SDK_POST_HOST_COMMAND[vardepvalueexclude] .= "| buildhistory_list_installed_sdk_host;| buildhistory_get_sdk_installed_host;" | 711 | POPULATE_SDK_POST_HOST_COMMAND[vardepvalueexclude] .= "| buildhistory_list_installed_sdk_host| buildhistory_get_sdk_installed_host" |
712 | POPULATE_SDK_POST_HOST_COMMAND[vardepsexclude] += "buildhistory_list_installed_sdk_host buildhistory_get_sdk_installed_host" | 712 | POPULATE_SDK_POST_HOST_COMMAND[vardepsexclude] += "buildhistory_list_installed_sdk_host buildhistory_get_sdk_installed_host" |
713 | 713 | ||
714 | SDK_POSTPROCESS_COMMAND:append = " buildhistory_get_sdkinfo ; buildhistory_get_extra_sdkinfo; " | 714 | SDK_POSTPROCESS_COMMAND:append = " buildhistory_get_sdkinfo buildhistory_get_extra_sdkinfo" |
715 | SDK_POSTPROCESS_COMMAND[vardepvalueexclude] .= "| buildhistory_get_sdkinfo ; buildhistory_get_extra_sdkinfo; " | 715 | SDK_POSTPROCESS_COMMAND[vardepvalueexclude] .= "| buildhistory_get_sdkinfo buildhistory_get_extra_sdkinfo" |
716 | SDK_POSTPROCESS_COMMAND[vardepsexclude] += "buildhistory_get_sdkinfo buildhistory_get_extra_sdkinfo" | 716 | SDK_POSTPROCESS_COMMAND[vardepsexclude] += "buildhistory_get_sdkinfo buildhistory_get_extra_sdkinfo" |
717 | 717 | ||
718 | python buildhistory_write_sigs() { | 718 | python buildhistory_write_sigs() { |