summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-core/openjdk')
-rw-r--r--recipes-core/openjdk/openjdk-6-common.inc5
1 files changed, 4 insertions, 1 deletions
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):
109 jdk_arch = bb.data.getVar('TARGET_ARCH', d, 1) 109 jdk_arch = bb.data.getVar('TARGET_ARCH', d, 1)
110 if jdk_arch == "x86_64": 110 if jdk_arch == "x86_64":
111 jdk_arch = "amd64" 111 jdk_arch = "amd64"
112 elif jdk_arch == "powerpc":
113 jdk_arch = "ppc"
114 elif jdk_arch == "powerpc64":
115 jdk_arch = "ppc64"
112 elif (jdk_arch == "i486" or jdk_arch == "i586" or jdk_arch == "i686"): 116 elif (jdk_arch == "i486" or jdk_arch == "i586" or jdk_arch == "i686"):
113 jdk_arch = "i386" 117 jdk_arch = "i386"
114 118
@@ -323,7 +327,6 @@ do_install() {
323 rm ${D}${JDK_HOME}/bin/$bf 327 rm ${D}${JDK_HOME}/bin/$bf
324 ln -s ${JDK_HOME}/jre/bin/$bf ${D}${JDK_HOME}/bin/$bf 328 ln -s ${JDK_HOME}/jre/bin/$bf ${D}${JDK_HOME}/bin/$bf
325 done 329 done
326
327 install -m644 ${WORKDIR}/jvm.cfg ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/ 330 install -m644 ${WORKDIR}/jvm.cfg ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/
328} 331}
329 332