From 1f310dd3df6526a5c8175bfd378bf5b7d7da9ac5 Mon Sep 17 00:00:00 2001 From: André Draszik Date: Mon, 13 Aug 2018 11:09:36 +0100 Subject: openjdk-8: update to 8u172b11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Draszik Signed-off-by: Richard Leitner --- recipes-core/openjdk/openjdk-8-native_162b12.bb | 2 - recipes-core/openjdk/openjdk-8-native_172b11.bb | 2 + recipes-core/openjdk/openjdk-8-release-161b15.inc | 33 -------- recipes-core/openjdk/openjdk-8-release-162b12.inc | 49 ----------- recipes-core/openjdk/openjdk-8-release-16xbyy.inc | 98 ---------------------- .../openjdk/openjdk-8-release-172b11-aarch64.inc | 33 ++++++++ .../openjdk/openjdk-8-release-172b11-common.inc | 98 ++++++++++++++++++++++ recipes-core/openjdk/openjdk-8-release-172b11.inc | 36 ++++++++ recipes-core/openjdk/openjdk-8_16xbyy.bb | 63 -------------- recipes-core/openjdk/openjdk-8_172b11.bb | 62 ++++++++++++++ recipes-core/openjdk/openjre-8_16xbyy.bb | 47 ----------- recipes-core/openjdk/openjre-8_172b11.bb | 46 ++++++++++ 12 files changed, 277 insertions(+), 292 deletions(-) delete mode 100644 recipes-core/openjdk/openjdk-8-native_162b12.bb create mode 100644 recipes-core/openjdk/openjdk-8-native_172b11.bb delete mode 100644 recipes-core/openjdk/openjdk-8-release-161b15.inc delete mode 100644 recipes-core/openjdk/openjdk-8-release-162b12.inc delete mode 100644 recipes-core/openjdk/openjdk-8-release-16xbyy.inc create mode 100644 recipes-core/openjdk/openjdk-8-release-172b11-aarch64.inc create mode 100644 recipes-core/openjdk/openjdk-8-release-172b11-common.inc create mode 100644 recipes-core/openjdk/openjdk-8-release-172b11.inc delete mode 100644 recipes-core/openjdk/openjdk-8_16xbyy.bb create mode 100644 recipes-core/openjdk/openjdk-8_172b11.bb delete mode 100644 recipes-core/openjdk/openjre-8_16xbyy.bb create mode 100644 recipes-core/openjdk/openjre-8_172b11.bb diff --git a/recipes-core/openjdk/openjdk-8-native_162b12.bb b/recipes-core/openjdk/openjdk-8-native_162b12.bb deleted file mode 100644 index e7eb21c..0000000 --- a/recipes-core/openjdk/openjdk-8-native_162b12.bb +++ /dev/null @@ -1,2 +0,0 @@ -require openjdk-8-release-${PV}.inc -require openjdk-8-native.inc diff --git a/recipes-core/openjdk/openjdk-8-native_172b11.bb b/recipes-core/openjdk/openjdk-8-native_172b11.bb new file mode 100644 index 0000000..e7eb21c --- /dev/null +++ b/recipes-core/openjdk/openjdk-8-native_172b11.bb @@ -0,0 +1,2 @@ +require openjdk-8-release-${PV}.inc +require openjdk-8-native.inc diff --git a/recipes-core/openjdk/openjdk-8-release-161b15.inc b/recipes-core/openjdk/openjdk-8-release-161b15.inc deleted file mode 100644 index 0a4434c..0000000 --- a/recipes-core/openjdk/openjdk-8-release-161b15.inc +++ /dev/null @@ -1,33 +0,0 @@ -require openjdk-8-release-16xbyy.inc - -CORBA_CHANGESET_aarch64 = "f73da600c483" -SRC_URI[corba.md5sum] = "bf884b82fcc6de466946fcb87d24ebf3" -SRC_URI[corba.sha256sum] = "ebf73d96185fc05e502088ae89a8d6494c3971dd220458deeff3876f72396b6c" - -HOTSPOT_CHANGESET_aarch64 = "a600839824fa" -SRC_URI[hotspot.md5sum] = "20c88ba26f8f45a2769f4edf32afd593" -SRC_URI[hotspot.sha256sum] = "6d0d1b9c2df3392ad6e21ca3eae39d06b50632a4a419da3d4363248943ea8b97" - -JAXP_CHANGESET_aarch64 = "b1e2af899046" -SRC_URI[jaxp.md5sum] = "219582b26d7de2973b75f4329b53ec7d" -SRC_URI[jaxp.sha256sum] = "907cc4dfb01a3a2a6d74dfa90fa6fcb5b3df55600f41ba44dcdc94b47e85a382" - -JAXWS_CHANGESET_aarch64 = "0002ed323fe5" -SRC_URI[jaxws.md5sum] = "44935b81e3405fcaef675d5d08c2149e" -SRC_URI[jaxws.sha256sum] = "0d1d52f1cf254a643ece1bd6cd8628fae1a4d56e8b59388cc9ad73b3caf151a1" - -JDK_CHANGESET_aarch64 = "c2ba2ed87d18" -SRC_URI[jdk.md5sum] = "f4c0393a157dcb8b90ee7c7d80cbdfbf" -SRC_URI[jdk.sha256sum] = "c84a17451b47242f9d96bf431011607afc3776f285a6ad9a60190fba2d434c49" - -LANGTOOLS_CHANGESET_aarch64 = "cdb217c578cb" -SRC_URI[langtools.md5sum] = "608cf07781259d916d1663d6a5ced26d" -SRC_URI[langtools.sha256sum] = "ad28e75bfaba1b64fdd02ea316db3ba3cba68007f90c5fa2be2418ce8bc0074d" - -NASHORN_CHANGESET_aarch64 = "505d0eb2fafe" -SRC_URI[nashorn.md5sum] = "be981a6c55f9e602ff129fed65505a8c" -SRC_URI[nashorn.sha256sum] = "14419ccd773e1db83b600d05aca3cbac9f24be77abda9a132d12305d8821d6d7" - -OPENJDK_CHANGESET_aarch64 = "917454da25c1" -SRC_URI[openjdk.md5sum] = "1e4b3eca032742b7448731f9b8fcb426" -SRC_URI[openjdk.sha256sum] = "1e17e2d8384a7b808a89b982e7c09c4feb8598b7a66b93697bfb8759c1005974" diff --git a/recipes-core/openjdk/openjdk-8-release-162b12.inc b/recipes-core/openjdk/openjdk-8-release-162b12.inc deleted file mode 100644 index bc2b342..0000000 --- a/recipes-core/openjdk/openjdk-8-release-162b12.inc +++ /dev/null @@ -1,49 +0,0 @@ -require openjdk-8-release-16xbyy.inc - -# We do not yet work for aarch64. -COMPATIBLE_HOST = "^(?!aarch64).*" - -CORBA_CHANGESET = "f6b6ad6feb6e" -SRC_URI[corba.md5sum] = "0358300224b63f3deeba63d3de7d765c" -SRC_URI[corba.sha256sum] = "54da09fd0c76834094d9f167c03ff1ac2373f5e46fb26d24d0d018cdc59a2842" - -HOTSPOT_CHANGESET = "d2e3920d2fd0" -SRC_URI[hotspot.md5sum] = "17a1da8be42ad0c7778e7090ea5003c1" -SRC_URI[hotspot.sha256sum] = "3f07ee7a49cb4258ef00a8a896b0f7f87e85f06dc31f6c0db698d8058926b365" - -JAXP_CHANGESET = "e8a1a2db69dc" -SRC_URI[jaxp.md5sum] = "9b344a6cf317ca485b8790e67ccc2467" -SRC_URI[jaxp.sha256sum] = "fbd0eaed48415c2918a47e7d76ce276416bab792e1959b1d3dee2b703aa76f5a" - -JAXWS_CHANGESET = "7b4329f78e52" -SRC_URI[jaxws.md5sum] = "b1da20ee79382eb5bb72077eb02addd4" -SRC_URI[jaxws.sha256sum] = "ffd31d467c6fe7fc0956e801c08168d48ba02b4dea38b7dedbafc054092ca8f0" - -JDK_CHANGESET = "d201d8b87f48" -SRC_URI[jdk.md5sum] = "bced8a322e53083472b39f01e938b21a" -SRC_URI[jdk.sha256sum] = "6e057ceb02a7d8bb66233d52b23d246120b5c0d72e7a71cb6fb0ace84e8bb581" - -LANGTOOLS_CHANGESET = "034738d4f1d2" -SRC_URI[langtools.md5sum] = "fbc6faea65cfc248f93f54e634d7bf50" -SRC_URI[langtools.sha256sum] = "91615ade480c706f58062e74ee112f95ab947e1c5366a29a7d9b2b6b0a2f72d3" - -NASHORN_CHANGESET = "81ce60cabe97" -SRC_URI[nashorn.md5sum] = "318993c189f16894abe94db14a067618" -SRC_URI[nashorn.sha256sum] = "8df64026be98e6efad200ef8639e2f7e96a783e262b402afcb8045f46709e457" - -OPENJDK_CHANGESET = "4be07cb28b21" -SRC_URI[openjdk.md5sum] = "24d30b66aaaef51af9b598c8989c1c82" -SRC_URI[openjdk.sha256sum] = "8f9ecc5fc5f9c6df671a2ef07949f86080823c89954b2b87f6727a82af679eca" - - -#CACAO_VERSION = "e215e36be9fc" -#CACAO_FILE = "${CACAO_VERSION}.tar.gz" -#CACAO_URI = "http://icedtea.wildebeest.org/download/drops/cacao/${CACAO_FILE};name=cacao;unpack=false" -#SRC_URI[cacao.md5sum] = "79f95f0aea4ba04cf2f1a8632ac66d14" -#SRC_URI[cacao.sha256sum] = "4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab" -# -#JAMVM_VERSION = "ec18fb9e49e62dce16c5094ef1527eed619463aa" -#JAMVM_FILE = "jamvm-${JAMVM_VERSION}.tar.gz" -#JAMVM_URI = "http://icedtea.wildebeest.org/download/drops/jamvm/${JAMVM_FILE};name=jamvm;unpack=false" -#SRC_URI[jamvm.md5sum] = "d50ae193d01a9251e10679c7a2cc6ff1" -#SRC_URI[jamvm.sha256sum] = "31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc" diff --git a/recipes-core/openjdk/openjdk-8-release-16xbyy.inc b/recipes-core/openjdk/openjdk-8-release-16xbyy.inc deleted file mode 100644 index 8b30c37..0000000 --- a/recipes-core/openjdk/openjdk-8-release-16xbyy.inc +++ /dev/null @@ -1,98 +0,0 @@ -PATCHES_URI = "\ - file://remove-shell-variables-from-autoheader.patch;striplevel=0 \ - file://filter-aclocal-copy-too.patch;striplevel=0 \ - file://dont-expect-fqpn-for-make.patch;striplevel=0 \ - file://openjdk8-no-genx11-in-headless.patch;striplevel=0 \ - file://openjdk8-no-unused-deps.patch;striplevel=0 \ - file://openjdk8-find-compiler-fix-env-respect.patch;striplevel=0 \ - file://openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch;striplevel=0 \ - file://0001-jdk-comparison-between-pointer-and-integer.patch \ - file://0002-hotspot-fix-compilation-with-security-flags-enabled.patch \ - file://0003-jdk-Allow-using-a-system-installed-libjpeg.patch \ - file://0004-jdk-Allow-using-a-system-installed-libpng.patch \ - file://0005-hotspot-use-correct-include-for-poll.patch \ - file://0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch \ - file://0007-jdk-use-correct-include-for-poll.patch \ - file://0008-jdk-use-correct-include-for-signal.patch \ - file://0009-jdk-disable-backtrace-musl-build-fix.patch \ - file://0010-build-fix-build-on-as-needed-toolchains-generic.patch \ - file://0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch \ -" -# some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch -# reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html -# by Roman Kennke (rkennke at redhat.com) -LIBPNG_NEON_PATCH = "file://openjdk8-fix-libpng-neon-build.patch;striplevel=0" -LIBPNG_NEON_PATCH_aarch64 = "" -PATCHES_URI_append_class-target = "\ - file://openjdk8-restrict-to-staging-dir.patch;striplevel=0 \ - file://openjdk8-fix-shark-build.patch;striplevel=0 \ - file://openjdk8-fix-shark-stdc++11.patch;striplevel=0 \ - file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;striplevel=0 \ - file://openjdk8-fix-adlc-flags.patch;striplevel=0 \ - file://openjdk8-add-missing-linker-flags.patch;striplevel=0 \ - ${LIBPNG_NEON_PATCH} \ -" -PATCHES_URI_append_libc-musl = "\ - file://musl-0001-hotspot-stop-using-obsolete-isnanf.patch \ - file://musl-0002-jdk-give-a-much-bigger-buffer-to-getmntent_r.patch \ - file://musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch \ - file://musl-0004-jdk-remove-sysctl.h-include-musl-build-fix.patch \ - file://musl-0005-hotspot-disable-agent-build.patch \ - file://musl-0006-hotspot-os_linux-remove-glibc-dependencies.patch \ - file://musl-0007-hotspot-os_linux_x86-remove-glibc-dependencies-fpu_c.patch \ - file://musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch \ - file://musl-0009-jdk-musl-has-gethostby_r.patch \ -" -PATCHES_URI_append_libc-musl_aarch64 = " file://hotspot-remaining-musl-fixes-aarch64.patch" - -# Name of the directory containing the compiled output -BUILD_DIR = "openjdk.build" -BUILD_DIR_ECJ = "openjdk.build-ecj" - -# Force arm mode for now -ARM_INSTRUCTION_SET_armv4t = "ARM" - -# readdir_r was deprecated in glibc-2.24. Ignore the error for now -# NOTE: When updating the recipe, please check if this is still needed -BUILD_CFLAGS_append = " -Wno-error=deprecated-declarations" -TARGET_CFLAGS_append = " -Wno-error=deprecated-declarations" - -# Enable zero mode for arm based builds, as normal hotspot fails to build -PACKAGECONFIG_append_arm = " zero" - -OPENJDK_ARCH_PORT = "jdk8u" -OPENJDK_ARCH_PORT_aarch64 = "aarch64-port" -OPENJDK_HG_U = "jdk8u" -OPENJDK_HG_URL = "http://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}" - -OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2" -OPENJDK_FILE_LOCAL = "openjdk8-${PV}-jdk8u-${OPENJDK_FILE}" -OPENJDK_URI = "${OPENJDK_HG_URL}/archive/${OPENJDK_FILE};downloadfilename=${OPENJDK_FILE_LOCAL};name=openjdk" - -HOTSPOT_FILE = "${HOTSPOT_CHANGESET}.tar.bz2" -HOTSPOT_FILE_LOCAL = "openjdk8-${PV}-hotspot-${HOTSPOT_FILE}" -HOTSPOT_URI = "${OPENJDK_HG_URL}/hotspot/archive/${HOTSPOT_FILE};downloadfilename=${HOTSPOT_FILE_LOCAL};name=hotspot;unpack=false" - -CORBA_FILE = "${CORBA_CHANGESET}.tar.bz2" -CORBA_FILE_LOCAL = "openjdk8-${PV}-corba-${CORBA_FILE}" -CORBA_URI = "${OPENJDK_HG_URL}/corba/archive/${CORBA_FILE};downloadfilename=${CORBA_FILE_LOCAL};name=corba;unpack=false" - -JAXP_FILE = "${JAXP_CHANGESET}.tar.bz2" -JAXP_FILE_LOCAL = "openjdk8-${PV}-jaxp-${JAXP_FILE}" -JAXP_URI = "${OPENJDK_HG_URL}/jaxp/archive/${JAXP_FILE};downloadfilename=${JAXP_FILE_LOCAL};name=jaxp;unpack=false" - -JAXWS_FILE = "${JAXWS_CHANGESET}.tar.bz2" -JAXWS_FILE_LOCAL = "openjdk8-${PV}-jaxws-${JAXWS_FILE}" -JAXWS_URI = "${OPENJDK_HG_URL}/jaxws/archive/${JAXWS_FILE};downloadfilename=${JAXWS_FILE_LOCAL};name=jaxws;unpack=false" - -JDK_FILE = "${JDK_CHANGESET}.tar.bz2" -JDK_FILE_LOCAL = "openjdk8-${PV}-jdk-${JDK_FILE}" -JDK_URI = "${OPENJDK_HG_URL}/jdk/archive/${JDK_FILE};downloadfilename=${JDK_FILE_LOCAL};name=jdk;unpack=false" - -LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.bz2" -LANGTOOLS_FILE_LOCAL = "openjdk8-${PV}-langtools-${LANGTOOLS_FILE}" -LANGTOOLS_URI = "${OPENJDK_HG_URL}/langtools/archive/${LANGTOOLS_FILE};downloadfilename=${LANGTOOLS_FILE_LOCAL};name=langtools;unpack=false" - -NASHORN_FILE = "${NASHORN_CHANGESET}.tar.bz2" -NASHORN_FILE_LOCAL = "openjdk8-${PV}-nashorn-${NASHORN_FILE}" -NASHORN_URI = "${OPENJDK_HG_URL}/nashorn/archive/${NASHORN_FILE};downloadfilename=${NASHORN_FILE_LOCAL};name=nashorn;unpack=false" diff --git a/recipes-core/openjdk/openjdk-8-release-172b11-aarch64.inc b/recipes-core/openjdk/openjdk-8-release-172b11-aarch64.inc new file mode 100644 index 0000000..dddae6a --- /dev/null +++ b/recipes-core/openjdk/openjdk-8-release-172b11-aarch64.inc @@ -0,0 +1,33 @@ +require openjdk-8-release-172b11-common.inc + +CORBA_CHANGESET_aarch64 = "3a04a7c080af" +SRC_URI[corba.md5sum] = "758b29d6cf714fd894df8674afd78e17" +SRC_URI[corba.sha256sum] = "564113dbeadc57ac5831ccc056e0b920adbd3b74558cf750aa899f5de25ceb5e" + +HOTSPOT_CHANGESET_aarch64 = "1ced2ae00e35" +SRC_URI[hotspot.md5sum] = "1db8a0e5e63352f1743e9d41ab6ed5cf" +SRC_URI[hotspot.sha256sum] = "6993c3138035a7c0d2782b1ca7aabdb43452b1abbcc60448042f5c9207b03ab5" + +JAXP_CHANGESET_aarch64 = "ab8087f496fe" +SRC_URI[jaxp.md5sum] = "0e7d8755af72aaf9ec7521514d8bb541" +SRC_URI[jaxp.sha256sum] = "6e70c1535d738dc2c4e3a2fb9e6e11c660172b6d2ce905ec33e8924f8c208978" + +JAXWS_CHANGESET_aarch64 = "1e71aeefeecf" +SRC_URI[jaxws.md5sum] = "16ff9ba1007aee21ad3df472b1f5c55e" +SRC_URI[jaxws.sha256sum] = "b6ccb2855c2e9cd5778b193b5ad47f2e13496cbbbad74497c70216cd04b4c7dc" + +JDK_CHANGESET_aarch64 = "e8e6553e7ca9" +SRC_URI[jdk.md5sum] = "52b35732c17e9048e506b7b46c1282f8" +SRC_URI[jdk.sha256sum] = "ffaa79dad3b126af77ac9c230c54805b224c5d6517830a37c7272678407c99da" + +LANGTOOLS_CHANGESET_aarch64 = "14d381cbe563" +SRC_URI[langtools.md5sum] = "d14425cc0334ed46ce695c9930bff6d5" +SRC_URI[langtools.sha256sum] = "a4334c8859fe48bf2eae3b076785ff2e36a5ae80cf5840aef32731c3099a2274" + +NASHORN_CHANGESET_aarch64 = "c667b467b394" +SRC_URI[nashorn.md5sum] = "0389c953bdd14c804d873d95ff4b3033" +SRC_URI[nashorn.sha256sum] = "7cd87e641f0781481635593c144c8030f20d97cfc048ca57bd56381bab8e7d92" + +OPENJDK_CHANGESET_aarch64 = "74564d40b0d6" +SRC_URI[openjdk.md5sum] = "13f7f15386f7aa0cc3383e9d1e98d2f1" +SRC_URI[openjdk.sha256sum] = "a6425e11700edcdc0761df9da75b28b48adc664f3d8259c49ced1c85af3dc502" diff --git a/recipes-core/openjdk/openjdk-8-release-172b11-common.inc b/recipes-core/openjdk/openjdk-8-release-172b11-common.inc new file mode 100644 index 0000000..8b30c37 --- /dev/null +++ b/recipes-core/openjdk/openjdk-8-release-172b11-common.inc @@ -0,0 +1,98 @@ +PATCHES_URI = "\ + file://remove-shell-variables-from-autoheader.patch;striplevel=0 \ + file://filter-aclocal-copy-too.patch;striplevel=0 \ + file://dont-expect-fqpn-for-make.patch;striplevel=0 \ + file://openjdk8-no-genx11-in-headless.patch;striplevel=0 \ + file://openjdk8-no-unused-deps.patch;striplevel=0 \ + file://openjdk8-find-compiler-fix-env-respect.patch;striplevel=0 \ + file://openjdk8-prevent-debuginfo-in-favour-of-openembedded-package-split.patch;striplevel=0 \ + file://0001-jdk-comparison-between-pointer-and-integer.patch \ + file://0002-hotspot-fix-compilation-with-security-flags-enabled.patch \ + file://0003-jdk-Allow-using-a-system-installed-libjpeg.patch \ + file://0004-jdk-Allow-using-a-system-installed-libpng.patch \ + file://0005-hotspot-use-correct-include-for-poll.patch \ + file://0006-hotspot-don-t-rely-on-old-SysV-SIGCLD.patch \ + file://0007-jdk-use-correct-include-for-poll.patch \ + file://0008-jdk-use-correct-include-for-signal.patch \ + file://0009-jdk-disable-backtrace-musl-build-fix.patch \ + file://0010-build-fix-build-on-as-needed-toolchains-generic.patch \ + file://0011-hotspot-backport-patch-to-fix-misuses-of-strncpy-str.patch \ +" +# some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch +# reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html +# by Roman Kennke (rkennke at redhat.com) +LIBPNG_NEON_PATCH = "file://openjdk8-fix-libpng-neon-build.patch;striplevel=0" +LIBPNG_NEON_PATCH_aarch64 = "" +PATCHES_URI_append_class-target = "\ + file://openjdk8-restrict-to-staging-dir.patch;striplevel=0 \ + file://openjdk8-fix-shark-build.patch;striplevel=0 \ + file://openjdk8-fix-shark-stdc++11.patch;striplevel=0 \ + file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;striplevel=0 \ + file://openjdk8-fix-adlc-flags.patch;striplevel=0 \ + file://openjdk8-add-missing-linker-flags.patch;striplevel=0 \ + ${LIBPNG_NEON_PATCH} \ +" +PATCHES_URI_append_libc-musl = "\ + file://musl-0001-hotspot-stop-using-obsolete-isnanf.patch \ + file://musl-0002-jdk-give-a-much-bigger-buffer-to-getmntent_r.patch \ + file://musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch \ + file://musl-0004-jdk-remove-sysctl.h-include-musl-build-fix.patch \ + file://musl-0005-hotspot-disable-agent-build.patch \ + file://musl-0006-hotspot-os_linux-remove-glibc-dependencies.patch \ + file://musl-0007-hotspot-os_linux_x86-remove-glibc-dependencies-fpu_c.patch \ + file://musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch \ + file://musl-0009-jdk-musl-has-gethostby_r.patch \ +" +PATCHES_URI_append_libc-musl_aarch64 = " file://hotspot-remaining-musl-fixes-aarch64.patch" + +# Name of the directory containing the compiled output +BUILD_DIR = "openjdk.build" +BUILD_DIR_ECJ = "openjdk.build-ecj" + +# Force arm mode for now +ARM_INSTRUCTION_SET_armv4t = "ARM" + +# readdir_r was deprecated in glibc-2.24. Ignore the error for now +# NOTE: When updating the recipe, please check if this is still needed +BUILD_CFLAGS_append = " -Wno-error=deprecated-declarations" +TARGET_CFLAGS_append = " -Wno-error=deprecated-declarations" + +# Enable zero mode for arm based builds, as normal hotspot fails to build +PACKAGECONFIG_append_arm = " zero" + +OPENJDK_ARCH_PORT = "jdk8u" +OPENJDK_ARCH_PORT_aarch64 = "aarch64-port" +OPENJDK_HG_U = "jdk8u" +OPENJDK_HG_URL = "http://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}" + +OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2" +OPENJDK_FILE_LOCAL = "openjdk8-${PV}-jdk8u-${OPENJDK_FILE}" +OPENJDK_URI = "${OPENJDK_HG_URL}/archive/${OPENJDK_FILE};downloadfilename=${OPENJDK_FILE_LOCAL};name=openjdk" + +HOTSPOT_FILE = "${HOTSPOT_CHANGESET}.tar.bz2" +HOTSPOT_FILE_LOCAL = "openjdk8-${PV}-hotspot-${HOTSPOT_FILE}" +HOTSPOT_URI = "${OPENJDK_HG_URL}/hotspot/archive/${HOTSPOT_FILE};downloadfilename=${HOTSPOT_FILE_LOCAL};name=hotspot;unpack=false" + +CORBA_FILE = "${CORBA_CHANGESET}.tar.bz2" +CORBA_FILE_LOCAL = "openjdk8-${PV}-corba-${CORBA_FILE}" +CORBA_URI = "${OPENJDK_HG_URL}/corba/archive/${CORBA_FILE};downloadfilename=${CORBA_FILE_LOCAL};name=corba;unpack=false" + +JAXP_FILE = "${JAXP_CHANGESET}.tar.bz2" +JAXP_FILE_LOCAL = "openjdk8-${PV}-jaxp-${JAXP_FILE}" +JAXP_URI = "${OPENJDK_HG_URL}/jaxp/archive/${JAXP_FILE};downloadfilename=${JAXP_FILE_LOCAL};name=jaxp;unpack=false" + +JAXWS_FILE = "${JAXWS_CHANGESET}.tar.bz2" +JAXWS_FILE_LOCAL = "openjdk8-${PV}-jaxws-${JAXWS_FILE}" +JAXWS_URI = "${OPENJDK_HG_URL}/jaxws/archive/${JAXWS_FILE};downloadfilename=${JAXWS_FILE_LOCAL};name=jaxws;unpack=false" + +JDK_FILE = "${JDK_CHANGESET}.tar.bz2" +JDK_FILE_LOCAL = "openjdk8-${PV}-jdk-${JDK_FILE}" +JDK_URI = "${OPENJDK_HG_URL}/jdk/archive/${JDK_FILE};downloadfilename=${JDK_FILE_LOCAL};name=jdk;unpack=false" + +LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.bz2" +LANGTOOLS_FILE_LOCAL = "openjdk8-${PV}-langtools-${LANGTOOLS_FILE}" +LANGTOOLS_URI = "${OPENJDK_HG_URL}/langtools/archive/${LANGTOOLS_FILE};downloadfilename=${LANGTOOLS_FILE_LOCAL};name=langtools;unpack=false" + +NASHORN_FILE = "${NASHORN_CHANGESET}.tar.bz2" +NASHORN_FILE_LOCAL = "openjdk8-${PV}-nashorn-${NASHORN_FILE}" +NASHORN_URI = "${OPENJDK_HG_URL}/nashorn/archive/${NASHORN_FILE};downloadfilename=${NASHORN_FILE_LOCAL};name=nashorn;unpack=false" diff --git a/recipes-core/openjdk/openjdk-8-release-172b11.inc b/recipes-core/openjdk/openjdk-8-release-172b11.inc new file mode 100644 index 0000000..fdf7b39 --- /dev/null +++ b/recipes-core/openjdk/openjdk-8-release-172b11.inc @@ -0,0 +1,36 @@ +require openjdk-8-release-172b11-common.inc + +# We do not yet work for aarch64. +COMPATIBLE_HOST = "^(?!aarch64).*" + +CORBA_CHANGESET = "875a75c440cd" +SRC_URI[corba.md5sum] = "66242dd6e749f39a5ef6add34f5ecb2f" +SRC_URI[corba.sha256sum] = "f1618be7ad88619c7d7c1eed9800c528d0646e1c9f039e20a57b3e72ae3d3512" + +HOTSPOT_CHANGESET = "32ba4d2121c1" +SRC_URI[hotspot.md5sum] = "a3e1d2f91ba8873f71e9a72043e2644a" +SRC_URI[hotspot.sha256sum] = "680b1f5100786910bfceeef90ce28d74fcf6eacfdd3b92dfc76dcf3216060e99" + +JAXP_CHANGESET = "30586bb50743" +SRC_URI[jaxp.md5sum] = "b413b1cb709d74e513f13c586215366d" +SRC_URI[jaxp.sha256sum] = "ba36dd8ad72ff3d8bda38b7d6773037e18c3c68ebadd61f1e1f7fc167a506baa" + +JAXWS_CHANGESET = "452a6a5a878e" +SRC_URI[jaxws.md5sum] = "5c3c4d1fec19398128cf818aef5486a9" +SRC_URI[jaxws.sha256sum] = "89aa34e6bc3410a85ea697aa4ae70c21f7099efdacef78a6e5a46747421e86f9" + +JDK_CHANGESET = "5ccc572f4ffe" +SRC_URI[jdk.md5sum] = "29dd4772e3862193e56007a0bb0d6886" +SRC_URI[jdk.sha256sum] = "4d1758ceec155fcd2cd786f11071ed614947a9720373d704221d78ed98beadec" + +LANGTOOLS_CHANGESET = "34ee52bc68a4" +SRC_URI[langtools.md5sum] = "b195802f2aaa5c95c06cc50021bb42a6" +SRC_URI[langtools.sha256sum] = "0403bd2c9a45e4c0dc2148907028e0cdfd087be512e6d6b3763a01411936663a" + +NASHORN_CHANGESET = "7efd6152328e" +SRC_URI[nashorn.md5sum] = "3aa4b31fdbf330baf28194e21697b8d6" +SRC_URI[nashorn.sha256sum] = "8b5cbd29e9dbace477a57d7c07a127312dd3cf6b8e648b0b64026616d12c6862" + +OPENJDK_CHANGESET = "33d274a7dda0" +SRC_URI[openjdk.md5sum] = "105f62e8f22a68b8c4151c68a447f76e" +SRC_URI[openjdk.sha256sum] = "bf49215fe1e43e6f110470c911fce32722c843e03efb68e40cc7a832eb80faea" diff --git a/recipes-core/openjdk/openjdk-8_16xbyy.bb b/recipes-core/openjdk/openjdk-8_16xbyy.bb deleted file mode 100644 index 522d6b5..0000000 --- a/recipes-core/openjdk/openjdk-8_16xbyy.bb +++ /dev/null @@ -1,63 +0,0 @@ -PV = "162b12" -PV_aarch64 = "161b15" - -require openjdk-8-release-${PV}.inc -require openjdk-8-cross.inc - -do_install() { - rm -rf ${D}${JDK_HOME} - mkdir -p ${D}${JDK_HOME} - cp -rp ${B}/images/j2sdk-image/* ${D}${JDK_HOME} - chown -R root:root ${D}${JDK_HOME} - install -m644 ${WORKDIR}/jvm.cfg ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/ - find ${D}${JDK_HOME} -name "*.debuginfo" -print0 | xargs -0 rm -} - -PACKAGES_append = " \ - ${PN}-demo \ - ${PN}-source \ -" - -FILES_${PN}_append = "\ - ${JDK_HOME}/bin/[a-z]* \ - ${JDK_HOME}/lib/[a-z]* \ - ${JDK_HOME}/jre/bin/[a-z]* \ - ${JDK_HOME}/jre/lib/[a-z]* \ - ${JDK_HOME}/LICENSE \ - ${JDK_HOME}/jre/LICENSE \ - ${JDK_HOME}/release \ -" - -FILES_${PN}-dev_append = "\ - ${JDK_HOME}/include \ -" - -FILES_${PN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample " -RDEPENDS_${PN}-demo = " ${PN} " - -FILES_${PN}-doc_append = "\ - ${JDK_HOME}/man \ - ${JDK_HOME}/ASSEMBLY_EXCEPTION \ - ${JDK_HOME}/THIRD_PARTY_README \ - ${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \ - ${JDK_HOME}/jre/THIRD_PARTY_README \ - ${JDK_HOME}/man \ -" - -FILES_${PN}-source = " ${JDK_HOME}/src.zip " - -RPROVIDES_${PN} = "java2-vm" -PROVIDES_${PN} = "java2-vm" -RPROVIDES_${PN} = "java2-runtime" -PROVIDES_${PN} = "java2-runtime" - -inherit update-alternatives - -ALTERNATIVE_PRIORITY = "100" - -ALTERNATIVE_${PN} = "java javac" -ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" -ALTERNATIVE_TARGET[java] = "${JDK_HOME}/bin/java" - -ALTERNATIVE_LINK_NAME[javac] = "${bindir}/javac" -ALTERNATIVE_TARGET[javac] = "${JDK_HOME}/bin/javac" diff --git a/recipes-core/openjdk/openjdk-8_172b11.bb b/recipes-core/openjdk/openjdk-8_172b11.bb new file mode 100644 index 0000000..9c2a7a1 --- /dev/null +++ b/recipes-core/openjdk/openjdk-8_172b11.bb @@ -0,0 +1,62 @@ +INC_FILE_SUFFIX = "" +INC_FILE_SUFFIX_aarch64 = "-aarch64" +require openjdk-8-release-${PV}${INC_FILE_SUFFIX}.inc +require openjdk-8-cross.inc + +do_install() { + rm -rf ${D}${JDK_HOME} + mkdir -p ${D}${JDK_HOME} + cp -rp ${B}/images/j2sdk-image/* ${D}${JDK_HOME} + chown -R root:root ${D}${JDK_HOME} + install -m644 ${WORKDIR}/jvm.cfg ${D}${JDK_HOME}/jre/lib/${JDK_ARCH}/ + find ${D}${JDK_HOME} -name "*.debuginfo" -print0 | xargs -0 rm +} + +PACKAGES_append = " \ + ${PN}-demo \ + ${PN}-source \ +" + +FILES_${PN}_append = "\ + ${JDK_HOME}/bin/[a-z]* \ + ${JDK_HOME}/lib/[a-z]* \ + ${JDK_HOME}/jre/bin/[a-z]* \ + ${JDK_HOME}/jre/lib/[a-z]* \ + ${JDK_HOME}/LICENSE \ + ${JDK_HOME}/jre/LICENSE \ + ${JDK_HOME}/release \ +" + +FILES_${PN}-dev_append = "\ + ${JDK_HOME}/include \ +" + +FILES_${PN}-demo = " ${JDK_HOME}/demo ${JDK_HOME}/sample " +RDEPENDS_${PN}-demo = " ${PN} " + +FILES_${PN}-doc_append = "\ + ${JDK_HOME}/man \ + ${JDK_HOME}/ASSEMBLY_EXCEPTION \ + ${JDK_HOME}/THIRD_PARTY_README \ + ${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \ + ${JDK_HOME}/jre/THIRD_PARTY_README \ + ${JDK_HOME}/man \ +" + +FILES_${PN}-source = " ${JDK_HOME}/src.zip " + +RPROVIDES_${PN} = "java2-vm" +PROVIDES_${PN} = "java2-vm" +RPROVIDES_${PN} = "java2-runtime" +PROVIDES_${PN} = "java2-runtime" + +inherit update-alternatives + +ALTERNATIVE_PRIORITY = "100" + +ALTERNATIVE_${PN} = "java javac" +ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" +ALTERNATIVE_TARGET[java] = "${JDK_HOME}/bin/java" + +ALTERNATIVE_LINK_NAME[javac] = "${bindir}/javac" +ALTERNATIVE_TARGET[javac] = "${JDK_HOME}/bin/javac" diff --git a/recipes-core/openjdk/openjre-8_16xbyy.bb b/recipes-core/openjdk/openjre-8_16xbyy.bb deleted file mode 100644 index e6454ea..0000000 --- a/recipes-core/openjdk/openjre-8_16xbyy.bb +++ /dev/null @@ -1,47 +0,0 @@ -PV = "162b12" -PV_aarch64 = "161b15" - -require openjdk-8-release-${PV}.inc -require openjdk-8-cross.inc - -do_install() { - rm -rf ${D}${JRE_HOME} - mkdir -p ${D}${JRE_HOME} - cp -rp ${B}/images/j2re-image/* ${D}${JRE_HOME} - chown -R root:root ${D}${JRE_HOME} - install -m644 ${WORKDIR}/jvm.cfg ${D}${JRE_HOME}/lib/${JDK_ARCH}/ - find ${D}${JRE_HOME} -name "*.debuginfo" -print0 | xargs -0 rm -} - -FILES_${PN}_append = "\ - ${JRE_HOME}/bin/[a-z]* \ - ${JRE_HOME}/lib/[a-z]* \ - ${JRE_HOME}/LICENSE \ - ${JRE_HOME}/release \ -" - -FILES_${PN}-dbg_append = "\ - ${JRE_HOME}/bin/.debug/ \ - ${JRE_HOME}/lib/.debug/ \ - ${JRE_HOME}/lib/${JDK_ARCH}/.debug/ \ - ${JRE_HOME}/lib/${JDK_ARCH}/jli/.debug/ \ - ${JRE_HOME}/lib/${JDK_ARCH}/server/.debug/ \ -" - -FILES_${PN}-doc_append = "\ - ${JRE_HOME}/man \ - ${JRE_HOME}/ASSEMBLY_EXCEPTION \ - ${JRE_HOME}/THIRD_PARTY_README \ -" - -RPROVIDES_${PN} = "java2-vm" -PROVIDES_${PN} = "java2-vm" -RPROVIDES_${PN} = "java2-runtime" -PROVIDES_${PN} = "java2-runtime" - -inherit update-alternatives - -ALTERNATIVE_${PN} = "java" -ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" -ALTERNATIVE_TARGET[java] = "${JRE_HOME}/bin/java" -ALTERNATIVE_PRIORITY[java] = "100" diff --git a/recipes-core/openjdk/openjre-8_172b11.bb b/recipes-core/openjdk/openjre-8_172b11.bb new file mode 100644 index 0000000..220dc01 --- /dev/null +++ b/recipes-core/openjdk/openjre-8_172b11.bb @@ -0,0 +1,46 @@ +INC_FILE_SUFFIX = "" +INC_FILE_SUFFIX_aarch64 = "-aarch64" +require openjdk-8-release-${PV}${INC_FILE_SUFFIX}.inc +require openjdk-8-cross.inc + +do_install() { + rm -rf ${D}${JRE_HOME} + mkdir -p ${D}${JRE_HOME} + cp -rp ${B}/images/j2re-image/* ${D}${JRE_HOME} + chown -R root:root ${D}${JRE_HOME} + install -m644 ${WORKDIR}/jvm.cfg ${D}${JRE_HOME}/lib/${JDK_ARCH}/ + find ${D}${JRE_HOME} -name "*.debuginfo" -print0 | xargs -0 rm +} + +FILES_${PN}_append = "\ + ${JRE_HOME}/bin/[a-z]* \ + ${JRE_HOME}/lib/[a-z]* \ + ${JRE_HOME}/LICENSE \ + ${JRE_HOME}/release \ +" + +FILES_${PN}-dbg_append = "\ + ${JRE_HOME}/bin/.debug/ \ + ${JRE_HOME}/lib/.debug/ \ + ${JRE_HOME}/lib/${JDK_ARCH}/.debug/ \ + ${JRE_HOME}/lib/${JDK_ARCH}/jli/.debug/ \ + ${JRE_HOME}/lib/${JDK_ARCH}/server/.debug/ \ +" + +FILES_${PN}-doc_append = "\ + ${JRE_HOME}/man \ + ${JRE_HOME}/ASSEMBLY_EXCEPTION \ + ${JRE_HOME}/THIRD_PARTY_README \ +" + +RPROVIDES_${PN} = "java2-vm" +PROVIDES_${PN} = "java2-vm" +RPROVIDES_${PN} = "java2-runtime" +PROVIDES_${PN} = "java2-runtime" + +inherit update-alternatives + +ALTERNATIVE_${PN} = "java" +ALTERNATIVE_LINK_NAME[java] = "${bindir}/java" +ALTERNATIVE_TARGET[java] = "${JRE_HOME}/bin/java" +ALTERNATIVE_PRIORITY[java] = "100" -- cgit v1.2.3-54-g00ecf