mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing leading whitespace with ':append'

Browse Source 
Mitigate occurences where ':append' operator is used and leading
whitespace character is obviously missing, risking inadvertent
string concatenation.

(From OE-Core rev: fcd340ec53ff8352b8cae0eb351810072b025a08)

Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Niko Mauno
2023-01-24 11:47:07 +00:00
committed by Richard Purdie
parent 372960044f
commit 1125b85e79
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes-recipe/core-image.bbclass
View File

@@ -65,7 +65,7 @@ IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear"
# Do not install openssh complementary packages if either packagegroup-core-ssh-dropbear or dropbear # Do not install openssh complementary packages if either packagegroup-core-ssh-dropbear or dropbear
# is installed # to avoid openssh-dropbear conflict # is installed # to avoid openssh-dropbear conflict
# see [Yocto #14858] for more information # see [Yocto #14858] for more information
PACKAGE_EXCLUDE_COMPLEMENTARY:append = "${@bb.utils.contains_any('PACKAGE_INSTALL', 'packagegroup-core-ssh-dropbear dropbear', 'openssh', '' , d)}" PACKAGE_EXCLUDE_COMPLEMENTARY:append = "${@bb.utils.contains_any('PACKAGE_INSTALL', 'packagegroup-core-ssh-dropbear dropbear', ' openssh', '' , d)}"
# IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2' # IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2'
# An error exception would be raised if both image features foo and bar1(or bar2) are included # An error exception would be raised if both image features foo and bar1(or bar2) are included

2
meta/classes-recipe/populate_sdk_ext.bbclass
View File

@@ -120,7 +120,7 @@ python write_host_sdk_ext_manifest () {
f.write("%s %s %s\n" % (info[1], info[2], info[3])) f.write("%s %s %s\n" % (info[1], info[2], info[3]))
} }
SDK_POSTPROCESS_COMMAND:append:task-populate-sdk-ext = "write_target_sdk_ext_manifest; write_host_sdk_ext_manifest; " SDK_POSTPROCESS_COMMAND:append:task-populate-sdk-ext = " write_target_sdk_ext_manifest; write_host_sdk_ext_manifest; "
SDK_TITLE:task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME') or d.getVar('DISTRO')} Extensible SDK" SDK_TITLE:task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME') or d.getVar('DISTRO')} Extensible SDK"

4
meta/conf/distro/include/ptest-packagelists.inc
View File

@@ -106,10 +106,10 @@ PTESTS_SLOW = "\
" "
PTESTS_SLOW:remove:riscv64 = "valgrind-ptest" PTESTS_SLOW:remove:riscv64 = "valgrind-ptest"
PTESTS_PROBLEMS:append:riscv64 = "valgrind-ptest" PTESTS_PROBLEMS:append:riscv64 = " valgrind-ptest"
PTESTS_SLOW:append:libc-musl = " libc-test-ptest" PTESTS_SLOW:append:libc-musl = " libc-test-ptest"
PTESTS_SLOW:remove:x86 = "valgrind-ptest" PTESTS_SLOW:remove:x86 = "valgrind-ptest"
PTESTS_PROBLEMS:append:x86 = "valgrind-ptest" PTESTS_PROBLEMS:append:x86 = " valgrind-ptest"
# ruby-ptest \ # Timeout # ruby-ptest \ # Timeout
# lz4-ptest \ # Needs a rewrite # lz4-ptest \ # Needs a rewrite