aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2013-12-11 17:05:53 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-18 11:21:25 +0000
commitb34cc27f4663a558b869b149ffcc43a11684262a (patch)
tree8be0fd9fb7292a71ce9868c0f4a3c714c3e2aec4
parentf939b6c18eafec8859e1ec29c8ff650b3036dd79 (diff)
downloadopenembedded-core-contrib-b34cc27f4663a558b869b149ffcc43a11684262a.tar.gz
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. (From OE-Core rev: 02d3233b57cda03dfef08983c7f9a03285444c83) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/lsb/lsbtest/LSB_Test.sh9
1 files changed, 9 insertions, 0 deletions
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}