From 3e59e45e41f96a19a0aa5f6c681711ee0a1f4639 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 20 Jul 2012 22:56:48 +0000 Subject: openjdk-6-common.inc: Change jdk_arch for powerpc ppc is used in openjdk/jre but original jdk_arch is defined as powerpc which means we have errors compiling and installing openjdk for ppc platforms Signed-off-by: Khem Raj Signed-off-by: Henning Heinold --- recipes-core/openjdk/openjdk-6-common.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'recipes-core/openjdk/openjdk-6-common.inc') diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc index 6e984f6..02a4cb7 100644 --- a/recipes-core/openjdk/openjdk-6-common.inc +++ b/recipes-core/openjdk/openjdk-6-common.inc @@ -109,6 +109,10 @@ def get_jdk_arch(d): jdk_arch = bb.data.getVar('TARGET_ARCH', d, 1) if jdk_arch == "x86_64": jdk_arch = "amd64" + elif jdk_arch == "powerpc": + jdk_arch = "ppc" + elif jdk_arch == "powerpc64": + jdk_arch = "ppc64" elif (jdk_arch == "i486" or jdk_arch == "i586" or jdk_arch == "i686"): jdk_arch = "i386" @@ -323,7 +327,6 @@ do_install() { rm ${D}${JDK_HOME}/bin/$bf ln -s ${JDK_HOME}/jre/bin/$bf ${D}${JDK_HOME}/bin/$bf done - install -m644 ${WORKDIR}/jvm.cfg ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/ } -- cgit v1.2.3-54-g00ecf