summaryrefslogtreecommitdiffstats
path: root/meta/classes/populate_sdk_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:23 -0800
commitb2e4a965f3b15ae25d45fbd5d05bb956a9d639aa (patch)
tree8753cc1c18982267ee36cede28def8f475995506 /meta/classes/populate_sdk_rpm.bbclass
parent5e3bbb652041954c02e1f8642c9f9874b1741a02 (diff)
downloadpoky-b2e4a965f3b15ae25d45fbd5d05bb956a9d639aa.tar.gz
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. (From OE-Core rev: dfbb1aa184955923b85b81aabf944de8f1a1e4b5) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/populate_sdk_rpm.bbclass')
-rw-r--r--meta/classes/populate_sdk_rpm.bbclass11
1 files changed, 10 insertions, 1 deletions
diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass
index 00a3ab477e..0595aa7fca 100644
--- a/meta/classes/populate_sdk_rpm.bbclass
+++ b/meta/classes/populate_sdk_rpm.bbclass
@@ -55,18 +55,27 @@ populate_sdk_rpm () {
55 mkdir -p ${INSTALL_ROOTFS_RPM}/etc/rpm/ 55 mkdir -p ${INSTALL_ROOTFS_RPM}/etc/rpm/
56 56
57 # List must be prefered to least preferred order 57 # List must be prefered to least preferred order
58 default_extra_rpm=""
58 INSTALL_PLATFORM_EXTRA_RPM="" 59 INSTALL_PLATFORM_EXTRA_RPM=""
59 for i in ${MULTILIB_PREFIX_LIST} ; do 60 for i in ${MULTILIB_PREFIX_LIST} ; do
60 old_IFS="$IFS" 61 old_IFS="$IFS"
61 IFS=":" 62 IFS=":"
62 set $i 63 set $i
63 IFS="$old_IFS" 64 IFS="$old_IFS"
65 mlib=$1
64 shift #remove mlib 66 shift #remove mlib
65 while [ -n "$1" ]; do 67 while [ -n "$1" ]; do
66 INSTALL_PLATFORM_EXTRA_RPM="$INSTALL_PLATFORM_EXTRA_RPM $1" 68 if [ "$mlib" = "${BBEXTENDVARIANT}" ]; then
69 default_extra_rpm="$default_extra_rpm $1"
70 else
71 INSTALL_PLATFORM_EXTRA_RPM="$INSTALL_PLATFORM_EXTRA_RPM $1"
72 fi
67 shift 73 shift
68 done 74 done
69 done 75 done
76 if [ -n "$default_extra_rpm" ]; then
77 INSTALL_PLATFORM_EXTRA_RPM="$default_extra_rpm $INSTALL_PLATFORM_EXTRA_RPM"
78 fi
70 export INSTALL_PLATFORM_EXTRA_RPM 79 export INSTALL_PLATFORM_EXTRA_RPM
71 80
72 package_install_internal_rpm 81 package_install_internal_rpm