populate_*.bbclass: Correct INSTALL variable name after recent multilib changes

(From OE-Core rev: 379c77d1516fe8fdbd1cd7063f709b5266872b03)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass
index c4bed55141f50a91bda8231fa9673d6969c06d3d..98c2425ebf472056a35e7015c4e7c848e95d9570 100644 (file)
--- a/meta/classes/populate_sdk_deb.bbclass
+++ b/meta/classes/populate_sdk_deb.bbclass
@@ -27,7 +27,7 @@ populate_sdk_deb () {
        export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}/${SDKTARGETSYSROOT}"
        export INSTALL_BASEARCH_DEB="${DPKG_ARCH}"
        export INSTALL_ARCHS_DEB="${PACKAGE_ARCHS}"
-       export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_TARGET_TASK}"
+       export INSTALL_PACKAGES_DEB="${TOOLCHAIN_TARGET_TASK}"
        export INSTALL_PACKAGES_ATTEMPTONLY_DEB=""
        export PACKAGES_LINGUAS_DEB=""
        export INSTALL_TASK_DEB="populate_sdk-target"
@@ -43,7 +43,7 @@ populate_sdk_deb () {
        export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}"
        export INSTALL_BASEARCH_DEB="${DEB_SDK_ARCH}"
        export INSTALL_ARCHS_DEB="${SDK_PACKAGE_ARCHS}"
-       export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_HOST_TASK}"
+       export INSTALL_PACKAGES_DEB="${TOOLCHAIN_HOST_TASK}"
        export INSTALL_PACKAGES_ATTEMPTONLY_DEB=""
        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 d8cbaf6e7218888a9b2cb238521e44c63ac5ee3e..8a0c268cce5c2bbbf507dc3dbb83f0f8daab807d 100644 (file)
--- a/meta/classes/populate_sdk_ipk.bbclass
+++ b/meta/classes/populate_sdk_ipk.bbclass
@@ -18,14 +18,14 @@ populate_sdk_ipk() {
        #install target
        export INSTALL_ROOTFS_IPK="${SDK_OUTPUT}/${SDKTARGETSYSROOT}"
        export INSTALL_CONF_IPK="${IPKGCONF_TARGET}"
-       export INSTALL_PACKAGES_NORMAL_IPK="${TOOLCHAIN_TARGET_TASK}"
+       export INSTALL_PACKAGES_IPK="${TOOLCHAIN_TARGET_TASK}"
 
        package_install_internal_ipk
 
        #install host
        export INSTALL_ROOTFS_IPK="${SDK_OUTPUT}"
        export INSTALL_CONF_IPK="${IPKGCONF_SDK}"
-       export INSTALL_PACKAGES_NORMAL_IPK="${TOOLCHAIN_HOST_TASK}"
+       export INSTALL_PACKAGES_IPK="${TOOLCHAIN_HOST_TASK}"
 
        package_install_internal_ipk
 

diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass
index 8bb0a5d3a97fb99fdd7fc74aadc7c1208ae78be6..5362793232f035e98d61e5513c85cda330e937b2 100644 (file)
--- a/meta/classes/populate_sdk_rpm.bbclass
+++ b/meta/classes/populate_sdk_rpm.bbclass
@@ -32,7 +32,7 @@ populate_sdk_rpm () {
        export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}/${SDKTARGETSYSROOT}"
        export INSTALL_PLATFORM_RPM="${TARGET_ARCH}"
        export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}"
-       export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_TARGET_TASK}"
+       export INSTALL_PACKAGES_RPM="${TOOLCHAIN_TARGET_TASK}"
        export INSTALL_PACKAGES_ATTEMPTONLY_RPM=""
        export INSTALL_PACKAGES_LINGUAS_RPM=""
        export INSTALL_PROVIDENAME_RPM="/bin/sh /bin/bash /usr/bin/env /usr/bin/perl pkgconfig pkgconfig(pkg-config)"
@@ -81,7 +81,7 @@ EOF
        export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}"
        export INSTALL_PLATFORM_RPM="${SDK_ARCH}"
        export INSTALL_CONFBASE_RPM="${RPMCONF_HOST_BASE}"
-       export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_HOST_TASK}"
+       export INSTALL_PACKAGES_RPM="${TOOLCHAIN_HOST_TASK}"
        export INSTALL_PACKAGES_ATTEMPTONLY_RPM=""
        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"