Patchwork [meta-java] openjdk-6-common.inc: Change jdk_arch for powerpc

login
register
mail settings
Submitter Khem Raj
Date July 20, 2012, 10:56 p.m.
Message ID <1342825008-24903-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/32763/
State Accepted
Headers show

Comments

Khem Raj - July 20, 2012, 10:56 p.m.
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>
---
 recipes-core/openjdk/openjdk-6-common.inc |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Henning Heinold - July 21, 2012, 9:43 a.m.
On Fri, Jul 20, 2012 at 03:56:48PM -0700, Khem Raj wrote:
> 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>
> ---
>  recipes-core/openjdk/openjdk-6-common.inc |    5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> 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}/
>  }
>  
> -- 
> 1.7.9.5
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Thanks,

patch is applied to master.

Bye Henning

Patch

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}/
 }