diff options
Diffstat (limited to 'meta/classes/populate_sdk_rpm.bbclass')
-rw-r--r-- | meta/classes/populate_sdk_rpm.bbclass | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass index e1abbad17b..d1797806e2 100644 --- a/meta/classes/populate_sdk_rpm.bbclass +++ b/meta/classes/populate_sdk_rpm.bbclass | |||
@@ -33,8 +33,7 @@ fakeroot populate_sdk_rpm () { | |||
33 | 33 | ||
34 | #install target | 34 | #install target |
35 | export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}/${SDKTARGETSYSROOT}" | 35 | export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}/${SDKTARGETSYSROOT}" |
36 | export INSTALL_PLATFORM_RPM="${TARGET_ARCH}" | 36 | export INSTALL_PLATFORM_RPM="${PACKAGE_ARCHS}" |
37 | export INSTALL_PLATFORM_EXTRA_RPM="${PACKAGE_ARCHS}" | ||
38 | export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}" | 37 | export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}" |
39 | export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_TARGET_TASK}" | 38 | export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_TARGET_TASK}" |
40 | 39 | ||
@@ -46,7 +45,6 @@ fakeroot populate_sdk_rpm () { | |||
46 | export INSTALL_PLATFORM_RPM="${SDK_ARCH}" | 45 | export INSTALL_PLATFORM_RPM="${SDK_ARCH}" |
47 | export INSTALL_CONFBASE_RPM="${RPMCONF_HOST_BASE}" | 46 | export INSTALL_CONFBASE_RPM="${RPMCONF_HOST_BASE}" |
48 | export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_HOST_TASK}" | 47 | export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_HOST_TASK}" |
49 | INSTALL_PLATFORM_EXTRA_RPM="" | ||
50 | for arch in ${PACKAGE_ARCHS}; do | 48 | for arch in ${PACKAGE_ARCHS}; do |
51 | sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'` | 49 | sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'` |
52 | extension="-nativesdk" | 50 | extension="-nativesdk" |
@@ -54,10 +52,9 @@ fakeroot populate_sdk_rpm () { | |||
54 | extension="" | 52 | extension="" |
55 | fi | 53 | fi |
56 | if [ -e ${DEPLOY_DIR_RPM}/$sdkarch$extension ]; then | 54 | if [ -e ${DEPLOY_DIR_RPM}/$sdkarch$extension ]; then |
57 | INSTALL_PLATFORM_EXTRA_RPM="$INSTALL_PLATFORM_EXTRA_RPM $sdkarch" | 55 | INSTALL_PLATFORM_RPM="$INSTALL_PLATFORM_RPM $sdkarch" |
58 | fi | 56 | fi |
59 | done | 57 | done |
60 | export INSTALL_PLATFORM_EXTRA_RPM | ||
61 | 58 | ||
62 | package_install_internal_rpm | 59 | package_install_internal_rpm |
63 | populate_sdk_post_rpm ${INSTALL_ROOTFS_RPM} | 60 | populate_sdk_post_rpm ${INSTALL_ROOTFS_RPM} |