diff options
| author |   Mark Hatle <mark.hatle@windriver.com> | 2011-02-25 17:31:50 -0600 |
|---|---|---|
| committer |   Richard Purdie <rpurdie@linux.intel.com> | 2011-03-01 11:46:46 +0000 |
| commit | a0165d88a2ba96545793bbb7babeb7e43df4a46d (patch) | |
| tree | fe2655543b394e394acecc9a47d4c0f33988c6e3 /meta/classes/populate_sdk_rpm.bbclass | |
| parent | fb508583a06f15454bb30ad05b347ebcb1ade852 (diff) | |
| download | openembedded-core-contrib-a0165d88a2ba96545793bbb7babeb7e43df4a46d.tar.gz | |
rootfs_rpm: Fix rootfs generation using RPM packages
[BUG #756]
Fix bug #756. The rootfs contains a control file /etc/rpm/platform
that specifies the default system platform, as well as patterns for
compatible architectures. This file was not being setup properly due
to a misunderstanding of the format in a previous patch.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
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 () { #install target export INSTALL_ROOTFS_RPM="${SDK_OUTPUT}/${SDKTARGETSYSROOT}" - export INSTALL_PLATFORM_RPM="${PACKAGE_ARCHS}" + export INSTALL_PLATFORM_RPM="${TARGET_ARCHS}" export INSTALL_CONFBASE_RPM="${RPMCONF_TARGET_BASE}" export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_TARGET_TASK}" + # List must be prefered to least preferred order + INSTALL_PLATFORM_RPM="" + for each_arch in ${PACKAGE_ARCHS} ; do + INSTALL_PLATFORM_RPM="$each_arch $INSTALL_PLATFORM_RPM" + done + export INSTALL_PLATFORM_RPM + package_install_internal_rpm populate_sdk_post_rpm ${INSTALL_ROOTFS_RPM} @@ -45,6 +52,7 @@ fakeroot populate_sdk_rpm () { export INSTALL_PLATFORM_RPM="${SDK_ARCH}" export INSTALL_CONFBASE_RPM="${RPMCONF_HOST_BASE}" export INSTALL_PACKAGES_NORMAL_RPM="${TOOLCHAIN_HOST_TASK}" + export INSTALL_PLATFORM_EXTRA_RPM="" for arch in ${PACKAGE_ARCHS}; do sdkarch=`echo $arch | sed -e 's/${HOST_ARCH}/${SDK_ARCH}/'` extension="-nativesdk" @@ -52,9 +60,10 @@ fakeroot populate_sdk_rpm () { extension="" fi if [ -e ${DEPLOY_DIR_RPM}/$sdkarch$extension ]; then - INSTALL_PLATFORM_RPM="$INSTALL_PLATFORM_RPM $sdkarch" + INSTALL_PLATFORM_EXTRA_RPM="$sdkarch $INSTALL_PLATFORM_EXTRA_RPM" fi done + export INSTALL_PLATFORM_EXTRA_RPM package_install_internal_rpm populate_sdk_post_rpm ${INSTALL_ROOTFS_RPM} |