diff options
Diffstat (limited to 'meta/classes/populate_sdk_rpm.bbclass')
-rw-r--r-- | meta/classes/populate_sdk_rpm.bbclass | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass index d1797806e2..0afe042fd6 100644 --- a/meta/classes/populate_sdk_rpm.bbclass +++ b/meta/classes/populate_sdk_rpm.bbclass | |||
@@ -33,10 +33,17 @@ 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="${PACKAGE_ARCHS}" | 36 | export INSTALL_PLATFORM_RPM="${TARGET_ARCHS}" |
37 | export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}" | 37 | export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}" |
38 | export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_TARGET_TASK}" | 38 | export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_TARGET_TASK}" |
39 | 39 | ||
40 | # List must be prefered to least preferred order | ||
41 | INSTALL_PLATFORM_RPM="" | ||
42 | for each_arch in ${PACKAGE_ARCHS} ; do | ||
43 | INSTALL_PLATFORM_RPM="$each_arch $INSTALL_PLATFORM_RPM" | ||
44 | done | ||
45 | export INSTALL_PLATFORM_RPM | ||
46 | |||
40 | package_install_internal_rpm | 47 | package_install_internal_rpm |
41 | populate_sdk_post_rpm ${INSTALL_ROOTFS_RPM} | 48 | populate_sdk_post_rpm ${INSTALL_ROOTFS_RPM} |
42 | 49 | ||
@@ -45,6 +52,7 @@ fakeroot populate_sdk_rpm () { | |||
45 | export INSTALL_PLATFORM_RPM="${SDK_ARCH}" | 52 | export INSTALL_PLATFORM_RPM="${SDK_ARCH}" |
46 | export INSTALL_CONFBASE_RPM="${RPMCONF_HOST_BASE}" | 53 | export INSTALL_CONFBASE_RPM="${RPMCONF_HOST_BASE}" |
47 | export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_HOST_TASK}" | 54 | export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_HOST_TASK}" |
55 | export INSTALL_PLATFORM_EXTRA_RPM="" | ||
48 | for arch in ${PACKAGE_ARCHS}; do | 56 | for arch in ${PACKAGE_ARCHS}; do |
49 | sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'` | 57 | sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'` |
50 | extension="-nativesdk" | 58 | extension="-nativesdk" |
@@ -52,9 +60,10 @@ fakeroot populate_sdk_rpm () { | |||
52 | extension="" | 60 | extension="" |
53 | fi | 61 | fi |
54 | if [ -e ${DEPLOY_DIR_RPM}/$sdkarch$extension ]; then | 62 | if [ -e ${DEPLOY_DIR_RPM}/$sdkarch$extension ]; then |
55 | INSTALL_PLATFORM_RPM="$INSTALL_PLATFORM_RPM $sdkarch" | 63 | INSTALL_PLATFORM_EXTRA_RPM="$sdkarch $INSTALL_PLATFORM_EXTRA_RPM" |
56 | fi | 64 | fi |
57 | done | 65 | done |
66 | export INSTALL_PLATFORM_EXTRA_RPM | ||
58 | 67 | ||
59 | package_install_internal_rpm | 68 | package_install_internal_rpm |
60 | populate_sdk_post_rpm ${INSTALL_ROOTFS_RPM} | 69 | populate_sdk_post_rpm ${INSTALL_ROOTFS_RPM} |