]> code.ossystems Code Review - openembedded-core.git/commitdiff
LSB_Test.sh: update rpm platform file when enable multilib
authorKai Kang <kai.kang@windriver.com>
Wed, 11 Dec 2013 09:05:53 +0000 (17:05 +0800)
committerSaul Wold <sgw@linux.intel.com>
Tue, 17 Dec 2013 17:05:14 +0000 (09:05 -0800)
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>
meta/recipes-extended/lsb/lsbtest/LSB_Test.sh

index af1d61c0ce63fb5025f7f5c36d20cd324a6956e8..db4e7496e544e7a5bd48cff63660b8f1a013453e 100644 (file)
@@ -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}