summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-10 18:03:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-10 18:05:57 +0000
commit0b0674ebcd8a51783e4bb38e3ead3e419dbba376 (patch)
tree017c97690a33b72dada1e074d27cd01d49a929d3 /meta/classes
parent5bcb0963dc74ebcd35307e190d7be4fde334c692 (diff)
downloadpoky-0b0674ebcd8a51783e4bb38e3ead3e419dbba376.tar.gz
populate_*.bbclass: Correct INSTALL variable name after recent multilib changes
(From OE-Core rev: 379c77d1516fe8fdbd1cd7063f709b5266872b03) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/populate_sdk_deb.bbclass4
-rw-r--r--meta/classes/populate_sdk_ipk.bbclass4
-rw-r--r--meta/classes/populate_sdk_rpm.bbclass4
3 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass
index 833ea7064e..fe3d849162 100644
--- a/meta/classes/populate_sdk_deb.bbclass
+++ b/meta/classes/populate_sdk_deb.bbclass
@@ -27,7 +27,7 @@ populate_sdk_deb () {
27 export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}/${SDKTARGETSYSROOT}" 27 export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}/${SDKTARGETSYSROOT}"
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_NORMAL_DEB="${TOOLCHAIN_TARGET_TASK}" 30 export INSTALL_PACKAGES_DEB="${TOOLCHAIN_TARGET_TASK}"
31 export INSTALL_PACKAGES_ATTEMPTONLY_DEB="" 31 export INSTALL_PACKAGES_ATTEMPTONLY_DEB=""
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"
@@ -43,7 +43,7 @@ populate_sdk_deb () {
43 export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}" 43 export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}"
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_NORMAL_DEB="${TOOLCHAIN_HOST_TASK}" 46 export INSTALL_PACKAGES_DEB="${TOOLCHAIN_HOST_TASK}"
47 export INSTALL_PACKAGES_ATTEMPTONLY_DEB="" 47 export INSTALL_PACKAGES_ATTEMPTONLY_DEB=""
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"
diff --git a/meta/classes/populate_sdk_ipk.bbclass b/meta/classes/populate_sdk_ipk.bbclass
index d8cbaf6e72..8a0c268cce 100644
--- a/meta/classes/populate_sdk_ipk.bbclass
+++ b/meta/classes/populate_sdk_ipk.bbclass
@@ -18,14 +18,14 @@ populate_sdk_ipk() {
18 #install target 18 #install target
19 export INSTALL_ROOTFS_IPK="${SDK_OUTPUT}/${SDKTARGETSYSROOT}" 19 export INSTALL_ROOTFS_IPK="${SDK_OUTPUT}/${SDKTARGETSYSROOT}"
20 export INSTALL_CONF_IPK="${IPKGCONF_TARGET}" 20 export INSTALL_CONF_IPK="${IPKGCONF_TARGET}"
21 export INSTALL_PACKAGES_NORMAL_IPK="${TOOLCHAIN_TARGET_TASK}" 21 export INSTALL_PACKAGES_IPK="${TOOLCHAIN_TARGET_TASK}"
22 22
23 package_install_internal_ipk 23 package_install_internal_ipk
24 24
25 #install host 25 #install host
26 export INSTALL_ROOTFS_IPK="${SDK_OUTPUT}" 26 export INSTALL_ROOTFS_IPK="${SDK_OUTPUT}"
27 export INSTALL_CONF_IPK="${IPKGCONF_SDK}" 27 export INSTALL_CONF_IPK="${IPKGCONF_SDK}"
28 export INSTALL_PACKAGES_NORMAL_IPK="${TOOLCHAIN_HOST_TASK}" 28 export INSTALL_PACKAGES_IPK="${TOOLCHAIN_HOST_TASK}"
29 29
30 package_install_internal_ipk 30 package_install_internal_ipk
31 31
diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass
index a0f0e0aa55..e0adb8f89a 100644
--- a/meta/classes/populate_sdk_rpm.bbclass
+++ b/meta/classes/populate_sdk_rpm.bbclass
@@ -32,7 +32,7 @@ populate_sdk_rpm () {
32 export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}/${SDKTARGETSYSROOT}" 32 export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}/${SDKTARGETSYSROOT}"
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_NORMAL_RPM="${TOOLCHAIN_TARGET_TASK}" 35 export INSTALL_PACKAGES_RPM="${TOOLCHAIN_TARGET_TASK}"
36 export INSTALL_PACKAGES_ATTEMPTONLY_RPM="" 36 export INSTALL_PACKAGES_ATTEMPTONLY_RPM=""
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)"
@@ -81,7 +81,7 @@ EOF
81 export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}" 81 export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}"
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_NORMAL_RPM="${TOOLCHAIN_HOST_TASK}" 84 export INSTALL_PACKAGES_RPM="${TOOLCHAIN_HOST_TASK}"
85 export INSTALL_PACKAGES_ATTEMPTONLY_RPM="" 85 export INSTALL_PACKAGES_ATTEMPTONLY_RPM=""
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"