diff options
author | Niko Mauno <niko.mauno@vaisala.com> | 2023-01-24 11:47:07 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-01-26 21:06:57 +0000 |
commit | 1125b85e7989e16377de1d5c35852f4822f4c07e (patch) | |
tree | 9f758838b5763ed39e68630e7a3a6e99c51fd7a5 | |
parent | 372960044f3c4180c767f686c316ee2a5b197865 (diff) | |
download | poky-1125b85e7989e16377de1d5c35852f4822f4c07e.tar.gz |
Fix missing leading whitespace with ':append'
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>
-rw-r--r-- | meta/classes-recipe/core-image.bbclass | 2 | ||||
-rw-r--r-- | meta/classes-recipe/populate_sdk_ext.bbclass | 2 | ||||
-rw-r--r-- | meta/conf/distro/include/ptest-packagelists.inc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes-recipe/core-image.bbclass b/meta/classes-recipe/core-image.bbclass index 90d9eb9d3f..40fc15cb04 100644 --- a/meta/classes-recipe/core-image.bbclass +++ b/meta/classes-recipe/core-image.bbclass | |||
@@ -65,7 +65,7 @@ IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear" | |||
65 | # Do not install openssh complementary packages if either packagegroup-core-ssh-dropbear or dropbear | 65 | # Do not install openssh complementary packages if either packagegroup-core-ssh-dropbear or dropbear |
66 | # is installed # to avoid openssh-dropbear conflict | 66 | # is installed # to avoid openssh-dropbear conflict |
67 | # see [Yocto #14858] for more information | 67 | # see [Yocto #14858] for more information |
68 | PACKAGE_EXCLUDE_COMPLEMENTARY:append = "${@bb.utils.contains_any('PACKAGE_INSTALL', 'packagegroup-core-ssh-dropbear dropbear', 'openssh', '' , d)}" | 68 | PACKAGE_EXCLUDE_COMPLEMENTARY:append = "${@bb.utils.contains_any('PACKAGE_INSTALL', 'packagegroup-core-ssh-dropbear dropbear', ' openssh', '' , d)}" |
69 | 69 | ||
70 | # IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2' | 70 | # IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2' |
71 | # An error exception would be raised if both image features foo and bar1(or bar2) are included | 71 | # An error exception would be raised if both image features foo and bar1(or bar2) are included |
diff --git a/meta/classes-recipe/populate_sdk_ext.bbclass b/meta/classes-recipe/populate_sdk_ext.bbclass index f78a9f4e9b..de74a7524c 100644 --- a/meta/classes-recipe/populate_sdk_ext.bbclass +++ b/meta/classes-recipe/populate_sdk_ext.bbclass | |||
@@ -120,7 +120,7 @@ python write_host_sdk_ext_manifest () { | |||
120 | f.write("%s %s %s\n" % (info[1], info[2], info[3])) | 120 | f.write("%s %s %s\n" % (info[1], info[2], info[3])) |
121 | } | 121 | } |
122 | 122 | ||
123 | SDK_POSTPROCESS_COMMAND:append:task-populate-sdk-ext = "write_target_sdk_ext_manifest; write_host_sdk_ext_manifest; " | 123 | SDK_POSTPROCESS_COMMAND:append:task-populate-sdk-ext = " write_target_sdk_ext_manifest; write_host_sdk_ext_manifest; " |
124 | 124 | ||
125 | SDK_TITLE:task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME') or d.getVar('DISTRO')} Extensible SDK" | 125 | SDK_TITLE:task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME') or d.getVar('DISTRO')} Extensible SDK" |
126 | 126 | ||
diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 48dec07577..72162f10ee 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc | |||
@@ -106,10 +106,10 @@ PTESTS_SLOW = "\ | |||
106 | " | 106 | " |
107 | 107 | ||
108 | PTESTS_SLOW:remove:riscv64 = "valgrind-ptest" | 108 | PTESTS_SLOW:remove:riscv64 = "valgrind-ptest" |
109 | PTESTS_PROBLEMS:append:riscv64 = "valgrind-ptest" | 109 | PTESTS_PROBLEMS:append:riscv64 = " valgrind-ptest" |
110 | PTESTS_SLOW:append:libc-musl = " libc-test-ptest" | 110 | PTESTS_SLOW:append:libc-musl = " libc-test-ptest" |
111 | PTESTS_SLOW:remove:x86 = "valgrind-ptest" | 111 | PTESTS_SLOW:remove:x86 = "valgrind-ptest" |
112 | PTESTS_PROBLEMS:append:x86 = "valgrind-ptest" | 112 | PTESTS_PROBLEMS:append:x86 = " valgrind-ptest" |
113 | 113 | ||
114 | # ruby-ptest \ # Timeout | 114 | # ruby-ptest \ # Timeout |
115 | # lz4-ptest \ # Needs a rewrite | 115 | # lz4-ptest \ # Needs a rewrite |