Skip to contentSkip to conversation

oracle-jse-jdk: fix link to binaries

PATCH New Mario Domenech Goulart 1 participant 2 messages May 22, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 oracle-jse-jdk: fix link to binaries

Remove ${D} from link targets, as it breaks native builds when we restore package contents from sstate cache after removing TMPDIR.

---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-devtools/oracle-java/oracle-jse-jdk.inc +1 -1
index 54e83b8..6f13125 100644
@@ -16,7 +16,7 @@ do_install_class-native() {
     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 ${D}${libdir}/${JDK_JRE}${PV}_${PV_UPDATE}/bin/$prog )
+	( cd ${D}${bindir} && ln -sf ${libdir}/${JDK_JRE}${PV}_${PV_UPDATE}/bin/$prog )
     done
 
     ( cd ${D}${libdir}/${JDK_JRE}${PV}_${PV_UPDATE}/bin ; \
Signature · 1 line
2.1.4
#1 lore raw

PATCH 2/2 oracle-jse: provide java2-vm

This is mostly to make meta-oracle-java compatible with what the counterparts in meta-java provide.

---
 recipes-devtools/oracle-java/oracle-jse.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-devtools/oracle-java/oracle-jse.inc +1 -1
index 7781421..d5cd765 100644
@@ -29,5 +29,5 @@ INSANE_SKIP_${PN} = "${ERROR_QA} ${WARN_QA}"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
 FILES_${PN} = "/usr/"
-RPROVIDES_${PN} = "java2-runtime"
+RPROVIDES_${PN} = "java2-runtime java2-vm"
 PROVIDES += "virtual/java"
Signature · 1 line
2.1.4