diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/core-image.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 2 |
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 |
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 |
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 | ||
117 | SDK_POSTPROCESS_COMMAND:append:task-populate-sdk-ext = "write_target_sdk_ext_manifest; write_host_sdk_ext_manifest; " | 117 | SDK_POSTPROCESS_COMMAND:append:task-populate-sdk-ext = " write_target_sdk_ext_manifest; write_host_sdk_ext_manifest; " |
118 | 118 | ||
119 | SDK_TITLE:task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME') or d.getVar('DISTRO')} Extensible SDK" | 119 | SDK_TITLE:task-populate-sdk-ext = "${@d.getVar('DISTRO_NAME') or d.getVar('DISTRO')} Extensible SDK" |
120 | 120 | ||