Skip to contentSkip to conversation

oracle-jse-jdk: split recipe into per-architecture recipes

PATCH In review Mario Domenech Goulart 2 participants 7 messages May 13, 2015

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/6 oracle-jse-jdk: split recipe into per-architecture recipes

Due the way BitBake parses recipes, including architecture-specific include files was happening too late, causing native variants to pick wrong include files, thus ending up generating broken content.

Setting COMPATIBLE_HOST guarantees that native installations will be consistent.

---
 ...acle-jse-jdk-i586.inc => oracle-jse-jdk-i586_1.7.0.bb} |  2 ++
 ...-jse-jdk-x86-64.inc => oracle-jse-jdk-x86-64_1.7.0.bb} |  2 ++
 recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb      | 15 ---------------
 3 files changed, 4 insertions(+), 15 deletions(-)
 rename recipes-devtools/oracle-java/{oracle-jse-jdk-i586.inc => oracle-jse-jdk-i586_1.7.0.bb} (90%)
 rename recipes-devtools/oracle-java/{oracle-jse-jdk-x86-64.inc => oracle-jse-jdk-x86-64_1.7.0.bb} (89%)
 delete mode 100644 recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb
recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb renamed from recipes-devtools/oracle-java/oracle-jse-jdk-i586.inc +2 -0
similarity index 90%
rename from recipes-devtools/oracle-java/oracle-jse-jdk-i586.inc
rename to recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb
index 0667161..6f90d48 100644
@@ -7,3 +7,5 @@ SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u${PV_UPDATE}-b${BUILD_N
 
 SRC_URI[md5sum] = "715b0e8ba2a06bded75f6a92427e2701"
 SRC_URI[sha256sum] = "b6231064ad2c9fbbcb099dba17b1dcf12033e922b9c24e4348b9a01e9ebaa85c"
+
+COMPATIBLE_HOST = "(i586.*-linux)"
recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb renamed from recipes-devtools/oracle-java/oracle-jse-jdk-x86-64.inc +2 -0
similarity index 89%
rename from recipes-devtools/oracle-java/oracle-jse-jdk-x86-64.inc
rename to recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb
index f18ce55..45853c3 100644
@@ -7,3 +7,5 @@ SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u${PV_UPDATE}-b${BUILD_N
 
 SRC_URI[md5sum] = "81e3e2df33e13781e5fac5756ed90e67"
 SRC_URI[sha256sum] = "54dd1e13edf18c64941a55da9c91210b53dc5cf48f1a8f4538c863049e346335"
+
+COMPATIBLE_HOST = "(x86_64.*-linux)"
recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb deleted +0 -15
deleted file mode 100644
index 56d84b6..0000000
@@ -1,15 +0,0 @@
-# Automatically choose java package based on target architecture
-def get_java_pkg(d):
-       TA = d.getVar('TARGET_ARCH', True)
-       if TA == "i586":
-               javaPkg = "oracle-jse-jdk-i586"
-       elif TA == "x86_64":
-               javaPkg = "oracle-jse-jdk-x86-64"
-       else:
-               raise bb.parse.SkipPackage("The target architecture '%s' is not supported by the meta-oracle-java layer" %TA)
-       
-       return javaPkg
-
-JAVA_PKG = "${@get_java_pkg(d)}"
-
-require ${JAVA_PKG}.inc
Signature · 1 line
2.1.4
#1 lore raw

PATCH v2 2/6 oracle-jse-jdk: fix native installation

Link java and javac from the bin dir in the $PATH for native contexts. Also link fastjar to jar and gjavah to javah, as some java recipes will look for those tools at build time.

---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
recipes-devtools/oracle-java/oracle-jse-jdk.inc +10 -3
index c5c2480..9e312d0 100644
@@ -12,9 +12,16 @@ JDK_JRE = "jdk"
 require oracle-jse.inc
 
 do_install_class-native() {
-    install -d -m 0755                      ${D}${bindir}/${JDK_JRE}${PV}_${PV_UPDATE}
-    cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE} ${D}${bindir}/
-    ln -sf ${JDK_JRE}${PV}_${PV_UPDATE}     ${D}${bindir}/java
+    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 ${D}${libdir}/${JDK_JRE}${PV}_${PV_UPDATE}/bin/$prog )
+    done
+
+    ( cd ${D}${libdir}/${JDK_JRE}${PV}_${PV_UPDATE}/bin ; \
+      ln -sf javah gjavah ; \
+      ln -sf jar fastjar )
 }
 
 BBCLASSEXTEND = "native"
Signature · 1 line
2.1.4
#2 lore raw

PATCH v2 3/6 oracle-jse: RPROVIDES java2-runtime

In reply to Mario Domenech Goulart

Move RPROVIDES_${PN} = "java2-runtime" from oracle-jse-ejre.inc and from oracle-jse-jre.inc to oracle-jse.inc.

---
 recipes-devtools/oracle-java/oracle-jse-ejre.inc | 1 -
 recipes-devtools/oracle-java/oracle-jse-jre.inc  | 2 --
 recipes-devtools/oracle-java/oracle-jse.inc      | 1 +
 3 files changed, 1 insertion(+), 3 deletions(-)
recipes-devtools/oracle-java/oracle-jse-ejre.inc +0 -1
index 875964c..9a1fdfe 100644
@@ -15,4 +15,3 @@ LIC_FILES_CHKSUM = "\
        file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/COPYRIGHT;md5=be9fe5d47a7dcfb78f142f487afb34bb \
        file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/THIRDPARTYLICENSEREADME.txt;md5=f3a388961d24b8b72d412a079a878cdb \
        "
-RPROVIDES_${PN} += "java2-runtime"
recipes-devtools/oracle-java/oracle-jse-jre.inc +0 -2
index b8b0ed8..32cfac3 100644
@@ -10,5 +10,3 @@ DESCRIPTION = "This is the proprietary JRE from Sun/Oracle, with the Hotspot JVM
 
 JDK_JRE = "jre"
 require oracle-jse.inc
-
-RPROVIDES_${PN} += "java2-runtime"
recipes-devtools/oracle-java/oracle-jse.inc +1 -0
index 483e9d5..d4c33fb 100644
@@ -29,3 +29,4 @@ INSANE_SKIP_${PN} = "${ERROR_QA} ${WARN_QA}"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
 FILES_${PN} = "/usr/"
+RPROVIDES_${PN} = "java2-runtime"
Signature · 1 line
2.1.4
#3 lore raw

PATCH v2 4/6 oracle-jse-jre: generate native content

In reply to Mario Domenech Goulart
---
 recipes-devtools/oracle-java/oracle-jse-jre.inc | 2 ++
 1 file changed, 2 insertions(+)
recipes-devtools/oracle-java/oracle-jse-jre.inc +2 -0
index 32cfac3..e8faba2 100644
@@ -10,3 +10,5 @@ DESCRIPTION = "This is the proprietary JRE from Sun/Oracle, with the Hotspot JVM
 
 JDK_JRE = "jre"
 require oracle-jse.inc
+
+BBCLASSEXTEND = "native"
Signature · 1 line
2.1.4
#4 lore raw

PATCH v2 5/6 oracle-jse-jdk: provide virtual/javac and virtual/java-initial

In reply to Mario Domenech Goulart
---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 1 +
 1 file changed, 1 insertion(+)
recipes-devtools/oracle-java/oracle-jse-jdk.inc +1 -0
index 9e312d0..54e83b8 100644
@@ -27,3 +27,4 @@ do_install_class-native() {
 BBCLASSEXTEND = "native"
 
 RPROVIDES_${PN} += "java2-development"
+PROVIDES += "virtual/javac virtual/java-initial"
Signature · 1 line
2.1.4
#5 lore raw

PATCH v2 6/6 oracle-jse: provide virtual/java

In reply to Mario Domenech Goulart
---
 recipes-devtools/oracle-java/oracle-jse.inc | 1 +
 1 file changed, 1 insertion(+)
recipes-devtools/oracle-java/oracle-jse.inc +1 -0
index d4c33fb..7781421 100644
@@ -30,3 +30,4 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
 FILES_${PN} = "/usr/"
 RPROVIDES_${PN} = "java2-runtime"
+PROVIDES += "virtual/java"
Signature · 1 line
2.1.4
#6 lore raw
In reply to Mario Domenech Goulart

Hi Mario,

Quoted 8 lines · Mario Domenech Goulart

Due the way BitBake parses recipes, including architecture-specific include files was happening too late, causing native variants to pick wrong include files, thus ending up generating broken content.

Setting COMPATIBLE_HOST guarantees that native installations will be consistent.

<snip>

Series applied. Thanks a lot !

Thanks & Regards,
Maxin