[meta-oracle-java][PATCH 1/6] oracle-jse-jdk: split recipe into per-architecture recipes

[meta-oracle-java][PATCH 1/6] oracle-jse-jdk: split recipe into per-architecture recipes

[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.

Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
---
 ...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} (90%)
 delete mode 100644 recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb

diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk-i586.inc b/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb
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..9fb2188 100644
--- a/recipes-devtools/oracle-java/oracle-jse-jdk-i586.inc
+++ b/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb
@@ -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)"
diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64.inc b/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb
similarity index 90%
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..a6d0bc7 100644
--- a/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64.inc
+++ b/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb
@@ -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)"
diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb b/recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb
deleted file mode 100644
index 56d84b6..0000000
--- a/recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb
+++ /dev/null
@@ -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
-- 
2.1.4

[meta-oracle-java][PATCH 2/6] oracle-jse-jdk: fix native installation

[Mario Domenech Goulart]

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.

Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk.inc b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
index c5c2480..9e312d0 100644
--- a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
+++ b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
@@ -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"
-- 
2.1.4

[meta-oracle-java][PATCH 3/6] oracle-jse: RPROVIDES java2-runtime

[Mario Domenech Goulart]

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

Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
---
 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(-)

diff --git a/recipes-devtools/oracle-java/oracle-jse-ejre.inc b/recipes-devtools/oracle-java/oracle-jse-ejre.inc
index 875964c..9a1fdfe 100644
--- a/recipes-devtools/oracle-java/oracle-jse-ejre.inc
+++ b/recipes-devtools/oracle-java/oracle-jse-ejre.inc
@@ -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"
diff --git a/recipes-devtools/oracle-java/oracle-jse-jre.inc b/recipes-devtools/oracle-java/oracle-jse-jre.inc
index b8b0ed8..32cfac3 100644
--- a/recipes-devtools/oracle-java/oracle-jse-jre.inc
+++ b/recipes-devtools/oracle-java/oracle-jse-jre.inc
@@ -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"
diff --git a/recipes-devtools/oracle-java/oracle-jse.inc b/recipes-devtools/oracle-java/oracle-jse.inc
index 483e9d5..d4c33fb 100644
--- a/recipes-devtools/oracle-java/oracle-jse.inc
+++ b/recipes-devtools/oracle-java/oracle-jse.inc
@@ -29,3 +29,4 @@ INSANE_SKIP_${PN} = "${ERROR_QA} ${WARN_QA}"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
 FILES_${PN} = "/usr/"
+RPROVIDES_${PN} = "java2-runtime"
-- 
2.1.4

[meta-oracle-java][PATCH 4/6] oracle-jse-jre: generate native content

[Mario Domenech Goulart]

Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
---
 recipes-devtools/oracle-java/oracle-jse-jre.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-devtools/oracle-java/oracle-jse-jre.inc b/recipes-devtools/oracle-java/oracle-jse-jre.inc
index 32cfac3..e8faba2 100644
--- a/recipes-devtools/oracle-java/oracle-jse-jre.inc
+++ b/recipes-devtools/oracle-java/oracle-jse-jre.inc
@@ -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"
-- 
2.1.4

[meta-oracle-java][PATCH 5/6] oracle-jse-jdk: provide virtual/javac and virtual/java-initial

[Mario Domenech Goulart]

Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
---
 recipes-devtools/oracle-java/oracle-jse-jdk.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk.inc b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
index 9e312d0..54e83b8 100644
--- a/recipes-devtools/oracle-java/oracle-jse-jdk.inc
+++ b/recipes-devtools/oracle-java/oracle-jse-jdk.inc
@@ -27,3 +27,4 @@ do_install_class-native() {
 BBCLASSEXTEND = "native"
 
 RPROVIDES_${PN} += "java2-development"
+PROVIDES += "virtual/javac virtual/java-initial"
-- 
2.1.4

[meta-oracle-java][PATCH 6/6] oracle-jse: provide virtual/java

[Mario Domenech Goulart]

Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
---
 recipes-devtools/oracle-java/oracle-jse.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes-devtools/oracle-java/oracle-jse.inc b/recipes-devtools/oracle-java/oracle-jse.inc
index d4c33fb..7781421 100644
--- a/recipes-devtools/oracle-java/oracle-jse.inc
+++ b/recipes-devtools/oracle-java/oracle-jse.inc
@@ -30,3 +30,4 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
 FILES_${PN} = "/usr/"
 RPROVIDES_${PN} = "java2-runtime"
+PROVIDES += "virtual/java"
-- 
2.1.4

Re: [meta-oracle-java][PATCH 1/6] oracle-jse-jdk: split recipe into per-architecture recipes

[Maxin John]

Hi Mario,

On Tue, May 12, 2015 at 10:56 PM, Mario Domenech Goulart
<mario@ossystems.com.br> wrote:
> 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.
>
> Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
> ---
>  ...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} (90%)
>  delete mode 100644 recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb
>
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk-i586.inc b/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb
> 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..9fb2188 100644
> --- a/recipes-devtools/oracle-java/oracle-jse-jdk-i586.inc
> +++ b/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb
> @@ -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)"
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64.inc b/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb
> similarity index 90%
> 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..a6d0bc7 100644
> --- a/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64.inc
> +++ b/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb
> @@ -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)"
> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb b/recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb
> deleted file mode 100644
> index 56d84b6..0000000
> --- a/recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb
> +++ /dev/null
> @@ -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


This change results in the below listed error:

# bitbake oracle-jse-jdk-x86-64

ERROR: Nothing PROVIDES 'oracle-jse-jdk-x86-64'
ERROR: oracle-jse-jdk-x86-64 was skipped: incompatible with host
x86_64-poky-linux (not in COMPATIBLE_HOST)

Summary: There was 1 ERROR message shown, returning a non-zero exit code.

The COMPATIBLE_HOST should be "x86_64.*-linux". Please fix it.

Best Regards,
Maxin

Re: [meta-oracle-java][PATCH 1/6] oracle-jse-jdk: split recipe into per-architecture recipes

[Mario Domenech Goulart]

On Wed, 13 May 2015 15:22:15 +0200 Maxin John <maxin@maxinbjohn.info> wrote:

> On Tue, May 12, 2015 at 10:56 PM, Mario Domenech Goulart <mario@ossystems.com.br> wrote:
>> 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.
>>
>> Signed-off-by: Mario Domenech Goulart <mario@ossystems.com.br>
>> ---
>>  ...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} (90%)
>>  delete mode 100644 recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb
>>
>> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk-i586.inc
>> b/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb
>> 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..9fb2188 100644
>> --- a/recipes-devtools/oracle-java/oracle-jse-jdk-i586.inc
>> +++ b/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb
>> @@ -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)"
>> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64.inc
>> b/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb
>> similarity index 90%
>> 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..a6d0bc7 100644
>> --- a/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64.inc
>> +++ b/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb
>> @@ -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)"
>> diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb
>> b/recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb
>> deleted file mode 100644
>> index 56d84b6..0000000
>> --- a/recipes-devtools/oracle-java/oracle-jse-jdk_1.7.0.bb
>> +++ /dev/null
>> @@ -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
>
>
> This change results in the below listed error:
>
> # bitbake oracle-jse-jdk-x86-64
>
> ERROR: Nothing PROVIDES 'oracle-jse-jdk-x86-64'
> ERROR: oracle-jse-jdk-x86-64 was skipped: incompatible with host
> x86_64-poky-linux (not in COMPATIBLE_HOST)
>
> Summary: There was 1 ERROR message shown, returning a non-zero exit code.
>
> The COMPATIBLE_HOST should be "x86_64.*-linux". Please fix it.

Thanks for spotting that, Maxin.  I've submitted a v2.

Best wishes.
Mario
-- 
http://www.ossystems.com.br