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 /meta/classes-recipe/core-image.bbclass | |
| 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>
Diffstat (limited to 'meta/classes-recipe/core-image.bbclass')
| -rw-r--r-- | meta/classes-recipe/core-image.bbclass | 2 |
1 files changed, 1 insertions, 1 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 |