[yocto] [meta-oracle-java][PATCH 4/6] Use 'standarized' install path

[Jaap de Jong]

-------------- next part --------------
From ba2fed80b1577442e1e46d12a9afae452207d0cf Mon Sep 17 00:00:00 2001
From: Jaap de Jong <jaap.dejong at nedap.com>
Date: Tue, 28 Mar 2017 14:23:13 +0200
Subject: [PATCH 4/6] Use 'standarized' install path

---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 15 ++++++---------
 recipes-devtools/oracle-java/oracle-jse.inc     | 12 ++++++++----
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk.inc b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
index 6f13125..291a75d 100644
--- a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
+++ b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
@@ -12,16 +12,13 @@ JDK_JRE = "jdk"
 require oracle-jse.inc
 
 do_install_class-native() {
-    install -d -m 0755 ${D}${libdir}
-    install -d -m 0755 ${D}${bindir}
-    cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE} ${D}${libdir}/
-    for prog in java javac; do
-	( cd ${D}${bindir} && ln -sf ${libdir}/${JDK_JRE}${PV}_${PV_UPDATE}/bin/$prog )
-    done
+	install -d -m 0755			${D}${libdir_jvm}
+	cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE}	${D}${JDK_HOME}
 
-    ( cd ${D}${libdir}/${JDK_JRE}${PV}_${PV_UPDATE}/bin ; \
-      ln -sf javah gjavah ; \
-      ln -sf jar fastjar )
+	ln -sf ${JDK_HOME}/bin/java		${D}${bindir}
+	ln -sf ${JDK_HOME}/bin/javac		${D}${bindir}
+	ln -sf javah				${D}${JDK_HOME}/bin/gjavah
+	ln -sf jar				${D}${JDK_HOME}/bin/fastjar
 }
 
 BBCLASSEXTEND = "native"
diff --git a/recipes-devtools/oracle-java/oracle-jse.inc b/recipes-devtools/oracle-java/oracle-jse.inc
index a3701a2..7e508bf 100644
--- a/recipes-devtools/oracle-java/oracle-jse.inc
+++ b/recipes-devtools/oracle-java/oracle-jse.inc
@@ -14,11 +14,15 @@ RDEPENDS_${PN} += " libasound atk cairo gdk-pixbuf mesa gtk+ libxtst libxi"
 PR =. "u${PV_UPDATE}"
 S = "${WORKDIR}"
 
+libdir_jvm ?= "${libdir}/jvm"
+JDK_DIR = "java-8-oracle"
+JDK_HOME = "${libdir_jvm}/${JDK_DIR}"
+
 do_install () {
-	install -d -m 0755					${D}${datadir}/${JDK_JRE}${PV}_${PV_UPDATE}
-	cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE}			${D}${datadir}/
-	install -d -m 0755					${D}${bindir}
-	ln -sf ${datadir}/${JDK_JRE}${PV}_${PV_UPDATE}/bin/java ${D}${bindir}/java
+	install -d -m 0755			${D}${libdir_jvm}
+	cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE}	${D}${JDK_HOME}
+	install -d -m 0755			${D}${bindir}
+	ln -sf ${JDK_HOME}/bin/java		${D}${bindir}/java
 }
 
 # All the files are provided in a binaray package, and keeping all the
-- 
2.7.4