4 files changed, 8 insertions, 5 deletions

diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index a3bf8c2e09..a0a0a80e0b 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -8,7 +8,9 @@ SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
 SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${MULTIMACH_TARGET_SYS}"
 
 TOOLCHAIN_HOST_TASK ?= "task-sdk-host-nativesdk task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= ""
 TOOLCHAIN_TARGET_TASK ?= "task-core-standalone-sdk-target task-core-standalone-sdk-target-dbg"
+TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= ""
 TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}"
 
 RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass
index 920c89a0f3..c3b3e0cde1 100644
--- a/meta/classes/populate_sdk_deb.bbclass
+++ b/meta/classes/populate_sdk_deb.bbclass
@@ -28,7 +28,7 @@ populate_sdk_deb () {
         export INSTALL_BASEARCH_DEB="${DPKG_ARCH}"
         export INSTALL_ARCHS_DEB="${PACKAGE_ARCHS}"
         export INSTALL_PACKAGES_DEB="${TOOLCHAIN_TARGET_TASK}"
-        export INSTALL_PACKAGES_ATTEMPTONLY_DEB=""
+        export INSTALL_PACKAGES_ATTEMPTONLY_DEB="${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}"
         export PACKAGES_LINGUAS_DEB=""
         export INSTALL_TASK_DEB="populate_sdk-target"
 
@@ -44,7 +44,7 @@ populate_sdk_deb () {
         export INSTALL_BASEARCH_DEB="${DEB_SDK_ARCH}"
         export INSTALL_ARCHS_DEB="${SDK_PACKAGE_ARCHS}"
         export INSTALL_PACKAGES_DEB="${TOOLCHAIN_HOST_TASK}"
-        export INSTALL_PACKAGES_ATTEMPTONLY_DEB=""
+        export INSTALL_PACKAGES_ATTEMPTONLY_DEB="${TOOLCHAIN_HOST_TASK_ATTEMPTONLY}"
         export PACKAGES_LINGUAS_DEB=""
         export INSTALL_TASK_DEB="populate_sdk-nativesdk"
 
diff --git a/meta/classes/populate_sdk_ipk.bbclass b/meta/classes/populate_sdk_ipk.bbclass
index c256c69d48..aa3efde20d 100644
--- a/meta/classes/populate_sdk_ipk.bbclass
+++ b/meta/classes/populate_sdk_ipk.bbclass
@@ -11,7 +11,6 @@ populate_sdk_ipk() {
         package_update_index_ipk
         package_generate_ipkg_conf
 
-        export INSTALL_PACKAGES_ATTEMPTONLY_IPK=""
         export INSTALL_PACKAGES_LINGUAS_IPK=""
         export INSTALL_TASK_IPK="populate_sdk"
 
@@ -19,6 +18,7 @@ populate_sdk_ipk() {
         export INSTALL_ROOTFS_IPK="${SDK_OUTPUT}/${SDKTARGETSYSROOT}"
         export INSTALL_CONF_IPK="${IPKGCONF_TARGET}"
         export INSTALL_PACKAGES_IPK="${TOOLCHAIN_TARGET_TASK}"
+        export INSTALL_PACKAGES_ATTEMPTONLY_IPK="${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}"
 
         export D=${INSTALL_ROOTFS_IPK}
         export OFFLINE_ROOT=${INSTALL_ROOTFS_IPK}
@@ -31,6 +31,7 @@ populate_sdk_ipk() {
         export INSTALL_ROOTFS_IPK="${SDK_OUTPUT}"
         export INSTALL_CONF_IPK="${IPKGCONF_SDK}"
         export INSTALL_PACKAGES_IPK="${TOOLCHAIN_HOST_TASK}"
+        export INSTALL_PACKAGES_ATTEMPTONLY_IPK="${TOOLCHAIN_HOST_TASK_ATTEMPTONLY}"
 
         package_install_internal_ipk
 
diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass
index e0adb8f89a..b115c278ee 100644
--- a/meta/classes/populate_sdk_rpm.bbclass
+++ b/meta/classes/populate_sdk_rpm.bbclass
@@ -33,7 +33,7 @@ populate_sdk_rpm () {
         export INSTALL_PLATFORM_RPM="${TARGET_ARCH}"
         export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}"
         export INSTALL_PACKAGES_RPM="${TOOLCHAIN_TARGET_TASK}"
-        export INSTALL_PACKAGES_ATTEMPTONLY_RPM=""
+        export INSTALL_PACKAGES_ATTEMPTONLY_RPM="${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}"
         export INSTALL_PACKAGES_LINGUAS_RPM=""
         export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig pkgconfig(pkg-config)"
         export INSTALL_TASK_RPM="populate_sdk-target"
@@ -82,7 +82,7 @@ EOF
         export INSTALL_PLATFORM_RPM="${SDK_ARCH}"
         export INSTALL_CONFBASE_RPM="${RPMCONF_HOST_BASE}"
         export INSTALL_PACKAGES_RPM="${TOOLCHAIN_HOST_TASK}"
-        export INSTALL_PACKAGES_ATTEMPTONLY_RPM=""
+        export INSTALL_PACKAGES_ATTEMPTONLY_RPM="${TOOLCHAIN_TARGET_HOST_ATTEMPTONLY}"
         export INSTALL_PACKAGES_LINGUAS_RPM=""
         export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig libGL.so()(64bit) libGL.so"
         export INSTALL_TASK_RPM="populate_sdk_rpm-nativesdk"