rpm/java-1_8_0-openj9
SHA256
1
0
Fork 0
forked from pool/java-1_8_0-openj9
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:Factory/java-1_8_0-openj9?expand=0&rev=72

Browse Source
This commit is contained in:
Fridrich Strba 2022-05-09 16:15:15 +00:00 committed by Git OBS Bridge
parent 7b5c86cb96
commit 592d8978c3
8 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
0b8b8af39a5f1f2fe0629050343adeed2f48bfd7.zip Normal file
View File

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

3
9a84ec34ed321967cdbe67b29ddcd732b591d051.zip Normal file
View File

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

3
9dccbe076db9055f4020bae78513f52c02572ba4.zip
View File

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

3
ab24b6666596140516d3f240486aa1c84a726775.zip Normal file
View File

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

3
c1d9a7af7c130f57867717a12ee9dfdbad4ecc10.zip
View File

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

3
dac962a283adbd3508fa1af3ae892e10903f0ef1.zip
View File

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

16
java-1_8_0-openj9.spec
View File

@ -27,17 +27,17 @@
%global syslibdir %{_libdir}
# Standard JPackage naming and versioning defines.
%global updatever 322
%global buildver b04
%global buildver b09
%global root_repository https://github.com/ibmruntimes/openj9-openjdk-jdk8/archive
%global root_revision c1d9a7af7c130f57867717a12ee9dfdbad4ecc10
%global root_branch v0.30.0-release
%global root_revision 0b8b8af39a5f1f2fe0629050343adeed2f48bfd7
%global root_branch v0.32.0-release
%global omr_repository https://github.com/eclipse/openj9-omr/archive
%global omr_revision dac962a283adbd3508fa1af3ae892e10903f0ef1
%global omr_branch v0.30.0-release
%global omr_revision ab24b6666596140516d3f240486aa1c84a726775
%global omr_branch v0.32.0-release
%global openj9_repository https://github.com/eclipse/openj9/archive
%global openj9_revision 9dccbe076db9055f4020bae78513f52c02572ba4
%global openj9_branch v0.30.0-release
%global openj9_tag openj9-0.30.0
%global openj9_revision 9a84ec34ed321967cdbe67b29ddcd732b591d051
%global openj9_branch v0.32.0-release
%global openj9_tag openj9-0.32.0
%global freemarker_version 2.3.29
# priority must be 6 digits in total
%global priority 1801

22
openj9-nogit.patch.in
View File

@ -1,52 +1,52 @@
diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk
index 27dcc77dd3..163077bb7d 100644
index 0fc7435813..b461bbcbe0 100644
--- 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 := $(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 := $(shell $(GIT) -C $(OPENJ9_TOPDIR) rev-parse --short HEAD)
+OPENJ9_SHA := @OPENJ9_SHA@
ifeq (,$(OPENJ9_SHA))
$(error Could not determine OpenJ9 SHA)
endif
# Find OpenJ9 tag associated with current commit (suppressing stderr in case there is no such tag).
-OPENJ9_TAG := $(shell git -C $(OPENJ9_TOPDIR) describe --exact-match HEAD 2>/dev/null)
-OPENJ9_TAG := $(shell $(GIT) -C $(OPENJ9_TOPDIR) describe --exact-match HEAD 2>/dev/null)
+OPENJ9_TAG := @OPENJ9_TAG@
ifeq (,$(OPENJ9_TAG))
- OPENJ9_BRANCH := $(shell git -C $(OPENJ9_TOPDIR) rev-parse --abbrev-ref HEAD)
- OPENJ9_BRANCH := $(shell $(GIT) -C $(OPENJ9_TOPDIR) rev-parse --abbrev-ref HEAD)
+ OPENJ9_BRANCH := @OPENJ9_BRANCH@
ifeq (,$(OPENJ9_BRANCH))
$(error Could not determine OpenJ9 branch)
endif
@@ -52,7 +52,7 @@ else
@@ -52,7 +51,7 @@ else
OPENJ9_VERSION_STRING := $(OPENJ9_TAG)
endif
-OPENJ9OMR_SHA := $(shell git -C $(OPENJ9OMR_TOPDIR) rev-parse --short HEAD)
-OPENJ9OMR_SHA := $(shell $(GIT) -C $(OPENJ9OMR_TOPDIR) rev-parse --short HEAD)
+OPENJ9OMR_SHA := @OPENJ9OMR_SHA@
ifeq (,$(OPENJ9OMR_SHA))
$(error Could not determine OMR SHA)
endif
diff --git a/closed/make/Main.gmk b/closed/make/Main.gmk
index ab2310f3b0..1c7386d939 100644
index d73fff3230..d17eea56b8 100644
--- a/closed/make/Main.gmk
+++ b/closed/make/Main.gmk
@@ -35,9 +35,9 @@ clean-j9vm :
# Override definition from MakeBase.gmk for OpenJ9.
define GetSourceTips
$(PRINTF) "%s:%s\n" \
- OpenJDK "$(shell git -C $(TOPDIR) rev-parse --short HEAD)" \
- OpenJ9 "$(shell git -C $(OPENJ9_TOPDIR) rev-parse --short HEAD)" \
- OMR "$(shell git -C $(OPENJ9OMR_TOPDIR) rev-parse --short HEAD)" \
- OpenJDK "$(shell $(GIT) -C $(TOPDIR) rev-parse --short HEAD)" \
- 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@" \