Use 'standarized' install path
A message that is not in the archive (sent off-list or not yet received): [email protected]
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(-)
recipes-devtools/oracle-java/oracle-jse-jdk.inc +6 -9
@@ -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"
recipes-devtools/oracle-java/oracle-jse.inc +8 -4
@@ -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
Signature · 1 line
2.7.4