[yocto] [meta-oracle-java][PATCH] Fix binary paths when setting alternatives

[Maxin B. John]

On Thu, May 11, 2017 at 07:49:16AM +0200, Jan Kiszka wrote:
> Neither the JDK nor the JRE puts binaries under $JAVA_HOME/jre anymore.
> Seen with Java 8, update 131.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka at siemens.com>
> ---
>  recipes-devtools/oracle-java/oracle-jse-jdk.inc | 12 ++++++------
>  recipes-devtools/oracle-java/oracle-jse.inc     |  4 ++--
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk.inc b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
> index 9fd76e1..935ad9b 100644
> --- a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
> +++ b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
> @@ -28,14 +28,14 @@ PROVIDES += "virtual/javac virtual/java-initial"
>  
>  pkg_postinst_${PN} () {
>  	update-alternatives --install ${bindir}/jar   jar   ${JDK_HOME}/bin/jar 100
> -	update-alternatives --install ${bindir}/java  java  ${JDK_HOME}/jre/bin/java 100
> -	update-alternatives --install ${bindir}/javac javac ${JDK_HOME}/jre/bin/javac 100
> +	update-alternatives --install ${bindir}/java  java  ${JDK_HOME}/bin/java 100
> +	update-alternatives --install ${bindir}/javac javac ${JDK_HOME}/bin/javac 100
>  	update-alternatives --install ${bindir}/javah javah ${JDK_HOME}/bin/javah 100
>  }
>  
>  pkg_prerm_${PN} () {
> -	update-alternatives --remove jar   ${JDK_HOME}/jre/bin/jar
> -	update-alternatives --remove java  ${JDK_HOME}/jre/bin/java
> -	update-alternatives --remove javac ${JDK_HOME}/jre/bin/javac
> -	update-alternatives --remove javah ${JDK_HOME}/jre/bin/javah
> +	update-alternatives --remove jar   ${JDK_HOME}/bin/jar
> +	update-alternatives --remove java  ${JDK_HOME}/bin/java
> +	update-alternatives --remove javac ${JDK_HOME}/bin/javac
> +	update-alternatives --remove javah ${JDK_HOME}/bin/javah
>  }
> diff --git a/recipes-devtools/oracle-java/oracle-jse.inc b/recipes-devtools/oracle-java/oracle-jse.inc
> index c812cf7..ce8280c 100644
> --- a/recipes-devtools/oracle-java/oracle-jse.inc
> +++ b/recipes-devtools/oracle-java/oracle-jse.inc
> @@ -41,9 +41,9 @@ PROVIDES += "virtual/java"
>  inherit update-alternatives
>  
>  pkg_postinst_${PN} () {
> -	update-alternatives --install ${bindir}/java java ${JDK_HOME}/jre/bin/java 75
> +	update-alternatives --install ${bindir}/java java ${JDK_HOME}/bin/java 75
>  }
>  
>  pkg_prerm_${PN} () {
> -	update-alternatives --remove java ${JDK_HOME}/jre/bin/java
> +	update-alternatives --remove java ${JDK_HOME}/bin/java
>  }
> -- 

Pushed, Thanks!

Warm Regards,
Maxin