summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorLei Liu <layliu@gmail.com>2013-11-21 01:30:58 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-22 14:08:33 +0000
commit739fba172c20d1951283757bad50d79d181b40aa (patch)
tree6ab45d23f00cd94f7f5ae392a372c9e3c806c70d /meta
parent074a0ab2bfd147fd6f11cdf0b3f832bc08e3c703 (diff)
downloadpoky-739fba172c20d1951283757bad50d79d181b40aa.tar.gz
package_rpm.bbclass: Replace -linux-gnun32 with -linux.* in RPM platform file
On a multilib system when one of the multibs has a different OS then other multilibs a failure can occur during the install process because RPM assumes all systems have the same OS. When an n32 platform is selected as an alternative multilib, it shows up as mips64_n32-.*-linux-gnun32 in /etc/rpm/platform. This causes problems when the smart tool tries to add a channel for the multilib. RPM archScore call always returns zero for arch "mips64_n32" - after appending default vendor and os, it finds "mips64_n32-wrs-linux" doesn't match any predefined platforms. Fix this by removing the restriction of -gnun32 suffix in platform file. (From OE-Core rev: d9489c44ee4f195ae1b09f340b9545cddba58145) Signed-off-by: Lei Liu <lei.liu2@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Jeff Polk <jeff.polk@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package_rpm.bbclass6
1 files changed, 1 insertions, 5 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 31265d960a..346b7abd53 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -296,11 +296,7 @@ package_install_internal_rpm () {
296 if [ ! -z "$INSTALL_PLATFORM_EXTRA_RPM" ]; then 296 if [ ! -z "$INSTALL_PLATFORM_EXTRA_RPM" ]; then
297 for pt in $INSTALL_PLATFORM_EXTRA_RPM ; do 297 for pt in $INSTALL_PLATFORM_EXTRA_RPM ; do
298 channel_priority=$(expr $channel_priority + 5) 298 channel_priority=$(expr $channel_priority + 5)
299 case $pt in 299 pt=$(echo $pt | sed "s,-linux.*$,-linux\.*,")
300 noarch-* | any-* | all-*)
301 pt=$(echo $pt | sed "s,-linux.*$,-linux\.*,")
302 ;;
303 esac
304 echo "$pt" >> ${target_rootfs}/etc/rpm/platform 300 echo "$pt" >> ${target_rootfs}/etc/rpm/platform
305 done 301 done
306 fi 302 fi