From: Kai Kang <kai.kang@windriver.com>
Date: Wed, 11 Dec 2013 09:05:53 +0000 (+0800)
Subject: LSB_Test.sh: update rpm platform file when enable multilib
X-Git-Tag: 2015-4~4263
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=02d3233b57cda03dfef08983c7f9a03285444c83;p=openembedded-core.git

LSB_Test.sh: update rpm platform file when enable multilib

When enable multilib for x86_64, lsb rpm packages for archs x86_64 and
i486 will be installed. But i486 target packages fail to be installed
that no such pattern in rpm platform file. Update platform file to
enable install i486 rpm packages as well.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh b/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
index af1d61c0ce..db4e7496e5 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}