[oe-commits] Kai Kang : lsbtest: add ppc64 support
git at git.openembedded.org
git at git.openembedded.org
Wed Dec 18 11:43:33 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: 59905859064d4c7a09e04115daa4a93939a6dafc
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=59905859064d4c7a09e04115daa4a93939a6dafc
Author: Kai Kang <kai.kang at windriver.com>
Date: Thu Dec 12 10:36:28 2013 +0800
lsbtest: add ppc64 support
LSB supports to test on PPC64 target, so update lsbtest recipe and test
scripts to enable PPC64 support.
Signed-off-by: Kai Kang <kai.kang at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/recipes-extended/lsb/lsbtest/LSB_Test.sh | 2 +-
meta/recipes-extended/lsb/lsbtest_1.0.bb | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh b/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
index 37ce3f1..12f0054 100644
--- a/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
+++ b/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
@@ -29,7 +29,7 @@ EOF
fi
ARCH=`uname -m`
-if [ ${ARCH} != "i686" ] && [ ${ARCH} != "x86_64" ] && [ ${ARCH} != "ppc" ]
+if [ ${ARCH} != "i686" ] && [ ${ARCH} != "x86_64" ] && [ ${ARCH} != "ppc" ] && [ ${ARCH} != "ppc64" ]
then
echo "Error: Unsupported architecture"
exit 1
diff --git a/meta/recipes-extended/lsb/lsbtest_1.0.bb b/meta/recipes-extended/lsb/lsbtest_1.0.bb
index 8973e09..520c1e7 100644
--- a/meta/recipes-extended/lsb/lsbtest_1.0.bb
+++ b/meta/recipes-extended/lsb/lsbtest_1.0.bb
@@ -31,6 +31,18 @@ do_install() {
sed -i -e 's/lsbarch/ppc32/g' -e 's/targetarch/ppc/g' ${D}/opt/lsb-test/packages_list
sed -i -e 's/targetarch/PPC32/g' ${D}/opt/lsb-test/session
fi
+
+ # For a ppc64 target. the default userspace is 32b.
+ # Therefore, only change the lsbarch and targetarch
+ # in the package_list when MLIB=lib64 is being used.
+ # Otherwise, by default, the ppc32 LSB packages
+ # will be downloaded by LSB_Test.sh
+ if [ "${TARGET_ARCH}" == "powerpc64" ];then
+ if [ "${PN}" != "${BPN}" ];then
+ sed -i -e 's/lsbarch/ppc64/g' -e 's/targetarch/ppc64/g' ${D}/opt/lsb-test/packages_list
+ sed -i -e 's/targetarch/PPC64/g' ${D}/opt/lsb-test/session
+ fi
+ fi
}
FILES_${PN} += "/opt/lsb-test/* \
More information about the Openembedded-commits
mailing list