Updated oracle jre and jdk recipes to the latest update 60. Also added recipe for ejre to support ARM.
Signed-off-by: Pavel Shumeika <pavel_shume...@epam.com><mailto:pavel_shume...@epam.com> --- .../oracle-java/oracle-jse-ejre-arm_1.7.0.bb | 8 +++++ recipes-devtools/oracle-java/oracle-jse-ejre.inc | 40 ++++++++++++++++++++++ .../oracle-java/oracle-jse-jdk-i586_1.7.0.bb | 10 +++--- .../oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb | 10 +++--- recipes-devtools/oracle-java/oracle-jse-jdk.inc | 8 +++++ .../oracle-java/oracle-jse-jre-i586_1.7.0.bb | 10 +++--- .../oracle-java/oracle-jse-jre-x86-64_1.7.0.bb | 10 +++--- recipes-devtools/oracle-java/oracle-jse.inc | 4 +-- 8 files changed, 78 insertions(+), 22 deletions(-) create mode 100644 recipes-devtools/oracle-java/oracle-jse-ejre-arm_1.7.0.bb create mode 100644 recipes-devtools/oracle-java/oracle-jse-ejre.inc diff --git a/recipes-devtools/oracle-java/oracle-jse-ejre-arm_1.7.0.bb b/recipes-devtools/oracle-java/oracle-jse-ejre-arm_1.7.0.bb new file mode 100644 index 0000000..9b55173 --- /dev/null +++ b/recipes-devtools/oracle-java/oracle-jse-ejre-arm_1.7.0.bb @@ -0,0 +1,8 @@ +PV_UPDATE = "60" + +require oracle-jse-ejre.inc + +SRC_URI = "http://download.oracle.com/otn/java/ejre/7u60-b19/ejre-7u60-fcs-b19-linux-arm-vfp-hflt-client_headless-07_may_2014.tar.gz"<http://download.oracle.com/otn/java/ejre/7u60-b19/ejre-7u60-fcs-b19-linux-arm-vfp-hflt-client_headless-07_may_2014.tar.gz> + +SRC_URI[md5sum] = "b9b8f598b0a7f49e4d221f16ba25c6c0" +SRC_URI[sha256sum] = "ed061060011d88efe5563c2949c00993db85db17ab94f18a78713007a2b90faf" diff --git a/recipes-devtools/oracle-java/oracle-jse-ejre.inc b/recipes-devtools/oracle-java/oracle-jse-ejre.inc new file mode 100644 index 0000000..1731055 --- /dev/null +++ b/recipes-devtools/oracle-java/oracle-jse-ejre.inc @@ -0,0 +1,40 @@ +SUMMARY = "Oracle Java SE runtime environment binaries" +DESCRIPTION = "This is the proprietary JRE from Sun/Oracle, with the Hotspot JVM. It is\ + provided by Sun/Oracle only in binary format.\ + Java Platform, Standard Edition (Java SE) lets you develop and deploy Java\ + applications on desktops and servers, as well as in today's demanding\ + embedded environments. Java offers the rich user interface, performance,\ + versatility, portability, and security that today's applications require.\ + The JRE (Java Runtime Environment) is needed on a system to run Java\ + applications and applets" + +JDK_JRE = "ejre" + +LICENSE_FLAGS = "oracle_java" +LICENSE = "Oracle_Binary_Code_License_Agreement" +LIC_FILES_CHKSUM = "\ + file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/COPYRIGHT;md5=be9fe5d47a7dcfb78f142f487afb34bb \ + file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/THIRDPARTYLICENSEREADME.txt;md5=f3a388961d24b8b72d412a079a878cdb \ + " + +# get the java update version in the resulting package +PR =. "u${PV_UPDATE}" +S = "${WORKDIR}" + +do_install () { + install -d -m 0755 ${D}/usr/${JDK_JRE}${PV}_${PV_UPDATE} + cp -a ${S}/${JDK_JRE}${PV}_${PV_UPDATE} ${D}/usr/ + ln -sf ${JDK_JRE}${PV}_${PV_UPDATE} ${D}/usr/java +} + +# All the files are provided in a binaray package, and keeping all the +# files in a single package causes packaging QA errors and warnings. +# Avoid these packaging failure by skiping all the QA checks +INSANE_SKIP_${PN} = "${ERROR_QA} ${WARN_QA}" + +# Inhibit warnings about files being stripped, we can't do anything about it. +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +FILES_${PN} = "/usr/" + +RPROVIDES_${PN} += "java2-runtime" \ No newline at end of file diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb b/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb index 978fbd5..dae68dc 100644 --- a/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb +++ b/recipes-devtools/oracle-java/oracle-jse-jdk-i586_1.7.0.bb @@ -1,9 +1,9 @@ -PR = "r0" -PV_UPDATE = "25" +PR = "r1" +PV_UPDATE = "60" require oracle-jse-jdk.inc -SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u25-b15/jdk-7u25-linux-i586.tar.gz"<http://download.oracle.com/otn-pub/java/jdk/7u25-b15/jdk-7u25-linux-i586.tar.gz> +SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u60-b19/jdk-7u60-linux-i586.tar.gz"<http://download.oracle.com/otn-pub/java/jdk/7u60-b19/jdk-7u60-linux-i586.tar.gz> -SRC_URI[md5sum] = "23176d0ebf9dedd21e3150b4bb0ee776" -SRC_URI[sha256sum] = "dd89b20afa939992bb7fdc44837fa64f0a98d7ee1e5706fe8a2d9e2247ba6de7" +SRC_URI[md5sum] = "b33c914b03e46c3e7c33e4bdddbec4bd" +SRC_URI[sha256sum] = "d736fb4fd7c8ef50b76411daa640c6feeb48a5c275d29a90ffeb916a78d47a48" diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb b/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb index 7979401..3e9ed4f 100644 --- a/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb +++ b/recipes-devtools/oracle-java/oracle-jse-jdk-x86-64_1.7.0.bb @@ -1,9 +1,9 @@ -PR = "r0" -PV_UPDATE = "25" +PR = "r1" +PV_UPDATE = "60" require oracle-jse-jdk.inc -SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u25-b15/jdk-7u25-linux-x64.tar.gz"<http://download.oracle.com/otn-pub/java/jdk/7u25-b15/jdk-7u25-linux-x64.tar.gz> +SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u60-b19/jdk-7u60-linux-x64.tar.gz"<http://download.oracle.com/otn-pub/java/jdk/7u60-b19/jdk-7u60-linux-x64.tar.gz> -SRC_URI[md5sum] = "83ba05e260813f7a9140b76e3d37ea33" -SRC_URI[sha256sum] = "f80dff0e19ca8d038cf7fe3aaa89538496b80950f4d10ff5f457988ae159b2a6" +SRC_URI[md5sum] = "eba4b121b8a363f583679d7cb2e69d28" +SRC_URI[sha256sum] = "c7232b717573b057dbe828d937ee406b7a75fbc6aba7f1de98a049cbd42c6ae8" diff --git a/recipes-devtools/oracle-java/oracle-jse-jdk.inc b/recipes-devtools/oracle-java/oracle-jse-jdk.inc index 6a34a7a..de0870a 100644 --- a/recipes-devtools/oracle-java/oracle-jse-jdk.inc +++ b/recipes-devtools/oracle-java/oracle-jse-jdk.inc @@ -10,3 +10,11 @@ DESCRIPTION = "This is the proprietary JDK from Sun/Oracle, with the Hotspot JVM 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 +} + +BBCLASSEXTEND = "native" diff --git a/recipes-devtools/oracle-java/oracle-jse-jre-i586_1.7.0.bb b/recipes-devtools/oracle-java/oracle-jse-jre-i586_1.7.0.bb index 6125025..660e122 100644 --- a/recipes-devtools/oracle-java/oracle-jse-jre-i586_1.7.0.bb +++ b/recipes-devtools/oracle-java/oracle-jse-jre-i586_1.7.0.bb @@ -1,9 +1,9 @@ -PR = "r0" -PV_UPDATE = "25" +PR = "r1" +PV_UPDATE = "60" require oracle-jse-jre.inc -SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u25-b15/jre-7u25-linux-i586.tar.gz"<http://download.oracle.com/otn-pub/java/jdk/7u25-b15/jre-7u25-linux-i586.tar.gz> +SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u60-b19/jre-7u60-linux-i586.tar.gz"<http://download.oracle.com/otn-pub/java/jdk/7u60-b19/jre-7u60-linux-i586.tar.gz> -SRC_URI[md5sum] = "0e9ccefe49e937e592dbb605f2e8e7d8" -SRC_URI[sha256sum] = "4016965536d8607743267812ab04e6d428036dda432893748c1df6cb77b09628" +SRC_URI[md5sum] = "331a7ef8230de0939941d1e9b3b761fd" +SRC_URI[sha256sum] = "76e9c4f7cdd62025fe7004221cdeceabcc3adb2f093fc3ee127d30c95df7277e" diff --git a/recipes-devtools/oracle-java/oracle-jse-jre-x86-64_1.7.0.bb b/recipes-devtools/oracle-java/oracle-jse-jre-x86-64_1.7.0.bb index 4058d23..ee192e7 100644 --- a/recipes-devtools/oracle-java/oracle-jse-jre-x86-64_1.7.0.bb +++ b/recipes-devtools/oracle-java/oracle-jse-jre-x86-64_1.7.0.bb @@ -1,9 +1,9 @@ -PR = "r0" -PV_UPDATE = "25" +PR = "r1" +PV_UPDATE = "60" require oracle-jse-jre.inc -SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u25-b15/jre-7u25-linux-x64.tar.gz"<http://download.oracle.com/otn-pub/java/jdk/7u25-b15/jre-7u25-linux-x64.tar.gz> +SRC_URI = "http://download.oracle.com/otn-pub/java/jdk/7u60-b19/jre-7u60-linux-x64.tar.gz"<http://download.oracle.com/otn-pub/java/jdk/7u60-b19/jre-7u60-linux-x64.tar.gz> -SRC_URI[md5sum] = "743ee0ebf73ce428c912866d84e374e0" -SRC_URI[sha256sum] = "3c4496316fb413d5ab0590e9971676a521b9a600b3ceaac311f04c18c98a98c0" +SRC_URI[md5sum] = "53a787c9a3170308641074cd86606a99" +SRC_URI[sha256sum] = "73d6d759f524320671904447f9436ff0e60aa9379cacc0838001d6259e86216d" diff --git a/recipes-devtools/oracle-java/oracle-jse.inc b/recipes-devtools/oracle-java/oracle-jse.inc index 98069f4..9af8f06 100644 --- a/recipes-devtools/oracle-java/oracle-jse.inc +++ b/recipes-devtools/oracle-java/oracle-jse.inc @@ -2,8 +2,8 @@ LICENSE_FLAGS = "oracle_java" LICENSE = "Oracle_Binary_Code_License_Agreement" LIC_FILES_CHKSUM = "\ file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/LICENSE;md5=98f46ab6481d87c4d77e0e91a6dbc15f \ - file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/COPYRIGHT;md5=3a11238025bf13b87f04753183ffeb90 \ - file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/THIRDPARTYLICENSEREADME.txt;md5=c339b34e3da6673d2c5950d0f8808f8c \ + file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/COPYRIGHT;md5=be9fe5d47a7dcfb78f142f487afb34bb \ + file://${WORKDIR}/${JDK_JRE}${PV}_${PV_UPDATE}/THIRDPARTYLICENSEREADME.txt;md5=f3a388961d24b8b72d412a079a878cdb \ " # get the java update version in the resulting package -- 1.9.1
-- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto