1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 48505c8d6c..8a09db1929 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -1,6 +1,9 @@
 inherit rootfs_${IMAGE_PKGTYPE}
-inherit populate_sdk_ext
+# Only Linux SDKs support populate_sdk_ext, fall back to populate_sdk
+# in the non-Linux SDK_OS case, such as mingw32
+SDKEXTCLASS ?= "${@['populate_sdk', 'populate_sdk_ext']['linux' in d.getVar("SDK_OS", True)]}"
+inherit ${SDKEXTCLASS}
 TOOLCHAIN_TARGET_TASK += "${PACKAGE_INSTALL}"
 TOOLCHAIN_TARGET_TASK_ATTEMPTONLY += "${PACKAGE_INSTALL_ATTEMPTONLY}"

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 48505c8d6c..8a09db1929 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass
@@ -1,6 +1,9 @@
1	inherit rootfs_${IMAGE_PKGTYPE}	1	inherit rootfs_${IMAGE_PKGTYPE}
2		2
3	inherit populate_sdk_ext	3	# Only Linux SDKs support populate_sdk_ext, fall back to populate_sdk
		4	# in the non-Linux SDK_OS case, such as mingw32
		5	SDKEXTCLASS ?= "${@['populate_sdk', 'populate_sdk_ext']['linux' in d.getVar("SDK_OS", True)]}"
		6	inherit ${SDKEXTCLASS}
4		7
5	TOOLCHAIN_TARGET_TASK += "${PACKAGE_INSTALL}"	8	TOOLCHAIN_TARGET_TASK += "${PACKAGE_INSTALL}"
6	TOOLCHAIN_TARGET_TASK_ATTEMPTONLY += "${PACKAGE_INSTALL_ATTEMPTONLY}"	9	TOOLCHAIN_TARGET_TASK_ATTEMPTONLY += "${PACKAGE_INSTALL_ATTEMPTONLY}"