summaryrefslogtreecommitdiff
path: root/meta/classes/rootfs_rpm.bbclass
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2013-02-20 13:31:11 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-22 06:09:14 -0800
commitdfbb1aa184955923b85b81aabf944de8f1a1e4b5 (patch)
treec6e6b36b27ac539ddb2bb433316da56ac5312bf2 /meta/classes/rootfs_rpm.bbclass
parentaea1d6c29e0c3f7c854045057d8bb389a1609b2b (diff)
downloadopenembedded-core-dfbb1aa184955923b85b81aabf944de8f1a1e4b5.tar.gz
openembedded-core-dfbb1aa184955923b85b81aabf944de8f1a1e4b5.tar.bz2
openembedded-core-dfbb1aa184955923b85b81aabf944de8f1a1e4b5.zip
rootfs_rpm.bbclass: Reorder feed priority based on multilib image setting
[ YOCTO #3915 ] [ CQID: WIND00404309 ] When doing a multilib image build, such as bitbake lib32-core-image-sato, the system needs to reorder the priority level of the feeds. If it does not reorder the priorities, then 64-bit items can be selected by the automatic dependency resolution in Smart. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes/rootfs_rpm.bbclass')
-rw-r--r--meta/classes/rootfs_rpm.bbclass13
1 files changed, 11 insertions, 2 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 5651243090..920380e559 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -62,18 +62,27 @@ fakeroot rootfs_rpm_do_rootfs () {
mkdir -p ${INSTALL_ROOTFS_RPM}/etc/rpm/
# List must be prefered to least preferred order
+ default_extra_rpm=""
INSTALL_PLATFORM_EXTRA_RPM=""
for i in ${MULTILIB_PREFIX_LIST} ; do
old_IFS="$IFS"
IFS=":"
set $i
IFS="$old_IFS"
+ mlib=$1
shift #remove mlib
- while [ -n "$1" ]; do
- INSTALL_PLATFORM_EXTRA_RPM="$INSTALL_PLATFORM_EXTRA_RPM $1"
+ while [ -n "$1" ]; do
+ if [ "$mlib" = "${BBEXTENDVARIANT}" ]; then
+ default_extra_rpm="$default_extra_rpm $1"
+ else
+ INSTALL_PLATFORM_EXTRA_RPM="$INSTALL_PLATFORM_EXTRA_RPM $1"
+ fi
shift
done
done
+ if [ -n "$default_extra_rpm" ]; then
+ INSTALL_PLATFORM_EXTRA_RPM="$default_extra_rpm $INSTALL_PLATFORM_EXTRA_RPM"
+ fi
export INSTALL_PLATFORM_EXTRA_RPM
package_install_internal_rpm