Replaced :append with += in multiple recipe files under meta layer.
PATCH 1/1 Replaced :append with += in multiple recipe files under meta layer.
Fixes [YOCTO #2951]
Conditional operator is preferred over the append operation, hence modified multiple recipes under the meta-layer.
--- meta/recipes-bsp/grub/grub-efi_2.12.bb | 2 +- meta/recipes-core/initscripts/initscripts_1.0.bb | 2 +- meta/recipes-core/sysvinit/sysvinit_3.04.bb | 2 +- .../baremetal-example/baremetal-helloworld_git.bb | 2 +- meta/recipes-extended/less/less_643.bb | 2 +- meta/recipes-gnome/librsvg/librsvg_2.57.1.bb | 2 +- meta/recipes-graphics/waffle/waffle_1.7.2.bb | 2 +- meta/recipes-support/libgpg-error/libgpg-error_1.48.bb | 2 +- meta/recipes-support/ptest-runner/ptest-runner_2.4.3.bb | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-)
meta/recipes-bsp/grub/grub-efi_2.12.bb +1 -1
@@ -4,7 +4,7 @@ require conf/image-uefi.conf GRUBPLATFORM = "efi" -DEPENDS:append = " grub-native" +DEPENDS += " grub-native" RDEPENDS:${PN} = "grub-common virtual-grub-bootconf" SRC_URI += " \
meta/recipes-core/initscripts/initscripts_1.0.bb +1 -1
@@ -42,7 +42,7 @@ SRC_URI:append:armeb = " file://alignment.sh" KERNEL_VERSION = "" -DEPENDS:append = " update-rc.d-native" +DEPENDS += " update-rc.d-native" PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" PACKAGES =+ "${PN}-functions ${PN}-sushell"
meta/recipes-core/sysvinit/sysvinit_3.04.bb +1 -1
@@ -28,7 +28,7 @@ SRC_URI[sha256sum] = "2a621fe6e4528bc91308b74867ddaaebbdf7753f02395c0c5bae817bd2 S = "${WORKDIR}/sysvinit-${PV}" inherit update-alternatives features_check -DEPENDS:append = " update-rc.d-native base-passwd virtual/crypt" +DEPENDS += " update-rc.d-native base-passwd virtual/crypt" do_package_setscene[depends] = "${MLPREFIX}base-passwd:do_populate_sysroot" PACKAGECONFIG[psplash-text-updates] = ",,"
meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb +1 -1
@@ -25,7 +25,7 @@ inherit baremetal-image # startup code for x86 uses NASM syntax -DEPENDS:qemux86:append = " nasm-native" +DEPENDS:qemux86 += " nasm-native" # These parameters are app specific for this example # This will be translated automatically to the architecture and
meta/recipes-extended/less/less_643.bb +1 -1
@@ -55,7 +55,7 @@ do_install_ptest () { cp -r ${S}/lesstest/lt ${D}${PTEST_PATH} } -RDEPENDS:${PN}-ptest:append = " perl-module-getopt-std perl-module-cwd locale-base-en-us" +RDEPENDS:${PN}-ptest += " perl-module-getopt-std perl-module-cwd locale-base-en-us" ALTERNATIVE:${PN} = "less" ALTERNATIVE_PRIORITY = "100"
meta/recipes-gnome/librsvg/librsvg_2.57.1.bb +1 -1
@@ -30,7 +30,7 @@ UPSTREAM_CHECK_REGEX = "librsvg-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" # librsvg is still autotools-based, but is calling cargo from its automake-driven makefiles # so we cannot use cargo class directly, but still need bits and pieces from it # for cargo to be happy -BASEDEPENDS:append = " cargo-native" +BASEDEPENDS += " cargo-native" export RUST_BACKTRACE = "full" export RUSTFLAGS
meta/recipes-graphics/waffle/waffle_1.7.2.bb +1 -1
@@ -18,7 +18,7 @@ S = "${WORKDIR}/git" inherit meson features_check lib_package bash-completion pkgconfig -DEPENDS:append = " python3" +DEPENDS += " python3" # This should be overridden per-machine to reflect the capabilities of the GL # stack.
meta/recipes-support/libgpg-error/libgpg-error_1.48.bb +1 -1
@@ -26,7 +26,7 @@ BINCONFIG = "${bindir}/gpg-error-config" inherit autotools binconfig-disabled pkgconfig gettext multilib_header multilib_script ptest -RDEPENDS:${PN}-ptest:append = " make bash" +RDEPENDS:${PN}-ptest += " make bash" MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/gpgrt-config"
meta/recipes-support/ptest-runner/ptest-runner_2.4.3.bb +1 -1
@@ -31,7 +31,7 @@ do_install () { RDEPENDS:${PN}:append:libc-glibc = " libgcc" # pstree is called by ptest-runner-collect-system-data -RDEPENDS:${PN}:append = " pstree" +RDEPENDS:${PN} += " pstree" # Create a non-root user that test suites can use easily inherit useradd
Signature · 1 line
2.34.1
Quoted 3 lines · K Sanjay Nayak
Fixes [YOCTO #2951]
Conditional operator is preferred over the append operation,
I don't believe += is conditional.
Quoted 146 lines
hence modified multiple recipes under the meta-layer.
Reported-by Christopher Larson <[email protected]>Signed-off-by K Sanjay Nayak <[email protected]>--- meta/recipes-bsp/grub/grub-efi_2.12.bb | 2 +- meta/recipes-core/initscripts/initscripts_1.0.bb | 2 +- meta/recipes-core/sysvinit/sysvinit_3.04.bb | 2 +- .../baremetal-example/baremetal-helloworld_git.bb | 2 +- meta/recipes-extended/less/less_643.bb | 2 +- meta/recipes-gnome/librsvg/librsvg_2.57.1.bb | 2 +- meta/recipes-graphics/waffle/waffle_1.7.2.bb | 2 +- meta/recipes-support/libgpg-error/libgpg-error_1.48.bb | 2 +- meta/recipes-support/ptest-runner/ptest-runner_2.4.3.bb | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-)meta/recipes-bsp/grub/grub-efi_2.12.bb +1
-1@@ -4,7 +4,7 @@ require conf/image-uefi.conf GRUBPLATFORM = "efi" -DEPENDS:append = " grub-native" +DEPENDS += " grub-native" RDEPENDS:${PN} = "grub-common virtual-grub-bootconf" SRC_URI += " \meta/recipes-core/initscripts/initscripts_1.0.bb +1
-1@@ -42,7 +42,7 @@ SRC_URI:append:armeb = " file://alignment.sh" KERNEL_VERSION = "" -DEPENDS:append = " update-rc.d-native" +DEPENDS += " update-rc.d-native" PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" PACKAGES =+ "${PN}-functions ${PN}-sushell"meta/recipes-core/sysvinit/sysvinit_3.04.bb +1
-1@@ -28,7 +28,7 @@ SRC_URI[sha256sum] = "2a621fe6e4528bc91308b74867ddaaebbdf7753f02395c0c5bae817bd2 S = "${WORKDIR}/sysvinit-${PV}" inherit update-alternatives features_check -DEPENDS:append = " update-rc.d-native base-passwd virtual/crypt" +DEPENDS += " update-rc.d-native base-passwd virtual/crypt" do_package_setscene[depends] = "${MLPREFIX}base-passwd:do_populate_sysroot" PACKAGECONFIG[psplash-text-updates] = ",,"meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb +1
-1@@ -25,7 +25,7 @@ inherit baremetal-image # startup code for x86 uses NASM syntax -DEPENDS:qemux86:append = " nasm-native" +DEPENDS:qemux86 += " nasm-native" # These parameters are app specific for this example # This will be translated automatically to the architecture andmeta/recipes-extended/less/less_643.bb +1
-1@@ -55,7 +55,7 @@ do_install_ptest () { cp -r ${S}/lesstest/lt ${D}${PTEST_PATH} } -RDEPENDS:${PN}-ptest:append = " perl-module-getopt-std perl-module-cwd locale-base-en-us" +RDEPENDS:${PN}-ptest += " perl-module-getopt-std perl-module-cwd locale-base-en-us" ALTERNATIVE:${PN} = "less" ALTERNATIVE_PRIORITY = "100"meta/recipes-gnome/librsvg/librsvg_2.57.1.bb +1
-1@@ -30,7 +30,7 @@ UPSTREAM_CHECK_REGEX = "librsvg-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" # librsvg is still autotools-based, but is calling cargo from its automake-driven makefiles # so we cannot use cargo class directly, but still need bits and pieces from it # for cargo to be happy -BASEDEPENDS:append = " cargo-native" +BASEDEPENDS += " cargo-native" export RUST_BACKTRACE = "full" export RUSTFLAGSmeta/recipes-graphics/waffle/waffle_1.7.2.bb +1
-1@@ -18,7 +18,7 @@ S = "${WORKDIR}/git" inherit meson features_check lib_package bash-completion pkgconfig -DEPENDS:append = " python3" +DEPENDS += " python3" # This should be overridden per-machine to reflect the capabilities of the GL # stack.meta/recipes-support/libgpg-error/libgpg-error_1.48.bb +1
-1@@ -26,7 +26,7 @@ BINCONFIG = "${bindir}/gpg-error-config" inherit autotools binconfig-disabled pkgconfig gettext multilib_header multilib_script ptest -RDEPENDS:${PN}-ptest:append = " make bash" +RDEPENDS:${PN}-ptest += " make bash" MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/gpgrt-config"meta/recipes-support/ptest-runner/ptest-runner_2.4.3.bb +1
-1@@ -31,7 +31,7 @@ do_install () { RDEPENDS:${PN}:append:libc-glibc = " libgcc" # pstree is called by ptest-runner-collect-system-data -RDEPENDS:${PN}:append = " pstree" +RDEPENDS:${PN} += " pstree" # Create a non-root user that test suites can use easily inherit useraddSignature · 11 lines
2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#198154): https://lists.openembedded.org/g/openembedded-core/message/198154 Mute This Topic: https://lists.openembedded.org/mt/105477868/3617179 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Quoted 26 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of K Sanjay Nayak
Sent: den 12 april 2024 08:06
To: [email protected]
Cc: K Sanjay Nayak <[email protected]>
Subject: [OE-core] [PATCH] Replaced :append with += in multiple recipe files under meta layer.Fixes [YOCTO #2951]
Conditional operator is preferred over the append operation, hence modified multiple recipes under the meta-layer.
Reported-by Christopher Larson <[email protected]>Signed-off-by K Sanjay Nayak <[email protected]>--- meta/recipes-bsp/grub/grub-efi_2.12.bb | 2 +- meta/recipes-core/initscripts/initscripts_1.0.bb | 2 +- meta/recipes-core/sysvinit/sysvinit_3.04.bb | 2 +- .../baremetal-example/baremetal-helloworld_git.bb | 2 +- meta/recipes-extended/less/less_643.bb | 2 +- meta/recipes-gnome/librsvg/librsvg_2.57.1.bb | 2 +- meta/recipes-graphics/waffle/waffle_1.7.2.bb | 2 +- meta/recipes-support/libgpg-error/libgpg-error_1.48.bb | 2 +- meta/recipes-support/ptest-runner/ptest-runner_2.4.3.bb | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-)
[cut]
meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb inherit baremetal-image · line 28
Quoted 10 lines
meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb +1
-1@@ -25,7 +25,7 @@ inherit baremetal-image # startup code for x86 uses NASM syntax -DEPENDS:qemux86:append = " nasm-native" +DEPENDS:qemux86 += " nasm-native"
While there may be cases where the above may be correct, I do not think this is one of them, especially as this is an example recipe. The above should be:
DEPENDS:append:qemux86 = " nasm-native"
//Peter