> -----Original Message-----
> From: [email protected]
> <[email protected]> On Behalf Of Richard Purdie
> Sent: den 8 september 2023 00:11
> To: [email protected]
> Subject: [OE-core] [PATCH] 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.
>
> Signed-off-by: Richard Purdie <[email protected]>
> ---
> .../classes-recipe/image-combined-dbg.bbclass | 2 +-
> meta/classes-recipe/image.bbclass | 8 ++---
> meta/classes-recipe/license_image.bbclass | 2 +-
> meta/classes-recipe/overlayfs-etc.bbclass | 2 +-
> meta/classes-recipe/populate_sdk_base.bbclass | 13 ++++----
> meta/classes-recipe/populate_sdk_ext.bbclass | 4 +--
> .../rootfs-postcommands.bbclass | 30 +++++++++----------
> meta/classes-recipe/rootfsdebugfiles.bbclass | 2 +-
> meta/classes/buildhistory.bbclass | 26 ++++++++--------
> meta/classes/create-spdx-2.2.bbclass | 6 ++--
> meta/classes/cve-check.bbclass | 2 +-
> meta/classes/extrausers.bbclass | 2 +-
> meta/classes/image-buildinfo.bbclass | 4 +--
> meta/lib/oe/utils.py | 10 +++----
> .../images/build-appliance-image_15.0.0.bb | 2 +-
> .../images/core-image-tiny-initramfs.bb | 2 +-
> 16 files changed, 58 insertions(+), 59 deletions(-)
>
> diff --git a/meta/classes-recipe/image-combined-dbg.bbclass
> b/meta/classes-recipe/image-combined-dbg.bbclass
> index dcf19685389..729313739c1 100644
> --- a/meta/classes-recipe/image-combined-dbg.bbclass
> +++ b/meta/classes-recipe/image-combined-dbg.bbclass
> @@ -4,7 +4,7 @@
> # SPDX-License-Identifier: MIT
> #
>
> -IMAGE_PREPROCESS_COMMAND:append = " combine_dbg_image; "
> +IMAGE_PREPROCESS_COMMAND:append = " combine_dbg_image"
>
> combine_dbg_image () {
> if [ "${IMAGE_GEN_DEBUGFS}" = "1" -a -e ${IMAGE_ROOTFS}-dbg ]; then
> diff --git a/meta/classes-recipe/image.bbclass
> b/meta/classes-recipe/image.bbclass
> index 21b220a28db..003fa63eb70 100644
> --- a/meta/classes-recipe/image.bbclass
> +++ b/meta/classes-recipe/image.bbclass
> @@ -25,7 +25,7 @@ inherit ${IMGCLASSES}
>
> TOOLCHAIN_TARGET_TASK += "${PACKAGE_INSTALL}"
> TOOLCHAIN_TARGET_TASK_ATTEMPTONLY += "${PACKAGE_INSTALL_ATTEMPTONLY}"
> -POPULATE_SDK_POST_TARGET_COMMAND += "rootfs_sysroot_relativelinks; "
> +POPULATE_SDK_POST_TARGET_COMMAND += "rootfs_sysroot_relativelinks"
>
> LICENSE ?= "MIT"
> PACKAGES = ""
> @@ -657,8 +657,8 @@ create_merged_usr_symlinks_sdk() {
> create_merged_usr_symlinks ${SDK_OUTPUT}${SDKTARGETSYSROOT}
> }
>
> -ROOTFS_PREPROCESS_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES',
> 'usrmerge', 'create_merged_usr_symlinks_rootfs; ', '',d)}"
> -POPULATE_SDK_PRE_TARGET_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES',
> 'usrmerge', 'create_merged_usr_symlinks_sdk; ', '',d)}"
> +ROOTFS_PREPROCESS_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES',
> 'usrmerge', 'create_merged_usr_symlinks_rootfs', '',d)}"
> +POPULATE_SDK_PRE_TARGET_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES',
> 'usrmerge', 'create_merged_usr_symlinks_sdk', '',d)}"
>
> reproducible_final_image_task () {
> if [ "$REPRODUCIBLE_TIMESTAMP_ROOTFS" = "" ]; then
> @@ -678,6 +678,6 @@ systemd_preset_all () {
> fi
> }
>
> -IMAGE_PREPROCESS_COMMAND:append = " ${@ 'systemd_preset_all;' if
> bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d) and not
> bb.utils.contains('IMAGE_FEATURES', 'stateless-rootfs', True, False, d) else
> ''} reproducible_final_image_task; "
> +IMAGE_PREPROCESS_COMMAND:append = " ${@ 'systemd_preset_all' if
> bb.utils.contains('DISTRO_FEATURES', 'systemd', True, False, d) and not
> bb.utils.contains('IMAGE_FEATURES', 'stateless-rootfs', True, False, d) else
> ''} reproducible_final_image_task "
>
> CVE_PRODUCT = ""
> diff --git a/meta/classes-recipe/license_image.bbclass
> b/meta/classes-recipe/license_image.bbclass
> index 8560c27e934..fc859c7c659 100644
> --- a/meta/classes-recipe/license_image.bbclass
> +++ b/meta/classes-recipe/license_image.bbclass
> @@ -272,7 +272,7 @@ def get_deployed_files(man_file):
> dep_files.append(os.path.basename(f))
> return dep_files
>
> -ROOTFS_POSTPROCESS_COMMAND:prepend = "write_package_manifest;
> license_create_manifest; "
> +ROOTFS_POSTPROCESS_COMMAND:prepend = "write_package_manifest
> license_create_manifest "
> do_rootfs[recrdeptask] += "do_populate_lic"
>
> python do_populate_lic_deploy() {
> diff --git a/meta/classes-recipe/overlayfs-etc.bbclass
> b/meta/classes-recipe/overlayfs-etc.bbclass
> index f8343106f3d..0c7834d01f4 100644
> --- a/meta/classes-recipe/overlayfs-etc.bbclass
> +++ b/meta/classes-recipe/overlayfs-etc.bbclass
> @@ -31,7 +31,7 @@
> # Regardless which mode you choose, update and migration strategy of
> configuration files under /etc
> # overlay is out of scope of this class
>
> -ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES",
> "overlayfs-etc", "create_overlayfs_etc_preinit;", "", d)}'
> +ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES",
> "overlayfs-etc", "create_overlayfs_etc_preinit", "", d)}'
> IMAGE_FEATURES_CONFLICTS_overlayfs-etc = "${@ 'package-management' if
> bb.utils.to_boolean(d.getVar('OVERLAYFS_ETC_USE_ORIG_INIT_NAME'), True) else
> ''}"
>
> OVERLAYFS_ETC_MOUNT_POINT ??= ""
> diff --git a/meta/classes-recipe/populate_sdk_base.bbclass
> b/meta/classes-recipe/populate_sdk_base.bbclass
> index b23ea26d409..dfd4bb1d4d9 100644
> --- a/meta/classes-recipe/populate_sdk_base.bbclass
> +++ b/meta/classes-recipe/populate_sdk_base.bbclass
> @@ -152,12 +152,12 @@ python write_host_sdk_manifest () {
> output.write(format_pkg_list(pkgs, 'ver'))
> }
>
> -POPULATE_SDK_POST_TARGET_COMMAND:append = " write_sdk_test_data ; "
> -POPULATE_SDK_POST_TARGET_COMMAND:append:task-populate-sdk = "
> write_target_sdk_manifest; sdk_prune_dirs; "
> -POPULATE_SDK_POST_HOST_COMMAND:append:task-populate-sdk = "
> write_host_sdk_manifest; "
> +POPULATE_SDK_POST_TARGET_COMMAND:append = " write_sdk_test_data"
> +POPULATE_SDK_POST_TARGET_COMMAND:append:task-populate-sdk = "
> write_target_sdk_manifest sdk_prune_dirs"
> +POPULATE_SDK_POST_HOST_COMMAND:append:task-populate-sdk = "
> write_host_sdk_manifest"
>
> -SDK_PACKAGING_COMMAND = "${@'${SDK_PACKAGING_FUNC};' if
> '${SDK_PACKAGING_FUNC}' else ''}"
> -SDK_POSTPROCESS_COMMAND = " create_sdk_files; check_sdk_sysroots;
> archive_sdk; ${SDK_PACKAGING_COMMAND} "
> +SDK_PACKAGING_COMMAND = "${@'${SDK_PACKAGING_FUNC}' if
> '${SDK_PACKAGING_FUNC}' else ''}"
> +SDK_POSTPROCESS_COMMAND = "create_sdk_files check_sdk_sysroots archive_sdk
> ${SDK_PACKAGING_COMMAND}"
>
> def populate_sdk_common(d):
> from oe.sdk import populate_sdk
> @@ -372,8 +372,7 @@ do_populate_sdk[vardeps] += "${@sdk_variables(d)}"
> python () {
> variables = sdk_command_variables(d)
> for var in variables:
> - if d.getVar(var, False):
> - d.setVarFlag(var, 'func', '1')
> + d.setVarFlag(var, 'vardeps', d.getVar(var))
Was this really supposed to be part of this patch? It looks unrelated.
> }
>
> do_populate_sdk[file-checksums] += "${TOOLCHAIN_SHAR_REL_TMPL}:True \
//Peter
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#187443):
https://lists.openembedded.org/g/openembedded-core/message/187443
Mute This Topic: https://lists.openembedded.org/mt/101225689/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
