Accepting request 866735 from Java:Factory

Oracle January 2021 CPU

OBS-URL: https://build.opensuse.org/request/show/866735
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/java-1_8_0-openj9?expand=0&rev=6

0394ef7545243942a4b27227a22174c1be67ed60.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1acd0b760017d08d9f6694aa4c22aade6a313c86c9130529990aca8a59d23f52
-size 26632201

345e1b09e2a1f2cf6323b25edc901cce197f4365.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36833bb67f51baadd801e53c599ecf8e8c6f3c6ff80015586921bb60c3769769
+size 26833967

41f03341d596924e866595d8c94ab3bff33066a4.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:48a0244ded895e22bd1fc9f6c4571f30af279a83fc752acbc17698dfed94218e
-size 124676997

582366ae54510a48f7815921091db00357c4338a.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:239797fcd77ea53151537b993975dcb3c7a8cd791b5b8f81fb9d77ea36208b16
-size 10827012

741e94ea8673b021fc7edc59a2ec8bd203fa2b03.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5420ebe7fc3c0d28241afeec620c35dd77ca85264cf2ecf7c802c55b566198f9
+size 10811199

ab07c6a8fd534eb77c4946e4546e659f8f043b8b.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e3eff834139be151576bc3257e1835faf5dd0178b5b1ed0bad0a70916b5679a8
+size 125901812

java-1_8_0-openj9.changes

@@ -1,7 +1,20 @@
+-------------------------------------------------------------------
+Tue Jan 26 07:28:09 UTC 2021 - Fridrich Strba <fstrba@suse.com>
+
+- Update to OpenJDK 8u282 build 08 with OpenJ9 0.24.0 virtual
+  machine
+  * including Oracle January 2021 CPU changes (bsc#1181239)
+  * OpenJ9 changes, see
+    https://www.eclipse.org/openj9/docs/version0.24
+- Modified template patch:
+  * openj9-nogit.patch.in
+    + replace git runs by pre-fetched git hashes in new places
+    + remove hunks that are irrelevant in new sources
+
 -------------------------------------------------------------------
 Mon Nov  2 09:07:50 UTC 2020 - Fridrich Strba <fstrba@suse.com>
 
-- Update to OpenJDK 8u2732 build 10 with OpenJ9 0.23.0 virtual
+- Update to OpenJDK 8u272 build 10 with OpenJ9 0.23.0 virtual
   machine
   * including Oracle July 2020 CPU changes (bsc#1174157) and
     October 2020 CPU changes (bsc#1177943)

java-1_8_0-openj9.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package java-1_8_0-openj9
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,18 +25,18 @@
 %global abs2rel perl -e %{script}
 %global syslibdir       %{_libdir}
 # Standard JPackage naming and versioning defines.
-%global updatever       272
+%global updatever       282
-%global buildver        b10
+%global buildver        b08
 %global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk8/archive
-%global root_revision   41f03341d596924e866595d8c94ab3bff33066a4
+%global root_revision   ab07c6a8fd534eb77c4946e4546e659f8f043b8b
-%global root_branch     openj9-0.23.0
+%global root_branch     openj9-0.24.0
 %global omr_repository  https://github.com/eclipse/openj9-omr/archive
-%global omr_revision    582366ae54510a48f7815921091db00357c4338a
+%global omr_revision    741e94ea8673b021fc7edc59a2ec8bd203fa2b03
-%global omr_branch      v0.23.0-release
+%global omr_branch      v0.24.0-release
 %global openj9_repository https://github.com/eclipse/openj9/archive
-%global openj9_revision 0394ef7545243942a4b27227a22174c1be67ed60
+%global openj9_revision 345e1b09e2a1f2cf6323b25edc901cce197f4365
-%global openj9_branch   v0.23.0-release
+%global openj9_branch   v0.24.0-release
-%global openj9_tag      openj9-0.23.0
+%global openj9_tag      openj9-0.24.0
 %global icedtea_sound_version 1.0.1
 %global freemarker_version 2.3.29
 # priority must be 6 digits in total

openj9-nogit.patch.in

@@ -1,9 +1,17 @@
---- a/closed/OpenJ9.gmk	2020-01-23 11:32:56.700658325 +0100
+diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk
-+++ b/closed/OpenJ9.gmk	2020-01-23 23:25:54.764578248 +0100
+index 27dcc77dd3..163077bb7d 100644
-@@ -29,15 +29,15 @@
+--- a/closed/OpenJ9.gmk
++++ b/closed/OpenJ9.gmk
+@@ -30,20 +30,20 @@ ifeq (,$(BUILD_ID))
    BUILD_ID := 000000
  endif
  
+-OPENJDK_SHA := $(shell git -C $(TOPDIR) rev-parse --short HEAD)
++OPENJDK_SHA := @OPENJDK_SHA@
+ ifeq (,$(OPENJDK_SHA))
+   $(error Could not determine OpenJDK SHA)
+ endif
+ 
 -OPENJ9_SHA := $(shell git -C $(OPENJ9_TOPDIR) rev-parse --short HEAD)
 +OPENJ9_SHA := @OPENJ9_SHA@
  ifeq (,$(OPENJ9_SHA))
@@ -19,7 +27,7 @@
    ifeq (,$(OPENJ9_BRANCH))
      $(error Could not determine OpenJ9 branch)
    endif
-@@ -46,7 +46,7 @@
+@@ -52,7 +52,7 @@ else
    OPENJ9_VERSION_STRING := $(OPENJ9_TAG)
  endif
  
@@ -28,14 +36,20 @@
  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
+diff --git a/closed/make/Main.gmk b/closed/make/Main.gmk
-+++ b/jdk/make/closed/autoconf/custom-hook.m4	2020-01-23 23:30:36.802221424 +0100
+index ab2310f3b0..1c7386d939 100644
-@@ -368,7 +368,7 @@
+--- a/closed/make/Main.gmk
-   AC_SUBST(JDK_MOD_VERSION)
++++ b/closed/make/Main.gmk
-   AC_SUBST(JDK_FIX_VERSION)
+@@ -35,9 +35,9 @@ clean-j9vm :
- 
+ # Override definition from MakeBase.gmk for OpenJ9.
--  OPENJDK_SHA=`git -C $SRC_ROOT rev-parse --short HEAD`
+ define GetSourceTips
-+  OPENJDK_SHA=@OPENJDK_SHA@
+ 	$(PRINTF) "%s:%s\n" \
- 
+-		OpenJDK "$(shell git -C $(TOPDIR) rev-parse --short HEAD)" \
-   AC_SUBST(OPENJDK_SHA)
+-		OpenJ9  "$(shell git -C $(OPENJ9_TOPDIR) rev-parse --short HEAD)" \
+-		OMR     "$(shell git -C $(OPENJ9OMR_TOPDIR) rev-parse --short HEAD)" \
++		OpenJDK "@OPENJDK_SHA@" \
++		OpenJ9  "@OPENJ9_SHA@" \
++		OMR     "@OPENJ9OMR_SHA@" \
+ 		> $@
+ endef