summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorNiko Mauno <niko.mauno@vaisala.com>2023-01-29 09:32:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-04 23:32:20 +0000
commit4abffe76eb22d42149da6118ac219690bb11a3b9 (patch)
treec0dbf92387706b2e11c4b222c4f83307ee40ee0c /meta/classes
parent579047d4e6bd7a69bc5bf2ded508f17df0950600 (diff)
downloadpoky-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')
-rw-r--r--meta/classes/core-image.bbclass2
-rw-r--r--meta/classes/populate_sdk_ext.bbclass2
2 files changed, 2 insertions, 2 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
65PACKAGE_EXCLUDE_COMPLEMENTARY:append = "${@bb.utils.contains_any('PACKAGE_INSTALL', 'packagegroup-core-ssh-dropbear dropbear', 'openssh', '' , d)}" 65PACKAGE_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
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index e2019f9bbf..0fd30478dc 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -114,7 +114,7 @@ python write_host_sdk_ext_manifest () {
114 f.write("%s %s %s\n" % (info[1], info[2], info[3])) 114 f.write("%s %s %s\n" % (info[1], info[2], info[3]))
115} 115}
116 116
117SDK_POSTPROCESS_COMMAND:append:task-populate-sdk-ext = "write_target_sdk_ext_manifest; write_host_sdk_ext_manifest; " 117SDK_POSTPROCESS_COMMAND:append:task-populate-sdk-ext = " write_target_sdk_ext_manifest; write_host_sdk_ext_manifest; "
118 118
119SDK_TITLE:task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME') or d.getVar('DISTRO')} Extensible SDK" 119SDK_TITLE:task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME') or d.getVar('DISTRO')} Extensible SDK"
120 120