2 files changed, 13 insertions, 1 deletions

diff --git a/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh b/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
index 37ce3f150a..12f00547ae 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 8973e094e5..520c1e79bd 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/* \