diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-10 18:03:30 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-10 18:05:06 +0000 |
| commit | 379c77d1516fe8fdbd1cd7063f709b5266872b03 (patch) | |
| tree | eb6b77d6bcff02aa6f2fa51d108247c0d4309eb5 | |
| parent | 2cac20439d4eb0b3a21ce37e2fa670941e6356c4 (diff) | |
| download | openembedded-core-379c77d1516fe8fdbd1cd7063f709b5266872b03.tar.gz openembedded-core-379c77d1516fe8fdbd1cd7063f709b5266872b03.tar.bz2 openembedded-core-379c77d1516fe8fdbd1cd7063f709b5266872b03.zip | |
populate_*.bbclass: Correct INSTALL variable name after recent multilib changes
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/populate_sdk_deb.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/populate_sdk_ipk.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/populate_sdk_rpm.bbclass | 4 |
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 () { 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 d8cbaf6e72..8a0c268cce 100644 --- 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 a0f0e0aa55..e0adb8f89a 100644 --- 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" |