diff options
| author | Niko Mauno <niko.mauno@vaisala.com> | 2023-01-24 11:47:07 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-04 23:32:28 +0000 |
| commit | b69d0e77e2f920436b6c721405719539ff13ffe7 (patch) | |
| tree | 1b6b9e5103b668c8a8538a147c578eb9a0ca3aa7 | |
| parent | 872fbf4ccc7b2e0065657d090327d0381cd759cf (diff) | |
| download | poky-b69d0e77e2f920436b6c721405719539ff13ffe7.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: ab39d244cb844c9d183296945a095c17fdfef29e)
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>
(cherry picked from commit fcd340ec53ff8352b8cae0eb351810072b025a08)
Signed-off-by: Steve Sakoman <steve@sakoman.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 | 2 |
3 files changed, 3 insertions, 3 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 925cb313fc..80f4f0be05 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 56088e4e66..99929accce 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc | |||
| @@ -103,7 +103,7 @@ PTESTS_SLOW = "\ | |||
| 103 | " | 103 | " |
| 104 | 104 | ||
| 105 | PTESTS_SLOW:remove:riscv64 = "valgrind-ptest" | 105 | PTESTS_SLOW:remove:riscv64 = "valgrind-ptest" |
| 106 | PTESTS_PROBLEMS:append:riscv64 = "valgrind-ptest" | 106 | PTESTS_PROBLEMS:append:riscv64 = " valgrind-ptest" |
| 107 | 107 | ||
| 108 | # ruby-ptest \ # Timeout | 108 | # ruby-ptest \ # Timeout |
| 109 | # lz4-ptest \ # Needs a rewrite | 109 | # lz4-ptest \ # Needs a rewrite |
