diff --git a/0033b2fea25a2034ee064bffcb01fad1863fda5d.zip b/0033b2fea25a2034ee064bffcb01fad1863fda5d.zip deleted file mode 100644 index 7e1e96d..0000000 --- a/0033b2fea25a2034ee064bffcb01fad1863fda5d.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ff125a90f7285cc96e7a36543efdcaca94108bdd17819bd8ebe744ba69a9bf7 -size 121420076 diff --git a/51a5857d24eca5e220ccd932bc98e9f1d0438e71.zip b/51a5857d24eca5e220ccd932bc98e9f1d0438e71.zip new file mode 100644 index 0000000..b6a4a32 --- /dev/null +++ b/51a5857d24eca5e220ccd932bc98e9f1d0438e71.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48df1369bcbd90c5ffaa8708465edb4e7b6f3f4504edb58143cee093f16caea6 +size 26391115 diff --git a/6968c18d74cedfde4406ac680b869f14d4ba2ed2.zip b/6968c18d74cedfde4406ac680b869f14d4ba2ed2.zip deleted file mode 100644 index 2b910a7..0000000 --- a/6968c18d74cedfde4406ac680b869f14d4ba2ed2.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74203efa15f569c2c437ef0c2855954ab8b928f2b97abe3c0373cfa6df3f9b81 -size 26391010 diff --git a/8cf8a305812fe1f710d79d215f17bff241a6c4d6.zip b/8cf8a305812fe1f710d79d215f17bff241a6c4d6.zip new file mode 100644 index 0000000..6769484 --- /dev/null +++ b/8cf8a305812fe1f710d79d215f17bff241a6c4d6.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:259673f2a06e4506085c93d9aeeb89b54eb893bac8286ea5399e2b2d7c85dc67 +size 121420078 diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec index d85f3b4..4000f27 100644 --- a/java-1_8_0-openj9.spec +++ b/java-1_8_0-openj9.spec @@ -28,15 +28,15 @@ %global updatever 242 %global buildver b08 %global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk8/archive -%global root_revision 0033b2fea25a2034ee064bffcb01fad1863fda5d +%global root_revision 8cf8a305812fe1f710d79d215f17bff241a6c4d6 %global root_branch openj9-0.18.0 %global omr_repository https://github.com/eclipse/openj9-omr/archive %global omr_revision 7a1b0239a91f9d8819cb541812b4d774edd5bba4 %global omr_branch v0.18.0-release %global openj9_repository https://github.com/eclipse/openj9/archive -%global openj9_revision 6968c18d74cedfde4406ac680b869f14d4ba2ed2 -%global openj9_branch v0.18.0-release -%global openj9_tag openj9-0.18.0 +%global openj9_revision 51a5857d24eca5e220ccd932bc98e9f1d0438e71 +%global openj9_branch v0.18.1-release +%global openj9_tag openj9-0.18.1 %global icedtea_sound_version 1.0.1 # priority must be 6 digits in total %global priority 1801 diff --git a/openj9-nogit.patch.in b/openj9-nogit.patch.in index fb80082..089254f 100644 --- a/openj9-nogit.patch.in +++ b/openj9-nogit.patch.in @@ -1,5 +1,5 @@ --- a/closed/OpenJ9.gmk 2020-01-23 11:32:56.700658325 +0100 -+++ b/closed/OpenJ9.gmk 2020-01-23 11:48:34.737730143 +0100 ++++ b/closed/OpenJ9.gmk 2020-01-23 23:25:54.764578248 +0100 @@ -29,15 +29,15 @@ BUILD_ID := 000000 endif @@ -28,3 +28,14 @@ ifeq (,$(OPENJ9OMR_SHA)) $(error Could not determine OMR SHA) endif +--- a/jdk/make/closed/autoconf/custom-hook.m4 2020-01-23 11:32:57.428662256 +0100 ++++ b/jdk/make/closed/autoconf/custom-hook.m4 2020-01-23 23:30:36.802221424 +0100 +@@ -368,7 +368,7 @@ + AC_SUBST(JDK_MOD_VERSION) + AC_SUBST(JDK_FIX_VERSION) + +- OPENJDK_SHA=`git -C $SRC_ROOT rev-parse --short HEAD` ++ OPENJDK_SHA=@OPENJDK_SHA@ + + AC_SUBST(OPENJDK_SHA) +