[oe-commits] Kai Kang : LSB_Test.sh: update rpm platform file when enable multilib

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 52420c1e8fc3462d2078154eed3e80a4c7ce3c58
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=52420c1e8fc3462d2078154eed3e80a4c7ce3c58

Author: Kai Kang <kai.kang at windriver.com>
Date:   Fri Dec 13 15:54:44 2013 +0800

LSB_Test.sh: update rpm platform file when enable multilib

When enable multilib for x86_64, lsb rpm packages of arch i486 are
installed for lib32 images such as lib32-core-image-lsb. But i486 is not
a valid platform that it is not included in rpm platform file, then fail
to install i486 rpm packages.

Update platform file to enable install i486 rpm packages for lib32 images.

Signed-off-by: Kai Kang <kai.kang at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-extended/lsb/lsbtest/LSB_Test.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh b/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
index af1d61c..db4e749 100644
--- a/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
+++ b/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
@@ -277,6 +277,15 @@ if ! `grep -F -q "noarch-suse" ${PLATFORM_FILE}`; then
 		echo "i486-noarch" >> ${PLATFORM_FILE}
 		echo "i486-pc" >> ${PLATFORM_FILE}
 		echo "noarch-suse" >> ${PLATFORM_FILE}
+	elif [ ${ARCH} == x86_64 ]; then
+		echo "i486-suse" >> ${PLATFORM_FILE}
+		echo "i486-noarch" >> ${PLATFORM_FILE}
+		echo "i486-pc" >> ${PLATFORM_FILE}
+		echo "i486-.*-linux.*" >> ${PLATFORM_FILE}
+		echo "noarch-suse" >> ${PLATFORM_FILE}
+		echo "${ARCH}-suse" >> ${PLATFORM_FILE}
+		echo "${ARCH}-noarch" >> ${PLATFORM_FILE}
+		echo "${ARCH}-pc" >> ${PLATFORM_FILE}
 	else
 		echo "${ARCH}-suse" >> ${PLATFORM_FILE}
 		echo "${ARCH}-noarch" >> ${PLATFORM_FILE}