* [PATCH] Replaced :append with += in multiple recipe files under meta layer.
@ 2024-04-12 6:05 K Sanjay Nayak
2024-04-12 10:34 ` [OE-core] " Alexandre Belloni
2024-04-12 14:52 ` Peter Kjellerstedt
0 siblings, 2 replies; 3+ messages in thread
From: K Sanjay Nayak @ 2024-04-12 6:05 UTC (permalink / raw)
To: openembedded-core; +Cc: K Sanjay Nayak
Fixes [YOCTO #2951]
Conditional operator is preferred over the append operation,
hence modified multiple recipes under the meta-layer.
Reported-by : Christopher Larson <kergoth@gmail.com>
Signed-off-by: K Sanjay Nayak <nayakksanjay@gmail.com>
---
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(-)
diff --git a/meta/recipes-bsp/grub/grub-efi_2.12.bb b/meta/recipes-bsp/grub/grub-efi_2.12.bb
index 9857e8e036..4cd1c696f4 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.12.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.12.bb
@@ -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 += " \
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index e61ac554f3..2ad4d0b0b0 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -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"
diff --git a/meta/recipes-core/sysvinit/sysvinit_3.04.bb b/meta/recipes-core/sysvinit/sysvinit_3.04.bb
index 6a612468f3..2dee7bc3ce 100644
--- a/meta/recipes-core/sysvinit/sysvinit_3.04.bb
+++ b/meta/recipes-core/sysvinit/sysvinit_3.04.bb
@@ -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] = ",,"
diff --git a/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb b/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
index 6832ccc541..f66581cca3 100644
--- a/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
+++ b/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
@@ -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
diff --git a/meta/recipes-extended/less/less_643.bb b/meta/recipes-extended/less/less_643.bb
index 67834bdd58..5c17571768 100644
--- a/meta/recipes-extended/less/less_643.bb
+++ b/meta/recipes-extended/less/less_643.bb
@@ -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"
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.57.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.57.1.bb
index 4b52d4062b..b774fe8c47 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.57.1.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.57.1.bb
@@ -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
diff --git a/meta/recipes-graphics/waffle/waffle_1.7.2.bb b/meta/recipes-graphics/waffle/waffle_1.7.2.bb
index cb917d8894..84f2f70ab2 100644
--- a/meta/recipes-graphics/waffle/waffle_1.7.2.bb
+++ b/meta/recipes-graphics/waffle/waffle_1.7.2.bb
@@ -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.
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.48.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.48.bb
index 9f2b49209d..b268d5b9c1 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.48.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.48.bb
@@ -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"
diff --git a/meta/recipes-support/ptest-runner/ptest-runner_2.4.3.bb b/meta/recipes-support/ptest-runner/ptest-runner_2.4.3.bb
index e6668da01f..30838cb3a6 100644
--- a/meta/recipes-support/ptest-runner/ptest-runner_2.4.3.bb
+++ b/meta/recipes-support/ptest-runner/ptest-runner_2.4.3.bb
@@ -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
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [OE-core] [PATCH] Replaced :append with += in multiple recipe files under meta layer.
2024-04-12 6:05 [PATCH] Replaced :append with += in multiple recipe files under meta layer K Sanjay Nayak
@ 2024-04-12 10:34 ` Alexandre Belloni
2024-04-12 14:52 ` Peter Kjellerstedt
1 sibling, 0 replies; 3+ messages in thread
From: Alexandre Belloni @ 2024-04-12 10:34 UTC (permalink / raw)
To: K Sanjay Nayak; +Cc: openembedded-core
On 12/04/2024 11:35:36+0530, K Sanjay Nayak wrote:
> Fixes [YOCTO #2951]
>
> Conditional operator is preferred over the append operation,
I don't believe += is conditional.
> hence modified multiple recipes under the meta-layer.
>
> Reported-by : Christopher Larson <kergoth@gmail.com>
> Signed-off-by: K Sanjay Nayak <nayakksanjay@gmail.com>
> ---
> 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(-)
>
> diff --git a/meta/recipes-bsp/grub/grub-efi_2.12.bb b/meta/recipes-bsp/grub/grub-efi_2.12.bb
> index 9857e8e036..4cd1c696f4 100644
> --- a/meta/recipes-bsp/grub/grub-efi_2.12.bb
> +++ b/meta/recipes-bsp/grub/grub-efi_2.12.bb
> @@ -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 += " \
> diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
> index e61ac554f3..2ad4d0b0b0 100644
> --- a/meta/recipes-core/initscripts/initscripts_1.0.bb
> +++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
> @@ -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"
> diff --git a/meta/recipes-core/sysvinit/sysvinit_3.04.bb b/meta/recipes-core/sysvinit/sysvinit_3.04.bb
> index 6a612468f3..2dee7bc3ce 100644
> --- a/meta/recipes-core/sysvinit/sysvinit_3.04.bb
> +++ b/meta/recipes-core/sysvinit/sysvinit_3.04.bb
> @@ -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] = ",,"
> diff --git a/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb b/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
> index 6832ccc541..f66581cca3 100644
> --- a/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
> +++ b/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
> @@ -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
> diff --git a/meta/recipes-extended/less/less_643.bb b/meta/recipes-extended/less/less_643.bb
> index 67834bdd58..5c17571768 100644
> --- a/meta/recipes-extended/less/less_643.bb
> +++ b/meta/recipes-extended/less/less_643.bb
> @@ -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"
> diff --git a/meta/recipes-gnome/librsvg/librsvg_2.57.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.57.1.bb
> index 4b52d4062b..b774fe8c47 100644
> --- a/meta/recipes-gnome/librsvg/librsvg_2.57.1.bb
> +++ b/meta/recipes-gnome/librsvg/librsvg_2.57.1.bb
> @@ -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
> diff --git a/meta/recipes-graphics/waffle/waffle_1.7.2.bb b/meta/recipes-graphics/waffle/waffle_1.7.2.bb
> index cb917d8894..84f2f70ab2 100644
> --- a/meta/recipes-graphics/waffle/waffle_1.7.2.bb
> +++ b/meta/recipes-graphics/waffle/waffle_1.7.2.bb
> @@ -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.
> diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.48.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.48.bb
> index 9f2b49209d..b268d5b9c1 100644
> --- a/meta/recipes-support/libgpg-error/libgpg-error_1.48.bb
> +++ b/meta/recipes-support/libgpg-error/libgpg-error_1.48.bb
> @@ -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"
>
> diff --git a/meta/recipes-support/ptest-runner/ptest-runner_2.4.3.bb b/meta/recipes-support/ptest-runner/ptest-runner_2.4.3.bb
> index e6668da01f..30838cb3a6 100644
> --- a/meta/recipes-support/ptest-runner/ptest-runner_2.4.3.bb
> +++ b/meta/recipes-support/ptest-runner/ptest-runner_2.4.3.bb
> @@ -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
> --
> 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: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread* RE: [OE-core] [PATCH] Replaced :append with += in multiple recipe files under meta layer.
2024-04-12 6:05 [PATCH] Replaced :append with += in multiple recipe files under meta layer K Sanjay Nayak
2024-04-12 10:34 ` [OE-core] " Alexandre Belloni
@ 2024-04-12 14:52 ` Peter Kjellerstedt
1 sibling, 0 replies; 3+ messages in thread
From: Peter Kjellerstedt @ 2024-04-12 14:52 UTC (permalink / raw)
To: K Sanjay Nayak, openembedded-core@lists.openembedded.org
> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of K Sanjay Nayak
> Sent: den 12 april 2024 08:06
> To: openembedded-core@lists.openembedded.org
> Cc: K Sanjay Nayak <nayakksanjay@gmail.com>
> 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 <kergoth@gmail.com>
> Signed-off-by: K Sanjay Nayak <nayakksanjay@gmail.com>
> ---
> 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]
> diff --git a/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb b/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
> index 6832ccc541..f66581cca3 100644
> --- a/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
> +++ b/meta/recipes-extended/baremetal-example/baremetal-helloworld_git.bb
> @@ -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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-04-12 14:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-12 6:05 [PATCH] Replaced :append with += in multiple recipe files under meta layer K Sanjay Nayak
2024-04-12 10:34 ` [OE-core] " Alexandre Belloni
2024-04-12 14:52 ` Peter Kjellerstedt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox