diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-07-20 22:56:48 +0000 |
---|---|---|
committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2012-07-21 11:39:50 +0200 |
commit | 3e59e45e41f96a19a0aa5f6c681711ee0a1f4639 (patch) | |
tree | faddddf48b55c50a169e019f0c15ddc87df807b2 | |
parent | 5145024c8145e69c5ce737a329ff7671cb7b93d5 (diff) | |
download | meta-java-3e59e45e41f96a19a0aa5f6c681711ee0a1f4639.tar.gz |
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 <raj.khem@gmail.com>
Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
-rw-r--r-- | recipes-core/openjdk/openjdk-6-common.inc | 5 |
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 | ||