diff options
| author | Niko Mauno <niko.mauno@vaisala.com> | 2023-01-29 09:32:59 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-04 23:32:20 +0000 |
| commit | 4abffe76eb22d42149da6118ac219690bb11a3b9 (patch) | |
| tree | c0dbf92387706b2e11c4b222c4f83307ee40ee0c /meta/classes/core-image.bbclass | |
| parent | 579047d4e6bd7a69bc5bf2ded508f17df0950600 (diff) | |
| download | poky-4abffe76eb22d42149da6118ac219690bb11a3b9.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)
(From OE-Core rev: cb64ace13db85e143d99627c8803fbb13ba18617)
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>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/core-image.bbclass')
| -rw-r--r-- | meta/classes/core-image.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index 740a6c1d3d..803727da0e 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass | |||
| @@ -62,7 +62,7 @@ IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear" | |||
| 62 | # Do not install openssh complementary packages if either packagegroup-core-ssh-dropbear or dropbear | 62 | # Do not install openssh complementary packages if either packagegroup-core-ssh-dropbear or dropbear |
| 63 | # is installed # to avoid openssh-dropbear conflict | 63 | # is installed # to avoid openssh-dropbear conflict |
| 64 | # see [Yocto #14858] for more information | 64 | # see [Yocto #14858] for more information |
| 65 | PACKAGE_EXCLUDE_COMPLEMENTARY:append = "${@bb.utils.contains_any('PACKAGE_INSTALL', 'packagegroup-core-ssh-dropbear dropbear', 'openssh', '' , d)}" | 65 | PACKAGE_EXCLUDE_COMPLEMENTARY:append = "${@bb.utils.contains_any('PACKAGE_INSTALL', 'packagegroup-core-ssh-dropbear dropbear', ' openssh', '' , d)}" |
| 66 | 66 | ||
| 67 | # IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2' | 67 | # IMAGE_FEATURES_CONFLICTS_foo = 'bar1 bar2' |
| 68 | # An error exception would be raised if both image features foo and bar1(or bar2) are included | 68 | # An error exception would be raised if both image features foo and bar1(or bar2) are included |