[2/5] LSB_Test.sh: update rpm platform file when enable multilib

Submitted by Kang Kai on Dec. 13, 2013, 7:54 a.m.

Details

Message ID 7c01a16740d35674f6331683e089df61835ae384.1386920771.git.kai.kang@windriver.com
State Accepted
Commit 02d3233b57cda03dfef08983c7f9a03285444c83
Headers show

Commit Message

Kang Kai Dec. 13, 2013, 7:54 a.m.
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@windriver.com>
---
 meta/recipes-extended/lsb/lsbtest/LSB_Test.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

Patch hide | download patch | download mbox

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}