aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2017-01-30 17:39:12 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-15 09:29:43 -0800
commitb7d6bb07fd37c55d07903a1e8921f17e39afde0a (patch)
treeab1ee9b4691ae6ec2e4e32d4929a5cd27a881d29 /meta/classes
parent096c07900250db157bb0c38785b9d8efc6301cab (diff)
downloadopenembedded-core-contrib-b7d6bb07fd37c55d07903a1e8921f17e39afde0a.tar.gz
openembedded-core-contrib-b7d6bb07fd37c55d07903a1e8921f17e39afde0a.tar.bz2
openembedded-core-contrib-b7d6bb07fd37c55d07903a1e8921f17e39afde0a.zip
image.bbclass: Use 'populate_sdk_base' for non-linux targets
When 'populate_sdk_ext' was first introduced in commit bf81d6bb7f6 it replaced the inheriting of 'populate_sdk_base'. For non-linux targets building the extensible SDK caused build errors, and the image class was changed to inherit 'populate_sdk' when targeting a non-linux SDK_OS (in commmit e471ce3464d). However inheriting 'populate_sdk' instead of 'populate_sdk_base' causes the SDK to always be built, this is not expected for the image class. This change makes the image class inherit 'populate_sdk_base' in the non-linux SDK_OS case so that it behaves the same as it is expected to behave where 'bitbake <image> -c populate_sdk' must be executed to generate the SDK deployables. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 25e00f5daf..5c9dc62861 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -1,8 +1,8 @@
inherit rootfs_${IMAGE_PKGTYPE}
-# Only Linux SDKs support populate_sdk_ext, fall back to populate_sdk
+# Only Linux SDKs support populate_sdk_ext, fall back to populate_sdk_base
# in the non-Linux SDK_OS case, such as mingw32
-SDKEXTCLASS ?= "${@['populate_sdk', 'populate_sdk_ext']['linux' in d.getVar("SDK_OS")]}"
+SDKEXTCLASS ?= "${@['populate_sdk_base', 'populate_sdk_ext']['linux' in d.getVar("SDK_OS")]}"
inherit ${SDKEXTCLASS}
TOOLCHAIN_TARGET_TASK += "${PACKAGE_INSTALL}"