diff options
-rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/populate_sdk_deb.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/populate_sdk_ipk.bbclass | 3 | ||||
-rw-r--r-- | meta/classes/populate_sdk_rpm.bbclass | 4 |
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" | |||
8 | SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${MULTIMACH_TARGET_SYS}" | 8 | SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${MULTIMACH_TARGET_SYS}" |
9 | 9 | ||
10 | TOOLCHAIN_HOST_TASK ?= "task-sdk-host-nativesdk task-cross-canadian-${TRANSLATED_TARGET_ARCH}" | 10 | TOOLCHAIN_HOST_TASK ?= "task-sdk-host-nativesdk task-cross-canadian-${TRANSLATED_TARGET_ARCH}" |
11 | TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= "" | ||
11 | TOOLCHAIN_TARGET_TASK ?= "task-core-standalone-sdk-target task-core-standalone-sdk-target-dbg" | 12 | TOOLCHAIN_TARGET_TASK ?= "task-core-standalone-sdk-target task-core-standalone-sdk-target-dbg" |
13 | TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= "" | ||
12 | TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}" | 14 | TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}" |
13 | 15 | ||
14 | RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" | 16 | 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 () { | |||
28 | export INSTALL_BASEARCH_DEB="${DPKG_ARCH}" | 28 | export INSTALL_BASEARCH_DEB="${DPKG_ARCH}" |
29 | export INSTALL_ARCHS_DEB="${PACKAGE_ARCHS}" | 29 | export INSTALL_ARCHS_DEB="${PACKAGE_ARCHS}" |
30 | export INSTALL_PACKAGES_DEB="${TOOLCHAIN_TARGET_TASK}" | 30 | export INSTALL_PACKAGES_DEB="${TOOLCHAIN_TARGET_TASK}" |
31 | export INSTALL_PACKAGES_ATTEMPTONLY_DEB="" | 31 | export INSTALL_PACKAGES_ATTEMPTONLY_DEB="${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}" |
32 | export PACKAGES_LINGUAS_DEB="" | 32 | export PACKAGES_LINGUAS_DEB="" |
33 | export INSTALL_TASK_DEB="populate_sdk-target" | 33 | export INSTALL_TASK_DEB="populate_sdk-target" |
34 | 34 | ||
@@ -44,7 +44,7 @@ populate_sdk_deb () { | |||
44 | export INSTALL_BASEARCH_DEB="${DEB_SDK_ARCH}" | 44 | export INSTALL_BASEARCH_DEB="${DEB_SDK_ARCH}" |
45 | export INSTALL_ARCHS_DEB="${SDK_PACKAGE_ARCHS}" | 45 | export INSTALL_ARCHS_DEB="${SDK_PACKAGE_ARCHS}" |
46 | export INSTALL_PACKAGES_DEB="${TOOLCHAIN_HOST_TASK}" | 46 | export INSTALL_PACKAGES_DEB="${TOOLCHAIN_HOST_TASK}" |
47 | export INSTALL_PACKAGES_ATTEMPTONLY_DEB="" | 47 | export INSTALL_PACKAGES_ATTEMPTONLY_DEB="${TOOLCHAIN_HOST_TASK_ATTEMPTONLY}" |
48 | export PACKAGES_LINGUAS_DEB="" | 48 | export PACKAGES_LINGUAS_DEB="" |
49 | export INSTALL_TASK_DEB="populate_sdk-nativesdk" | 49 | export INSTALL_TASK_DEB="populate_sdk-nativesdk" |
50 | 50 | ||
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() { | |||
11 | package_update_index_ipk | 11 | package_update_index_ipk |
12 | package_generate_ipkg_conf | 12 | package_generate_ipkg_conf |
13 | 13 | ||
14 | export INSTALL_PACKAGES_ATTEMPTONLY_IPK="" | ||
15 | export INSTALL_PACKAGES_LINGUAS_IPK="" | 14 | export INSTALL_PACKAGES_LINGUAS_IPK="" |
16 | export INSTALL_TASK_IPK="populate_sdk" | 15 | export INSTALL_TASK_IPK="populate_sdk" |
17 | 16 | ||
@@ -19,6 +18,7 @@ populate_sdk_ipk() { | |||
19 | export INSTALL_ROOTFS_IPK="${SDK_OUTPUT}/${SDKTARGETSYSROOT}" | 18 | export INSTALL_ROOTFS_IPK="${SDK_OUTPUT}/${SDKTARGETSYSROOT}" |
20 | export INSTALL_CONF_IPK="${IPKGCONF_TARGET}" | 19 | export INSTALL_CONF_IPK="${IPKGCONF_TARGET}" |
21 | export INSTALL_PACKAGES_IPK="${TOOLCHAIN_TARGET_TASK}" | 20 | export INSTALL_PACKAGES_IPK="${TOOLCHAIN_TARGET_TASK}" |
21 | export INSTALL_PACKAGES_ATTEMPTONLY_IPK="${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}" | ||
22 | 22 | ||
23 | export D=${INSTALL_ROOTFS_IPK} | 23 | export D=${INSTALL_ROOTFS_IPK} |
24 | export OFFLINE_ROOT=${INSTALL_ROOTFS_IPK} | 24 | export OFFLINE_ROOT=${INSTALL_ROOTFS_IPK} |
@@ -31,6 +31,7 @@ populate_sdk_ipk() { | |||
31 | export INSTALL_ROOTFS_IPK="${SDK_OUTPUT}" | 31 | export INSTALL_ROOTFS_IPK="${SDK_OUTPUT}" |
32 | export INSTALL_CONF_IPK="${IPKGCONF_SDK}" | 32 | export INSTALL_CONF_IPK="${IPKGCONF_SDK}" |
33 | export INSTALL_PACKAGES_IPK="${TOOLCHAIN_HOST_TASK}" | 33 | export INSTALL_PACKAGES_IPK="${TOOLCHAIN_HOST_TASK}" |
34 | export INSTALL_PACKAGES_ATTEMPTONLY_IPK="${TOOLCHAIN_HOST_TASK_ATTEMPTONLY}" | ||
34 | 35 | ||
35 | package_install_internal_ipk | 36 | package_install_internal_ipk |
36 | 37 | ||
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 () { | |||
33 | export INSTALL_PLATFORM_RPM="${TARGET_ARCH}" | 33 | export INSTALL_PLATFORM_RPM="${TARGET_ARCH}" |
34 | export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}" | 34 | export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}" |
35 | export INSTALL_PACKAGES_RPM="${TOOLCHAIN_TARGET_TASK}" | 35 | export INSTALL_PACKAGES_RPM="${TOOLCHAIN_TARGET_TASK}" |
36 | export INSTALL_PACKAGES_ATTEMPTONLY_RPM="" | 36 | export INSTALL_PACKAGES_ATTEMPTONLY_RPM="${TOOLCHAIN_TARGET_TASK_ATTEMPTONLY}" |
37 | export INSTALL_PACKAGES_LINGUAS_RPM="" | 37 | export INSTALL_PACKAGES_LINGUAS_RPM="" |
38 | export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig pkgconfig(pkg-config)" | 38 | export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig pkgconfig(pkg-config)" |
39 | export INSTALL_TASK_RPM="populate_sdk-target" | 39 | export INSTALL_TASK_RPM="populate_sdk-target" |
@@ -82,7 +82,7 @@ EOF | |||
82 | export INSTALL_PLATFORM_RPM="${SDK_ARCH}" | 82 | export INSTALL_PLATFORM_RPM="${SDK_ARCH}" |
83 | export INSTALL_CONFBASE_RPM="${RPMCONF_HOST_BASE}" | 83 | export INSTALL_CONFBASE_RPM="${RPMCONF_HOST_BASE}" |
84 | export INSTALL_PACKAGES_RPM="${TOOLCHAIN_HOST_TASK}" | 84 | export INSTALL_PACKAGES_RPM="${TOOLCHAIN_HOST_TASK}" |
85 | export INSTALL_PACKAGES_ATTEMPTONLY_RPM="" | 85 | export INSTALL_PACKAGES_ATTEMPTONLY_RPM="${TOOLCHAIN_TARGET_HOST_ATTEMPTONLY}" |
86 | export INSTALL_PACKAGES_LINGUAS_RPM="" | 86 | export INSTALL_PACKAGES_LINGUAS_RPM="" |
87 | export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig libGL.so()(64bit) libGL.so" | 87 | export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig libGL.so()(64bit) libGL.so" |
88 | export INSTALL_TASK_RPM="populate_sdk_rpm-nativesdk" | 88 | export INSTALL_TASK_RPM="populate_sdk_rpm-nativesdk" |