Import java-21-openjdk
Related: RHEL-100678
This commit is contained in:
Andrew Hughes
parent
04a1d201bf
commit
9ef1b1ef0d
40
.gitignore
vendored
40
.gitignore
vendored
@ -0,0 +1,40 @@
|
|||||||
|
/openjdk-jdk17u-jdk-17.0.7+7.tar.xz
|
||||||
|
/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
|
||||||
|
/openjdk-jdk18u-jdk-18.0.1+0.tar.xz
|
||||||
|
/openjdk-jdk18u-jdk-18.0.1+10.tar.xz
|
||||||
|
/openjdk-jdk18u-jdk-18.0.1.1+2.tar.xz
|
||||||
|
/openjdk-jdk18u-jdk-18.0.2+9.tar.xz
|
||||||
|
/openjdk-jdk19u-jdk-19+36.tar.xz
|
||||||
|
/openjdk-jdk19u-jdk-19.0.1+10.tar.xz
|
||||||
|
/openjdk-jdk19u-jdk-19.0.2+7.tar.xz
|
||||||
|
/openjdk-jdk20u-jdk-20+36.tar.xz
|
||||||
|
/openjdk-jdk20u-jdk-20.0.1+9.tar.xz
|
||||||
|
/openjdk-jdk20u-jdk-20.0.2+9.tar.xz
|
||||||
|
/openjdk-jdk21u-jdk-21+35.tar.xz
|
||||||
|
/openjdk-21.0.1+12.tar.xz
|
||||||
|
/openjdk-21.0.2+11.tar.xz
|
||||||
|
/openjdk-21.0.2+12.tar.xz
|
||||||
|
/openjdk-21.0.2+13.tar.xz
|
||||||
|
/openjdk-21.0.3+1-ea.tar.xz
|
||||||
|
/openjdk-21.0.3+7-ea.tar.xz
|
||||||
|
/openjdk-21.0.3+9.tar.xz
|
||||||
|
/openjdk-21.0.4+1-ea.tar.xz
|
||||||
|
/openjdk-21.0.4+5-ea.tar.xz
|
||||||
|
/openjdk-21.0.4+7.tar.xz
|
||||||
|
/openjdk-21.0.5+1-ea.tar.xz
|
||||||
|
/openjdk-21.0.5+5-ea.tar.xz
|
||||||
|
/openjdk-21.0.5+9-ea.tar.xz
|
||||||
|
/openjdk-21.0.5+10.tar.xz
|
||||||
|
/openjdk-21.0.5+11.tar.xz
|
||||||
|
/openjdk-21.0.6+6-ea.tar.xz
|
||||||
|
/openjdk-21.0.6+7.tar.xz
|
||||||
|
/openjdk-21.0.7+1-ea.tar.xz
|
||||||
|
/openjdk-21.0.7+2-ea.tar.xz
|
||||||
|
/openjdk-21.0.7+3-ea.tar.xz
|
||||||
|
/openjdk-21.0.7+4-ea.tar.xz
|
||||||
|
/openjdk-21.0.7+5-ea.tar.xz
|
||||||
|
/openjdk-21.0.7+6.tar.xz
|
||||||
|
/openjdk-21.0.8+1-ea.tar.xz
|
||||||
|
/openjdk-21.0.8+2-ea.tar.xz
|
||||||
|
/openjdk-21.0.8+8-ea.tar.xz
|
||||||
|
/openjdk-21.0.8+9.tar.xz
|
||||||
54
0001-Allow-devkit-to-work-with-RHEL.patch
Normal file
54
0001-Allow-devkit-to-work-with-RHEL.patch
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
From 7733d625ebdea5a6f323a0c5944fb8ab728d1b2b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andrew Hughes <gnu.andrew@redhat.com>
|
||||||
|
Date: Sat, 25 Nov 2023 17:29:36 +0000
|
||||||
|
Subject: [PATCH] Allow devkit to work with RHEL
|
||||||
|
|
||||||
|
---
|
||||||
|
make/devkit/Makefile | 2 +-
|
||||||
|
make/devkit/Tools.gmk | 10 +++++++++-
|
||||||
|
2 files changed, 10 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/make/devkit/Makefile b/make/devkit/Makefile
|
||||||
|
index c85a7c21d29..8f69d23c325 100644
|
||||||
|
--- a/make/devkit/Makefile
|
||||||
|
+++ b/make/devkit/Makefile
|
||||||
|
@@ -58,7 +58,7 @@
|
||||||
|
COMMA := ,
|
||||||
|
|
||||||
|
os := $(shell uname -o)
|
||||||
|
-cpu := $(shell uname -p)
|
||||||
|
+cpu := $(shell uname -m)
|
||||||
|
|
||||||
|
# Figure out what platform this is building on.
|
||||||
|
me := $(cpu)-$(if $(findstring Linux,$(os)),linux-gnu)
|
||||||
|
diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
|
||||||
|
index 187320ca26e..001f4b1870c 100644
|
||||||
|
--- a/make/devkit/Tools.gmk
|
||||||
|
+++ b/make/devkit/Tools.gmk
|
||||||
|
@@ -62,6 +62,14 @@ ifeq ($(BASE_OS), OL)
|
||||||
|
BASE_URL := http://yum.oracle.com/repo/OracleLinux/OL6/4/base/$(ARCH)/
|
||||||
|
LINUX_VERSION := OL6.4
|
||||||
|
endif
|
||||||
|
+else ifeq ($(BASE_OS), RHEL)
|
||||||
|
+ ifeq ($(ARCH), aarch64)
|
||||||
|
+ BASE_URL := https://download.eng.brq.redhat.com/rhel-7/rel-eng/RHEL-7/latest-RHEL-ALT-7/compose/Server/$(ARCH)/os/Packages/
|
||||||
|
+ LINUX_VERSION := RHEL7.6
|
||||||
|
+ else
|
||||||
|
+ BASE_URL := https://download.eng.brq.redhat.com/rhel-7/rel-eng/RHEL-7/latest-RHEL-7/compose/Server/$(ARCH)/os/Packages/
|
||||||
|
+ LINUX_VERSION := RHEL7.9
|
||||||
|
+ endif
|
||||||
|
else ifeq ($(BASE_OS), Fedora)
|
||||||
|
ifeq ($(ARCH), riscv64)
|
||||||
|
DEFAULT_OS_VERSION := rawhide/68692
|
||||||
|
@@ -246,7 +254,7 @@ download-rpms:
|
||||||
|
# Only run this if rpm dir is empty.
|
||||||
|
ifeq ($(wildcard $(DOWNLOAD_RPMS)/*.rpm), )
|
||||||
|
cd $(DOWNLOAD_RPMS) && \
|
||||||
|
- wget -r -np -nd $(patsubst %, -A "*%*.rpm", $(RPM_LIST)) $(BASE_URL)
|
||||||
|
+ wget -r -e robots=off -np -nd $(patsubst %, -A "*%*.rpm", $(RPM_LIST)) $(BASE_URL)
|
||||||
|
endif
|
||||||
|
|
||||||
|
##########################################################################################
|
||||||
|
--
|
||||||
|
2.45.2
|
||||||
|
|
||||||
50
0002-Disable-multilib-on-x86_64.patch
Normal file
50
0002-Disable-multilib-on-x86_64.patch
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
From e55afc691c0105623e04a6e76369cf1438afb874 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andrew Hughes <gnu.andrew@redhat.com>
|
||||||
|
Date: Fri, 8 Dec 2023 21:22:02 +0000
|
||||||
|
Subject: [PATCH] Disable multilib on x86_64
|
||||||
|
|
||||||
|
---
|
||||||
|
make/devkit/Tools.gmk | 13 +++----------
|
||||||
|
1 file changed, 3 insertions(+), 10 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
|
||||||
|
index 001f4b1870c..9ede781413d 100644
|
||||||
|
--- a/make/devkit/Tools.gmk
|
||||||
|
+++ b/make/devkit/Tools.gmk
|
||||||
|
@@ -225,13 +225,7 @@ RPM_LIST := \
|
||||||
|
##########################################################################################
|
||||||
|
# Define common directories and files
|
||||||
|
|
||||||
|
-# Ensure we have 32-bit libs also for x64. We enable mixed-mode.
|
||||||
|
-ifeq (x86_64,$(ARCH))
|
||||||
|
- LIBDIRS := lib64 lib
|
||||||
|
- CFLAGS_lib := -m32
|
||||||
|
-else
|
||||||
|
- LIBDIRS := lib
|
||||||
|
-endif
|
||||||
|
+LIBDIRS := lib
|
||||||
|
|
||||||
|
# Define directories
|
||||||
|
BUILDDIR := $(OUTPUT_ROOT)/$(HOST)/$(TARGET)
|
||||||
|
@@ -289,8 +283,7 @@ $(foreach p,GCC BINUTILS CCACHE MPFR GMP MPC GDB,$(eval $(call Download,$(p))))
|
||||||
|
|
||||||
|
RPM_ARCHS := $(ARCH) noarch
|
||||||
|
ifeq ($(ARCH),x86_64)
|
||||||
|
- # Enable mixed mode.
|
||||||
|
- RPM_ARCHS += i386 i686
|
||||||
|
+ RPM_ARCHS += i686
|
||||||
|
else ifeq ($(ARCH),i686)
|
||||||
|
RPM_ARCHS += i386
|
||||||
|
else ifeq ($(ARCH), armhfp)
|
||||||
|
@@ -526,7 +519,7 @@ ifeq ($(ARCH), armhfp)
|
||||||
|
$(BUILDDIR)/$(gcc_ver)/Makefile : CONFIG += --with-float=hard
|
||||||
|
endif
|
||||||
|
|
||||||
|
-ifneq ($(filter riscv64 ppc64 ppc64le s390x, $(ARCH)), )
|
||||||
|
+ifneq ($(filter riscv64 ppc64 ppc64le s390x x86_64, $(ARCH)), )
|
||||||
|
# We only support 64-bit on these platforms anyway
|
||||||
|
CONFIG += --disable-multilib
|
||||||
|
endif
|
||||||
|
--
|
||||||
|
2.45.2
|
||||||
|
|
||||||
92
0003-Log-devkit-build-to-stdout.patch
Normal file
92
0003-Log-devkit-build-to-stdout.patch
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
From fbc27183b35df7778cf106450b144474f8e2a35c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andrew Hughes <gnu.andrew@redhat.com>
|
||||||
|
Date: Wed, 30 Oct 2024 00:42:06 +0000
|
||||||
|
Subject: [PATCH] Log devkit build to stdout
|
||||||
|
|
||||||
|
Resolves: OPENJDK-3071
|
||||||
|
---
|
||||||
|
make/devkit/Tools.gmk | 18 +++++++++---------
|
||||||
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
|
||||||
|
index 9ede781413d..b6f895f5a25 100644
|
||||||
|
--- a/make/devkit/Tools.gmk
|
||||||
|
+++ b/make/devkit/Tools.gmk
|
||||||
|
@@ -458,7 +458,7 @@ $(BUILDDIR)/$(binutils_ver)/Makefile \
|
||||||
|
--enable-multilib \
|
||||||
|
--enable-threads \
|
||||||
|
--enable-plugins \
|
||||||
|
- ) > $(@D)/log.config 2>&1
|
||||||
|
+ ) 2>&1 | tee $(@D)/log.config
|
||||||
|
@echo 'done'
|
||||||
|
|
||||||
|
$(BUILDDIR)/$(mpfr_ver)/Makefile \
|
||||||
|
@@ -473,7 +473,7 @@ $(BUILDDIR)/$(mpfr_ver)/Makefile \
|
||||||
|
--program-prefix=$(TARGET)- \
|
||||||
|
--enable-shared=no \
|
||||||
|
--with-gmp=$(PREFIX) \
|
||||||
|
- ) > $(@D)/log.config 2>&1
|
||||||
|
+ ) 2>&1 | tee $(@D)/log.config
|
||||||
|
@echo 'done'
|
||||||
|
|
||||||
|
$(BUILDDIR)/$(gmp_ver)/Makefile \
|
||||||
|
@@ -490,7 +490,7 @@ $(BUILDDIR)/$(gmp_ver)/Makefile \
|
||||||
|
--program-prefix=$(TARGET)- \
|
||||||
|
--enable-shared=no \
|
||||||
|
--with-mpfr=$(PREFIX) \
|
||||||
|
- ) > $(@D)/log.config 2>&1
|
||||||
|
+ ) 2>&1 | tee $(@D)/log.config
|
||||||
|
@echo 'done'
|
||||||
|
|
||||||
|
$(BUILDDIR)/$(mpc_ver)/Makefile \
|
||||||
|
@@ -506,7 +506,7 @@ $(BUILDDIR)/$(mpc_ver)/Makefile \
|
||||||
|
--enable-shared=no \
|
||||||
|
--with-mpfr=$(PREFIX) \
|
||||||
|
--with-gmp=$(PREFIX) \
|
||||||
|
- ) > $(@D)/log.config 2>&1
|
||||||
|
+ ) 2>&1 | tee $(@D)/log.config
|
||||||
|
@echo 'done'
|
||||||
|
|
||||||
|
# Only valid if glibc target -> linux
|
||||||
|
@@ -549,7 +549,7 @@ $(BUILDDIR)/$(gcc_ver)/Makefile \
|
||||||
|
--with-mpfr=$(PREFIX) \
|
||||||
|
--with-gmp=$(PREFIX) \
|
||||||
|
--with-mpc=$(PREFIX) \
|
||||||
|
- ) > $(@D)/log.config 2>&1
|
||||||
|
+ ) 2>&1 | tee $(@D)/log.config
|
||||||
|
@echo 'done'
|
||||||
|
|
||||||
|
# need binutils for gcc
|
||||||
|
@@ -571,7 +571,7 @@ ifeq ($(HOST), $(TARGET))
|
||||||
|
$(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" $(GDB_CFG) \
|
||||||
|
$(CONFIG) \
|
||||||
|
--with-sysroot=$(SYSROOT) \
|
||||||
|
- ) > $(@D)/log.config 2>&1
|
||||||
|
+ ) 2>&1 | tee $(@D)/log.config
|
||||||
|
@echo 'done'
|
||||||
|
|
||||||
|
$(gdb): $(gcc)
|
||||||
|
@@ -593,7 +593,7 @@ $(BUILDDIR)/$(ccache_ver)/Makefile \
|
||||||
|
cd $(@D) ; \
|
||||||
|
$(PATHPRE) $(ENVS) $(CCACHE_CFG) \
|
||||||
|
$(CONFIG) \
|
||||||
|
- ) > $(@D)/log.config 2>&1
|
||||||
|
+ ) 2>&1 | tee $(@D)/log.config
|
||||||
|
@echo 'done'
|
||||||
|
|
||||||
|
gccpatch = $(TARGETDIR)/gcc-patched
|
||||||
|
@@ -641,9 +641,9 @@ endif
|
||||||
|
# Always need to build cross tools for build host self.
|
||||||
|
$(TARGETDIR)/%.done : $(BUILDDIR)/%/Makefile
|
||||||
|
$(info Building $(basename $@). Log in $(<D)/log.build)
|
||||||
|
- $(PATHPRE) $(ENVS) $(MAKE) $(BUILDPAR) -f $< -C $(<D) $(MAKECMD) $(MAKECMD.$(notdir $@)) > $(<D)/log.build 2>&1
|
||||||
|
+ $(PATHPRE) $(ENVS) $(MAKE) $(BUILDPAR) -f $< -C $(<D) $(MAKECMD) $(MAKECMD.$(notdir $@)) 2>&1 | tee $(<D)/log.build
|
||||||
|
@echo -n 'installing...'
|
||||||
|
- $(PATHPRE) $(MAKE) $(INSTALLPAR) -f $< -C $(<D) $(INSTALLCMD) $(MAKECMD.$(notdir $@)) > $(<D)/log.install 2>&1
|
||||||
|
+ $(PATHPRE) $(MAKE) $(INSTALLPAR) -f $< -C $(<D) $(INSTALLCMD) $(MAKECMD.$(notdir $@)) 2>&1 | tee $(<D)/log.install
|
||||||
|
@mkdir -p $(@D)
|
||||||
|
@touch $@
|
||||||
|
@echo 'done'
|
||||||
|
--
|
||||||
|
2.45.2
|
||||||
|
|
||||||
@ -0,0 +1,41 @@
|
|||||||
|
From 3d81d23118aab95214e24ccc81eff61ac245a1ac Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thomas Fitzsimmons <fitzsim@redhat.com>
|
||||||
|
Date: Wed, 20 Mar 2024 13:01:47 -0400
|
||||||
|
Subject: [PATCH] devkit: Remove .comment sections from sysroot objects
|
||||||
|
|
||||||
|
Otherwise the comment sections of C runtime objects, including those
|
||||||
|
in static libraries like libc_nonshared.a, contribute RPM package
|
||||||
|
version strings to the .comment section in devkit-produced binaries
|
||||||
|
and libraries. These RPM package strings change frequently, even
|
||||||
|
across minor toolchain updates. Their presence interferes when
|
||||||
|
comparing binaries built with devkits that use different sysroot RPM
|
||||||
|
package sets.
|
||||||
|
---
|
||||||
|
make/devkit/Tools.gmk | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
|
||||||
|
index b6f895f5a25..37ea1a6a287 100644
|
||||||
|
--- a/make/devkit/Tools.gmk
|
||||||
|
+++ b/make/devkit/Tools.gmk
|
||||||
|
@@ -324,6 +324,9 @@ $(foreach p,$(RPM_FILE_LIST),$(eval $(call unrpm,$(p))))
|
||||||
|
# have it anyway, but just to make sure...
|
||||||
|
# Patch libc.so and libpthread.so to force linking against libraries in sysroot
|
||||||
|
# and not the ones installed on the build machine.
|
||||||
|
+# Remove comment sections from static libraries and C runtime objects
|
||||||
|
+# to prevent leaking RHEL-specific package versions into
|
||||||
|
+# devkit-produced binaries.
|
||||||
|
$(libs) : $(rpms)
|
||||||
|
@echo Patching libc and pthreads
|
||||||
|
@(for f in `find $(SYSROOT) -name libc.so -o -name libpthread.so`; do \
|
||||||
|
@@ -333,6 +336,7 @@ $(libs) : $(rpms)
|
||||||
|
-e 's|/lib/||g' ) > $$f.tmp ; \
|
||||||
|
mv $$f.tmp $$f ; \
|
||||||
|
done)
|
||||||
|
+ @find $(SYSROOT) -name '*.[ao]' -exec objcopy --remove-section .comment '{}' ';'
|
||||||
|
@mkdir -p $(SYSROOT)/usr/lib
|
||||||
|
@touch $@
|
||||||
|
|
||||||
|
--
|
||||||
|
2.45.2
|
||||||
|
|
||||||
@ -0,0 +1,35 @@
|
|||||||
|
From c370e1194c707f3f6c470e147ec497cc4e76957e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thomas Fitzsimmons <fitzsim@redhat.com>
|
||||||
|
Date: Fri, 22 Mar 2024 16:03:17 -0400
|
||||||
|
Subject: [PATCH] Tools.gmk: Configure binutils with
|
||||||
|
--enable-deterministic-archives
|
||||||
|
|
||||||
|
---
|
||||||
|
make/devkit/Tools.gmk | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
|
||||||
|
index 37ea1a6a287..22c6007000b 100644
|
||||||
|
--- a/make/devkit/Tools.gmk
|
||||||
|
+++ b/make/devkit/Tools.gmk
|
||||||
|
@@ -445,6 +445,9 @@ endif
|
||||||
|
|
||||||
|
# Makefile creation. Simply run configure in build dir.
|
||||||
|
# Setting CFLAGS to -O2 generates a much faster ld.
|
||||||
|
+# Use --enable-deterministic-archives so that make targets that
|
||||||
|
+# generate "ar" archives, such as "static-libs-image", produce
|
||||||
|
+# deterministic .a files.
|
||||||
|
$(bfdmakes) \
|
||||||
|
$(BUILDDIR)/$(binutils_ver)/Makefile \
|
||||||
|
: $(BINUTILS_CFG)
|
||||||
|
@@ -459,6 +462,7 @@ $(BUILDDIR)/$(binutils_ver)/Makefile \
|
||||||
|
--with-sysroot=$(SYSROOT) \
|
||||||
|
--disable-nls \
|
||||||
|
--program-prefix=$(TARGET)- \
|
||||||
|
+ --enable-deterministic-archives \
|
||||||
|
--enable-multilib \
|
||||||
|
--enable-threads \
|
||||||
|
--enable-plugins \
|
||||||
|
--
|
||||||
|
2.45.2
|
||||||
|
|
||||||
35
0006-Tools.gmk-Add-enable-linker-build-id-to-gcc-build.patch
Normal file
35
0006-Tools.gmk-Add-enable-linker-build-id-to-gcc-build.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
From 5958274571b957617d0572101a92217fd5b2f312 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andrew Hughes <gnu.andrew@redhat.com>
|
||||||
|
Date: Wed, 27 Nov 2024 17:04:19 +0000
|
||||||
|
Subject: [PATCH] Tools.gmk: Add --enable-linker-build-id to gcc build
|
||||||
|
|
||||||
|
This causes --build-id to be passed to the linker, and the
|
||||||
|
.note.gnu.build-id section is added (OPENJDK-3068)
|
||||||
|
---
|
||||||
|
make/devkit/Tools.gmk | 3 +++
|
||||||
|
1 file changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
|
||||||
|
index 22c6007000b..57d48ec5114 100644
|
||||||
|
--- a/make/devkit/Tools.gmk
|
||||||
|
+++ b/make/devkit/Tools.gmk
|
||||||
|
@@ -539,6 +539,8 @@ endif
|
||||||
|
# skip native language.
|
||||||
|
# and link and assemble with the binutils we created
|
||||||
|
# earlier, so --with-gnu*
|
||||||
|
+# Add --enable-linker-build-id so the .note.gnu.build-id
|
||||||
|
+# section is added by the linker (OPENJDK-3068)
|
||||||
|
$(BUILDDIR)/$(gcc_ver)/Makefile \
|
||||||
|
: $(GCC_CFG)
|
||||||
|
$(info Configuring $@. Log in $(@D)/log.config)
|
||||||
|
@@ -557,6 +559,7 @@ $(BUILDDIR)/$(gcc_ver)/Makefile \
|
||||||
|
--with-mpfr=$(PREFIX) \
|
||||||
|
--with-gmp=$(PREFIX) \
|
||||||
|
--with-mpc=$(PREFIX) \
|
||||||
|
+ --enable-linker-build-id \
|
||||||
|
) 2>&1 | tee $(@D)/log.config
|
||||||
|
@echo 'done'
|
||||||
|
|
||||||
|
--
|
||||||
|
2.45.2
|
||||||
|
|
||||||
@ -0,0 +1,38 @@
|
|||||||
|
From 2617c050a909265444b32063b2d271eca42dcaa6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andrew Hughes <gnu.andrew@redhat.com>
|
||||||
|
Date: Fri, 17 Jan 2025 21:11:01 +0000
|
||||||
|
Subject: [PATCH] Tools.gmk: Exclude systemtap-sdt-devel on s390x & ppc64*
|
||||||
|
|
||||||
|
There is no DTrace support on s390x (JDK-8305174) and ppc64
|
||||||
|
(JDK-8304867) so we don't need the RPMs. They also cause issues with
|
||||||
|
static linkage of libstdc++.a on s390x. It fails with 'error:
|
||||||
|
relocation refers to local symbol "" [9], which is defined in a
|
||||||
|
discarded section'.
|
||||||
|
|
||||||
|
Resolves: OPENJDK-3070
|
||||||
|
---
|
||||||
|
make/devkit/Tools.gmk | 6 +++++-
|
||||||
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
|
||||||
|
index 57d48ec5114..07928f69ceb 100644
|
||||||
|
--- a/make/devkit/Tools.gmk
|
||||||
|
+++ b/make/devkit/Tools.gmk
|
||||||
|
@@ -219,9 +219,13 @@ RPM_LIST := \
|
||||||
|
zlib zlib-devel \
|
||||||
|
libffi libffi-devel \
|
||||||
|
fontconfig fontconfig-devel \
|
||||||
|
- systemtap-sdt-devel \
|
||||||
|
#
|
||||||
|
|
||||||
|
+# Only include SystemTap on supported architectures
|
||||||
|
+ifeq ($(filter ppc64 ppc64le s390x, $(ARCH)), )
|
||||||
|
+ RPM_LIST += systemtap-sdt-devel
|
||||||
|
+endif
|
||||||
|
+
|
||||||
|
##########################################################################################
|
||||||
|
# Define common directories and files
|
||||||
|
|
||||||
|
--
|
||||||
|
2.45.2
|
||||||
|
|
||||||
@ -0,0 +1,33 @@
|
|||||||
|
From 9766818f55726cea630b432f09cce8f9c17c014d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andrew Hughes <gnu.andrew@redhat.com>
|
||||||
|
Date: Fri, 17 Jan 2025 21:27:58 +0000
|
||||||
|
Subject: [PATCH] Tools.gmk: Use update repository on RHEL rather than GA
|
||||||
|
|
||||||
|
It looks like we were using 7.6 & 7.9 GA repositories rather than
|
||||||
|
the latest updates.
|
||||||
|
|
||||||
|
Resolves: OPENJDK-3589
|
||||||
|
---
|
||||||
|
make/devkit/Tools.gmk | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/make/devkit/Tools.gmk b/make/devkit/Tools.gmk
|
||||||
|
index 07928f69ceb..5b39560ab11 100644
|
||||||
|
--- a/make/devkit/Tools.gmk
|
||||||
|
+++ b/make/devkit/Tools.gmk
|
||||||
|
@@ -64,10 +64,10 @@ ifeq ($(BASE_OS), OL)
|
||||||
|
endif
|
||||||
|
else ifeq ($(BASE_OS), RHEL)
|
||||||
|
ifeq ($(ARCH), aarch64)
|
||||||
|
- BASE_URL := https://download.eng.brq.redhat.com/rhel-7/rel-eng/RHEL-7/latest-RHEL-ALT-7/compose/Server/$(ARCH)/os/Packages/
|
||||||
|
+ BASE_URL := https://download.eng.brq.redhat.com/rhel-7/rel-eng/updates/RHEL-ALT-7/latest-RHEL-ALT-7/compose/Server/$(ARCH)/os/Packages/
|
||||||
|
LINUX_VERSION := RHEL7.6
|
||||||
|
else
|
||||||
|
- BASE_URL := https://download.eng.brq.redhat.com/rhel-7/rel-eng/RHEL-7/latest-RHEL-7/compose/Server/$(ARCH)/os/Packages/
|
||||||
|
+ BASE_URL := https://download.eng.brq.redhat.com/rhel-7/rel-eng/updates/RHEL-7/latest-RHEL-7/compose/Server/$(ARCH)/os/Packages/
|
||||||
|
LINUX_VERSION := RHEL7.9
|
||||||
|
endif
|
||||||
|
else ifeq ($(BASE_OS), Fedora)
|
||||||
|
--
|
||||||
|
2.45.2
|
||||||
|
|
||||||
65
CheckVendor.java
Normal file
65
CheckVendor.java
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
/* CheckVendor -- Check the vendor properties match specified values.
|
||||||
|
Copyright (C) 2020 Red Hat, Inc.
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as
|
||||||
|
published by the Free Software Foundation, either version 3 of the
|
||||||
|
License, or (at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public class CheckVendor {
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
if (args.length < 4) {
|
||||||
|
System.err.println("CheckVendor <VENDOR> <VENDOR-URL> <VENDOR-BUG-URL> <VENDOR-VERSION-STRING>");
|
||||||
|
System.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
String vendor = System.getProperty("java.vendor");
|
||||||
|
String expectedVendor = args[0];
|
||||||
|
String vendorURL = System.getProperty("java.vendor.url");
|
||||||
|
String expectedVendorURL = args[1];
|
||||||
|
String vendorBugURL = System.getProperty("java.vendor.url.bug");
|
||||||
|
String expectedVendorBugURL = args[2];
|
||||||
|
String vendorVersionString = System.getProperty("java.vendor.version");
|
||||||
|
String expectedVendorVersionString = args[3];
|
||||||
|
|
||||||
|
if (!expectedVendor.equals(vendor)) {
|
||||||
|
System.err.printf("Invalid vendor %s, expected %s\n",
|
||||||
|
vendor, expectedVendor);
|
||||||
|
System.exit(2);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!expectedVendorURL.equals(vendorURL)) {
|
||||||
|
System.err.printf("Invalid vendor URL %s, expected %s\n",
|
||||||
|
vendorURL, expectedVendorURL);
|
||||||
|
System.exit(3);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!expectedVendorBugURL.equals(vendorBugURL)) {
|
||||||
|
System.err.printf("Invalid vendor bug URL %s, expected %s\n",
|
||||||
|
vendorBugURL, expectedVendorBugURL);
|
||||||
|
System.exit(4);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!expectedVendorVersionString.equals(vendorVersionString)) {
|
||||||
|
System.err.printf("Invalid vendor version string %s, expected %s\n",
|
||||||
|
vendorVersionString, expectedVendorVersionString);
|
||||||
|
System.exit(5);
|
||||||
|
}
|
||||||
|
|
||||||
|
System.err.printf("Vendor information verified as %s, %s, %s, %s\n",
|
||||||
|
vendor, vendorURL, vendorBugURL, vendorVersionString);
|
||||||
|
}
|
||||||
|
}
|
||||||
46
README.md
Normal file
46
README.md
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
OpenJDK 21 is the latest Long-Term Support (LTS) release of the Java platform.
|
||||||
|
|
||||||
|
For a list of major changes from OpenJDK 17 (java-17-openjdk), see the upstream
|
||||||
|
release page for OpenJDK 21 and the preceding interim releases:
|
||||||
|
|
||||||
|
* 18: https://openjdk.java.net/projects/jdk/18/
|
||||||
|
* 19: https://openjdk.java.net/projects/jdk/19/
|
||||||
|
* 20: https://openjdk.java.net/projects/jdk/20/
|
||||||
|
* 21: https://openjdk.java.net/projects/jdk/21/
|
||||||
|
|
||||||
|
# Rebuilding the OpenJDK package
|
||||||
|
|
||||||
|
The OpenJDK packages are now created from a single build which is then
|
||||||
|
packaged for different major versions of Red Hat Enterprise Linux
|
||||||
|
(RHEL). This allows the OpenJDK team to focus their efforts on the
|
||||||
|
development and testing of this single build, rather than having
|
||||||
|
multiple builds which only differ by the platform they were built on.
|
||||||
|
|
||||||
|
This does make rebuilding the package slightly more complicated than a
|
||||||
|
normal package. Modifications should be made to the
|
||||||
|
`java-21-openjdk-portable.specfile` file, which can be found with this
|
||||||
|
README file in the source RPM or installed in the documentation tree
|
||||||
|
by the `java-21-openjdk-headless` RPM.
|
||||||
|
|
||||||
|
Once the modified `java-21-openjdk-portable` RPMs are built, they
|
||||||
|
should be installed and will produce a number of tarballs in the
|
||||||
|
`/usr/lib/jvm` directory. The `java-21-openjdk` RPMs can then be
|
||||||
|
built, which will use these tarballs to create the usual RPMs found in
|
||||||
|
RHEL. The `java-21-openjdk-portable` RPMs can be uninstalled once the
|
||||||
|
desired final RPMs are produced.
|
||||||
|
|
||||||
|
Note that the `java-21-openjdk.spec` file has a hard requirement on
|
||||||
|
the exact version of java-21-openjdk-portable to use, so this will
|
||||||
|
need to be modified if the version or rpmrelease values are changed in
|
||||||
|
`java-21-openjdk-portable.specfile`.
|
||||||
|
|
||||||
|
To reduce the number of RPMs involved, the `fastdebug` and `slowdebug`
|
||||||
|
builds may be disabled using `--without fastdebug` and `--without
|
||||||
|
slowdebug`.
|
||||||
|
|
||||||
|
By default, the portable build on RHEL also uses a "devkit" (a
|
||||||
|
toolchain and system libraries) to build. This aids reproducibility
|
||||||
|
by removing build differences caused by differing system toolchains
|
||||||
|
and libraries. This dependency can be dropped by defining 'centos' to
|
||||||
|
a non-zero value (e.g. --define='centos 1') or a devkit can be built
|
||||||
|
using the `openjdk-devkit.specfile` and associated patches.
|
||||||
72
TestCryptoLevel.java
Normal file
72
TestCryptoLevel.java
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
/* TestCryptoLevel -- Ensure unlimited crypto policy is in use.
|
||||||
|
Copyright (C) 2012 Red Hat, Inc.
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as
|
||||||
|
published by the Free Software Foundation, either version 3 of the
|
||||||
|
License, or (at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import java.lang.reflect.Field;
|
||||||
|
import java.lang.reflect.Method;
|
||||||
|
import java.lang.reflect.InvocationTargetException;
|
||||||
|
|
||||||
|
import java.security.Permission;
|
||||||
|
import java.security.PermissionCollection;
|
||||||
|
|
||||||
|
public class TestCryptoLevel
|
||||||
|
{
|
||||||
|
public static void main(String[] args)
|
||||||
|
throws NoSuchFieldException, ClassNotFoundException,
|
||||||
|
IllegalAccessException, InvocationTargetException
|
||||||
|
{
|
||||||
|
Class<?> cls = null;
|
||||||
|
Method def = null, exempt = null;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
cls = Class.forName("javax.crypto.JceSecurity");
|
||||||
|
}
|
||||||
|
catch (ClassNotFoundException ex)
|
||||||
|
{
|
||||||
|
System.err.println("Running a non-Sun JDK.");
|
||||||
|
System.exit(0);
|
||||||
|
}
|
||||||
|
try
|
||||||
|
{
|
||||||
|
def = cls.getDeclaredMethod("getDefaultPolicy");
|
||||||
|
exempt = cls.getDeclaredMethod("getExemptPolicy");
|
||||||
|
}
|
||||||
|
catch (NoSuchMethodException ex)
|
||||||
|
{
|
||||||
|
System.err.println("Running IcedTea with the original crypto patch.");
|
||||||
|
System.exit(0);
|
||||||
|
}
|
||||||
|
def.setAccessible(true);
|
||||||
|
exempt.setAccessible(true);
|
||||||
|
PermissionCollection defPerms = (PermissionCollection) def.invoke(null);
|
||||||
|
PermissionCollection exemptPerms = (PermissionCollection) exempt.invoke(null);
|
||||||
|
Class<?> apCls = Class.forName("javax.crypto.CryptoAllPermission");
|
||||||
|
Field apField = apCls.getDeclaredField("INSTANCE");
|
||||||
|
apField.setAccessible(true);
|
||||||
|
Permission allPerms = (Permission) apField.get(null);
|
||||||
|
if (defPerms.implies(allPerms) && (exemptPerms == null || exemptPerms.implies(allPerms)))
|
||||||
|
{
|
||||||
|
System.err.println("Running with the unlimited policy.");
|
||||||
|
System.exit(0);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
System.err.println("WARNING: Running with a restricted crypto policy.");
|
||||||
|
System.exit(-1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
49
TestECDSA.java
Normal file
49
TestECDSA.java
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
/* TestECDSA -- Ensure ECDSA signatures are working.
|
||||||
|
Copyright (C) 2016 Red Hat, Inc.
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as
|
||||||
|
published by the Free Software Foundation, either version 3 of the
|
||||||
|
License, or (at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import java.math.BigInteger;
|
||||||
|
import java.security.KeyPair;
|
||||||
|
import java.security.KeyPairGenerator;
|
||||||
|
import java.security.Signature;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @test
|
||||||
|
*/
|
||||||
|
public class TestECDSA {
|
||||||
|
|
||||||
|
public static void main(String[] args) throws Exception {
|
||||||
|
KeyPairGenerator keyGen = KeyPairGenerator.getInstance("EC");
|
||||||
|
KeyPair key = keyGen.generateKeyPair();
|
||||||
|
|
||||||
|
byte[] data = "This is a string to sign".getBytes("UTF-8");
|
||||||
|
|
||||||
|
Signature dsa = Signature.getInstance("NONEwithECDSA");
|
||||||
|
dsa.initSign(key.getPrivate());
|
||||||
|
dsa.update(data);
|
||||||
|
byte[] sig = dsa.sign();
|
||||||
|
System.out.println("Signature: " + new BigInteger(1, sig).toString(16));
|
||||||
|
|
||||||
|
Signature dsaCheck = Signature.getInstance("NONEwithECDSA");
|
||||||
|
dsaCheck.initVerify(key.getPublic());
|
||||||
|
dsaCheck.update(data);
|
||||||
|
boolean success = dsaCheck.verify(sig);
|
||||||
|
if (!success) {
|
||||||
|
throw new RuntimeException("Test failed. Signature verification error");
|
||||||
|
}
|
||||||
|
System.out.println("Test passed.");
|
||||||
|
}
|
||||||
|
}
|
||||||
84
TestSecurityProperties.java
Normal file
84
TestSecurityProperties.java
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
/* TestSecurityProperties -- Ensure system security properties can be used to
|
||||||
|
enable the crypto policies.
|
||||||
|
Copyright (C) 2022 Red Hat, Inc.
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as
|
||||||
|
published by the Free Software Foundation, either version 3 of the
|
||||||
|
License, or (at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.security.Security;
|
||||||
|
import java.util.Properties;
|
||||||
|
|
||||||
|
public class TestSecurityProperties {
|
||||||
|
// JDK 11
|
||||||
|
private static final String JDK_PROPS_FILE_JDK_11 = System.getProperty("java.home") + "/conf/security/java.security";
|
||||||
|
// JDK 8
|
||||||
|
private static final String JDK_PROPS_FILE_JDK_8 = System.getProperty("java.home") + "/lib/security/java.security";
|
||||||
|
|
||||||
|
private static final String POLICY_FILE = "/etc/crypto-policies/back-ends/java.config";
|
||||||
|
|
||||||
|
private static final String MSG_PREFIX = "DEBUG: ";
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
if (args.length == 0) {
|
||||||
|
System.err.println("TestSecurityProperties <true|false>");
|
||||||
|
System.err.println("Invoke with 'true' if system security properties should be enabled.");
|
||||||
|
System.err.println("Invoke with 'false' if system security properties should be disabled.");
|
||||||
|
System.exit(1);
|
||||||
|
}
|
||||||
|
boolean enabled = Boolean.valueOf(args[0]);
|
||||||
|
System.out.println(MSG_PREFIX + "System security properties enabled: " + enabled);
|
||||||
|
Properties jdkProps = new Properties();
|
||||||
|
loadProperties(jdkProps);
|
||||||
|
if (enabled) {
|
||||||
|
loadPolicy(jdkProps);
|
||||||
|
}
|
||||||
|
for (Object key: jdkProps.keySet()) {
|
||||||
|
String sKey = (String)key;
|
||||||
|
String securityVal = Security.getProperty(sKey);
|
||||||
|
String jdkSecVal = jdkProps.getProperty(sKey);
|
||||||
|
if (!securityVal.equals(jdkSecVal)) {
|
||||||
|
String msg = "Expected value '" + jdkSecVal + "' for key '" +
|
||||||
|
sKey + "'" + " but got value '" + securityVal + "'";
|
||||||
|
throw new RuntimeException("Test failed! " + msg);
|
||||||
|
} else {
|
||||||
|
System.out.println(MSG_PREFIX + sKey + " = " + jdkSecVal + " as expected.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
System.out.println("TestSecurityProperties PASSED!");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void loadProperties(Properties props) {
|
||||||
|
String javaVersion = System.getProperty("java.version");
|
||||||
|
System.out.println(MSG_PREFIX + "Java version is " + javaVersion);
|
||||||
|
String propsFile = JDK_PROPS_FILE_JDK_11;
|
||||||
|
if (javaVersion.startsWith("1.8.0")) {
|
||||||
|
propsFile = JDK_PROPS_FILE_JDK_8;
|
||||||
|
}
|
||||||
|
try (FileInputStream fin = new FileInputStream(propsFile)) {
|
||||||
|
props.load(fin);
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new RuntimeException("Test failed!", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void loadPolicy(Properties props) {
|
||||||
|
try (FileInputStream fin = new FileInputStream(POLICY_FILE)) {
|
||||||
|
props.load(fin);
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new RuntimeException("Test failed!", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
160
TestTranslations.java
Normal file
160
TestTranslations.java
Normal file
@ -0,0 +1,160 @@
|
|||||||
|
/* TestTranslations -- Ensure translations are available for new timezones
|
||||||
|
Copyright (C) 2022 Red Hat, Inc.
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as
|
||||||
|
published by the Free Software Foundation, either version 3 of the
|
||||||
|
License, or (at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import java.text.DateFormatSymbols;
|
||||||
|
|
||||||
|
import java.time.ZoneId;
|
||||||
|
import java.time.format.TextStyle;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.TimeZone;
|
||||||
|
|
||||||
|
public class TestTranslations {
|
||||||
|
|
||||||
|
private static Map<Locale,String[]> KYIV, CIUDAD_JUAREZ;
|
||||||
|
|
||||||
|
static {
|
||||||
|
Map<Locale,String[]> map = new HashMap<Locale,String[]>();
|
||||||
|
map.put(Locale.US, new String[] { "Eastern European Standard Time", "GMT+02:00", "EET",
|
||||||
|
"Eastern European Summer Time", "GMT+03:00", "EEST",
|
||||||
|
"Eastern European Time", "GMT+02:00", "EET"});
|
||||||
|
map.put(Locale.FRANCE, new String[] { "heure normale d\u2019Europe de l\u2019Est", "UTC+02:00", "EET",
|
||||||
|
"heure d\u2019\u00e9t\u00e9 d\u2019Europe de l\u2019Est", "UTC+03:00", "EEST",
|
||||||
|
"heure d\u2019Europe de l\u2019Est", "UTC+02:00", "EET"});
|
||||||
|
map.put(Locale.GERMANY, new String[] { "Osteurop\u00e4ische Normalzeit", "OEZ", "OEZ",
|
||||||
|
"Osteurop\u00e4ische Sommerzeit", "OESZ", "OESZ",
|
||||||
|
"Osteurop\u00e4ische Zeit", "OEZ", "OEZ"});
|
||||||
|
KYIV = Collections.unmodifiableMap(map);
|
||||||
|
|
||||||
|
map = new HashMap<Locale,String[]>();
|
||||||
|
map.put(Locale.US, new String[] { "Mountain Standard Time", "MST", "MST",
|
||||||
|
"Mountain Daylight Time", "MDT", "MDT",
|
||||||
|
"Mountain Time", "MT", "MT"});
|
||||||
|
map.put(Locale.FRANCE, new String[] { "heure normale des Rocheuses", "UTC\u221207:00", "MST",
|
||||||
|
"heure d\u2019\u00e9t\u00e9 des Rocheuses", "UTC\u221206:00", "MDT",
|
||||||
|
"heure des Rocheuses", "UTC\u221207:00", "MT"});
|
||||||
|
map.put(Locale.GERMANY, new String[] { "Rocky-Mountain-Normalzeit", "GMT-07:00", "MST",
|
||||||
|
"Rocky-Mountain-Sommerzeit", "GMT-06:00", "MDT",
|
||||||
|
"Rocky-Mountain-Zeit", "GMT-07:00", "MT"});
|
||||||
|
CIUDAD_JUAREZ = Collections.unmodifiableMap(map);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
if (args.length < 1) {
|
||||||
|
System.err.println("Test must be started with the name of the locale provider.");
|
||||||
|
System.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
System.out.println("Checking sanity of full zone string set...");
|
||||||
|
boolean invalid = Arrays.stream(Locale.getAvailableLocales())
|
||||||
|
.peek(l -> System.out.println("Locale: " + l))
|
||||||
|
.map(l -> DateFormatSymbols.getInstance(l).getZoneStrings())
|
||||||
|
.flatMap(zs -> Arrays.stream(zs))
|
||||||
|
.flatMap(names -> Arrays.stream(names))
|
||||||
|
.filter(name -> Objects.isNull(name) || name.isEmpty())
|
||||||
|
.findAny()
|
||||||
|
.isPresent();
|
||||||
|
if (invalid) {
|
||||||
|
System.err.println("Zone string for a locale returned null or empty string");
|
||||||
|
System.exit(2);
|
||||||
|
}
|
||||||
|
|
||||||
|
String localeProvider = args[0];
|
||||||
|
testZone(localeProvider, KYIV,
|
||||||
|
new String[] { "Europe/Kiev", "Europe/Kyiv", "Europe/Uzhgorod", "Europe/Zaporozhye" });
|
||||||
|
testZone(localeProvider, CIUDAD_JUAREZ,
|
||||||
|
new String[] { "America/Cambridge_Bay", "America/Ciudad_Juarez" });
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void testZone(String localeProvider, Map<Locale,String[]> exp, String[] ids) {
|
||||||
|
for (Locale l : exp.keySet()) {
|
||||||
|
String[] expected = exp.get(l);
|
||||||
|
System.out.printf("Expected values for %s are %s\n", l, Arrays.toString(expected));
|
||||||
|
for (String id : ids) {
|
||||||
|
String expectedShortStd = null;
|
||||||
|
String expectedShortDST = null;
|
||||||
|
String expectedShortGen = null;
|
||||||
|
|
||||||
|
System.out.printf("Checking locale %s for %s...\n", l, id);
|
||||||
|
|
||||||
|
if ("JRE".equals(localeProvider)) {
|
||||||
|
expectedShortStd = expected[2];
|
||||||
|
expectedShortDST = expected[5];
|
||||||
|
expectedShortGen = expected[8];
|
||||||
|
} else if ("CLDR".equals(localeProvider)) {
|
||||||
|
expectedShortStd = expected[1];
|
||||||
|
expectedShortDST = expected[4];
|
||||||
|
expectedShortGen = expected[7];
|
||||||
|
} else {
|
||||||
|
System.err.printf("Invalid locale provider %s\n", localeProvider);
|
||||||
|
System.exit(3);
|
||||||
|
}
|
||||||
|
System.out.printf("Locale Provider is %s, using short values %s, %s and %s\n",
|
||||||
|
localeProvider, expectedShortStd, expectedShortDST, expectedShortGen);
|
||||||
|
|
||||||
|
String longStd = TimeZone.getTimeZone(id).getDisplayName(false, TimeZone.LONG, l);
|
||||||
|
String shortStd = TimeZone.getTimeZone(id).getDisplayName(false, TimeZone.SHORT, l);
|
||||||
|
String longDST = TimeZone.getTimeZone(id).getDisplayName(true, TimeZone.LONG, l);
|
||||||
|
String shortDST = TimeZone.getTimeZone(id).getDisplayName(true, TimeZone.SHORT, l);
|
||||||
|
String longGen = ZoneId.of(id).getDisplayName(TextStyle.FULL, l);
|
||||||
|
String shortGen = ZoneId.of(id).getDisplayName(TextStyle.SHORT, l);
|
||||||
|
|
||||||
|
if (!expected[0].equals(longStd)) {
|
||||||
|
System.err.printf("Long standard display name for %s in %s was %s, expected %s\n",
|
||||||
|
id, l, longStd, expected[0]);
|
||||||
|
System.exit(4);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!expectedShortStd.equals(shortStd)) {
|
||||||
|
System.err.printf("Short standard display name for %s in %s was %s, expected %s\n",
|
||||||
|
id, l, shortStd, expectedShortStd);
|
||||||
|
System.exit(5);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!expected[3].equals(longDST)) {
|
||||||
|
System.err.printf("Long DST display name for %s in %s was %s, expected %s\n",
|
||||||
|
id, l, longDST, expected[3]);
|
||||||
|
System.exit(6);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!expectedShortDST.equals(shortDST)) {
|
||||||
|
System.err.printf("Short DST display name for %s in %s was %s, expected %s\n",
|
||||||
|
id, l, shortDST, expectedShortDST);
|
||||||
|
System.exit(7);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!expected[6].equals(longGen)) {
|
||||||
|
System.err.printf("Long generic display name for %s in %s was %s, expected %s\n",
|
||||||
|
id, l, longGen, expected[6]);
|
||||||
|
System.exit(8);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!expectedShortGen.equals(shortGen)) {
|
||||||
|
System.err.printf("Short generic display name for %s in %s was %s, expected %s\n",
|
||||||
|
id, l, shortGen, expectedShortGen);
|
||||||
|
System.exit(9);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
100
alt-java.c
Normal file
100
alt-java.c
Normal file
@ -0,0 +1,100 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2023 Red Hat, Inc.
|
||||||
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
|
*
|
||||||
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
|
* under the terms of the GNU General Public License version 2 only, as
|
||||||
|
* published by the Free Software Foundation. Red Hat designates this
|
||||||
|
* particular file as subject to the "Classpath" exception as provided
|
||||||
|
* by Red Hat in the LICENSE file that accompanied this code.
|
||||||
|
*
|
||||||
|
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
* version 2 for more details (a copy is included in the LICENSE file that
|
||||||
|
* accompanied this code).
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License version
|
||||||
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||||
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <errno.h>
|
||||||
|
#include <libgen.h>
|
||||||
|
#include <linux/limits.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <sys/prctl.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
/* Per task speculation control */
|
||||||
|
#ifndef PR_GET_SPECULATION_CTRL
|
||||||
|
# define PR_GET_SPECULATION_CTRL 52
|
||||||
|
#endif
|
||||||
|
#ifndef PR_SET_SPECULATION_CTRL
|
||||||
|
# define PR_SET_SPECULATION_CTRL 53
|
||||||
|
#endif
|
||||||
|
/* Speculation control variants */
|
||||||
|
#ifndef PR_SPEC_STORE_BYPASS
|
||||||
|
# define PR_SPEC_STORE_BYPASS 0
|
||||||
|
#endif
|
||||||
|
/* Return and control values for PR_SET/GET_SPECULATION_CTRL */
|
||||||
|
|
||||||
|
#ifndef PR_SPEC_NOT_AFFECTED
|
||||||
|
# define PR_SPEC_NOT_AFFECTED 0
|
||||||
|
#endif
|
||||||
|
#ifndef PR_SPEC_PRCTL
|
||||||
|
# define PR_SPEC_PRCTL (1UL << 0)
|
||||||
|
#endif
|
||||||
|
#ifndef PR_SPEC_ENABLE
|
||||||
|
# define PR_SPEC_ENABLE (1UL << 1)
|
||||||
|
#endif
|
||||||
|
#ifndef PR_SPEC_DISABLE
|
||||||
|
# define PR_SPEC_DISABLE (1UL << 2)
|
||||||
|
#endif
|
||||||
|
#ifndef PR_SPEC_FORCE_DISABLE
|
||||||
|
# define PR_SPEC_FORCE_DISABLE (1UL << 3)
|
||||||
|
#endif
|
||||||
|
#ifndef PR_SPEC_DISABLE_NOEXEC
|
||||||
|
# define PR_SPEC_DISABLE_NOEXEC (1UL << 4)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static void set_speculation() {
|
||||||
|
#if defined(__linux__) && defined(__x86_64__)
|
||||||
|
// PR_SPEC_DISABLE_NOEXEC doesn't survive execve, so we can't use it
|
||||||
|
// if ( prctl(PR_SET_SPECULATION_CTRL,
|
||||||
|
// PR_SPEC_STORE_BYPASS,
|
||||||
|
// PR_SPEC_DISABLE_NOEXEC, 0, 0) == 0 ) {
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
|
||||||
|
#else
|
||||||
|
#warning alt-java requested but SSB mitigation not available on this platform.
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(int argc, char **argv) {
|
||||||
|
set_speculation();
|
||||||
|
|
||||||
|
char our_name[PATH_MAX], java_name[PATH_MAX];
|
||||||
|
ssize_t len = readlink("/proc/self/exe", our_name, PATH_MAX - 1);
|
||||||
|
if (len < 0) {
|
||||||
|
perror("I can't find myself");
|
||||||
|
exit(2);
|
||||||
|
}
|
||||||
|
|
||||||
|
our_name[len] = '\0'; // readlink(2) doesn't append a null byte
|
||||||
|
char *path = dirname(our_name);
|
||||||
|
strncpy(java_name, path, PATH_MAX - 1);
|
||||||
|
|
||||||
|
size_t remaining_bytes = PATH_MAX - strlen(path) - 1;
|
||||||
|
strncat(java_name, "/java", remaining_bytes);
|
||||||
|
|
||||||
|
execv(java_name, argv);
|
||||||
|
fprintf(stderr, "%s failed to launch: %s\n", java_name, strerror(errno));
|
||||||
|
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
4234
fips-21u-9203d50836c.patch
Normal file
4234
fips-21u-9203d50836c.patch
Normal file
File diff suppressed because it is too large
Load Diff
7
gating.yaml
Normal file
7
gating.yaml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
# recipients: java-qa
|
||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-10
|
||||||
|
decision_context: osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||||
2616
java-21-openjdk-portable.specfile
Normal file
2616
java-21-openjdk-portable.specfile
Normal file
File diff suppressed because it is too large
Load Diff
2476
java-21-openjdk.spec
Normal file
2476
java-21-openjdk.spec
Normal file
File diff suppressed because it is too large
Load Diff
10
jconsole.desktop.in
Normal file
10
jconsole.desktop.in
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Name=OpenJDK @JAVA_VER@ for @target_cpu@ Monitoring & Management Console (@OPENJDK_VER@)
|
||||||
|
Comment=Monitor and manage OpenJDK applications
|
||||||
|
Exec=_SDKBINDIR_/jconsole
|
||||||
|
Icon=java-@JAVA_VER@-@JAVA_VENDOR@
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
||||||
|
StartupWMClass=sun-tools-jconsole-JConsole
|
||||||
|
Categories=Development;Profiling;Java;
|
||||||
|
Version=1.0
|
||||||
230
openjdk-devkit.specfile
Normal file
230
openjdk-devkit.specfile
Normal file
@ -0,0 +1,230 @@
|
|||||||
|
# Spec file for building a devkit for OpenJDK builds
|
||||||
|
|
||||||
|
# We do not want debug packages
|
||||||
|
%global debug_package %{nil}
|
||||||
|
# Arch definitions from java-*-openjdk RPM
|
||||||
|
%global aarch64 aarch64 arm64 armv8
|
||||||
|
# x86 is not supported by OpenJDK 17
|
||||||
|
ExcludeArch: %{ix86}
|
||||||
|
|
||||||
|
# New Version-String scheme-style defines
|
||||||
|
%global featurever 21
|
||||||
|
%global interimver 0
|
||||||
|
%global updatever 5
|
||||||
|
%global patchver 0
|
||||||
|
%global buildver 11
|
||||||
|
# Define JDK versions
|
||||||
|
%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
|
||||||
|
%global javaver %{featurever}
|
||||||
|
# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
|
||||||
|
%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
|
||||||
|
# The tag used to create the OpenJDK tarball
|
||||||
|
%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
|
||||||
|
|
||||||
|
# Define milestone (EA for pre-releases, GA for releases)
|
||||||
|
# Release will be (where N is usually a number starting at 1):
|
||||||
|
# - 0.N%%{?extraver}%%{?dist} for EA releases,
|
||||||
|
# - N%%{?extraver}{?dist} for GA releases
|
||||||
|
%global is_ga 1
|
||||||
|
%if %{is_ga}
|
||||||
|
%global build_type GA
|
||||||
|
%global ea_designator ""
|
||||||
|
%global ea_designator_zip %{nil}
|
||||||
|
%global extraver %{nil}
|
||||||
|
%global eaprefix %{nil}
|
||||||
|
%else
|
||||||
|
%global build_type EA
|
||||||
|
%global ea_designator ea
|
||||||
|
%global ea_designator_zip -%{ea_designator}
|
||||||
|
%global extraver .%{ea_designator}
|
||||||
|
%global eaprefix 0.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# Date devkit RPMs were download
|
||||||
|
%global rpm_download_date 20250117
|
||||||
|
|
||||||
|
Name: openjdk-devkit
|
||||||
|
Version: 1.0
|
||||||
|
Release: 9%{?dist}
|
||||||
|
License: GPLv2
|
||||||
|
URL: http://openjdk.java.net/
|
||||||
|
Summary: OpenJDK Devkit
|
||||||
|
|
||||||
|
# The source tarball, generated using generate_source_tarball.sh
|
||||||
|
Source0: https://openjdk-sources.osci.io/openjdk%{featurever}/open%{vcstag}%{ea_designator_zip}.tar.xz
|
||||||
|
# The buildroot RPMs for each architecture
|
||||||
|
Source1: devkit-rpms-aarch64-%{rpm_download_date}.tar.xz
|
||||||
|
Source2: devkit-rpms-ppc64le-%{rpm_download_date}.tar.xz
|
||||||
|
Source3: devkit-rpms-s390x-%{rpm_download_date}.tar.xz
|
||||||
|
Source4: devkit-rpms-x86_64-%{rpm_download_date}.tar.xz
|
||||||
|
# Toolchain sources
|
||||||
|
Source5: binutils-2.39.tar.gz
|
||||||
|
Source6: gcc-11.3.0.tar.xz
|
||||||
|
Source7: gmp-6.2.1.tar.bz2
|
||||||
|
Source8: mpc-1.2.1.tar.gz
|
||||||
|
Source9: mpfr-4.1.1.tar.bz2
|
||||||
|
Source10: gdb-11.2.tar.xz
|
||||||
|
|
||||||
|
# Devkit patches; see https://github.com/rh-openjdk/jdk/tree/devkit
|
||||||
|
# To regenerate, use git format-patch -N jdk21u/master
|
||||||
|
# Add RHEL RPM URLs and turn off robots
|
||||||
|
Patch0: 0001-Allow-devkit-to-work-with-RHEL.patch
|
||||||
|
# Turn off multilib on x86_64
|
||||||
|
Patch1: 0002-Disable-multilib-on-x86_64.patch
|
||||||
|
# Improve build logging (OPENJDK-3071)
|
||||||
|
Patch2: 0003-Log-devkit-build-to-stdout.patch
|
||||||
|
# Remove .comment sections from sysroot objects
|
||||||
|
Patch3: 0004-devkit-Remove-.comment-sections-from-sysroot-objects.patch
|
||||||
|
# Configure binutils with --enable-deterministic-archives
|
||||||
|
Patch4: 0005-Tools.gmk-Configure-binutils-with-enable-determinist.patch
|
||||||
|
# Configure gcc with --enable-linker-build-id (OPENJDK-3068)
|
||||||
|
Patch5: 0006-Tools.gmk-Add-enable-linker-build-id-to-gcc-build.patch
|
||||||
|
# Exclude systemtap-sdt-devel on s390x & ppc64* (OPENJDK-3070)
|
||||||
|
Patch6: 0007-Tools.gmk-Exclude-systemtap-sdt-devel-on-s390x-ppc64.patch
|
||||||
|
# Use update repository on RHEL rather than GA (OPENJDK-3589)
|
||||||
|
Patch7: 0008-Tools.gmk-Use-update-repository-on-RHEL-rather-than-.patch
|
||||||
|
|
||||||
|
BuildRequires: make autoconf automake libtool gcc gcc-c++ wget glibc-devel texinfo tar bison
|
||||||
|
|
||||||
|
# Setup variables to reference correct sources
|
||||||
|
%ifarch %{aarch64}
|
||||||
|
%global rpmtarball %{SOURCE1}
|
||||||
|
%endif
|
||||||
|
%ifarch ppc64le
|
||||||
|
%global rpmtarball %{SOURCE2}
|
||||||
|
%endif
|
||||||
|
%ifarch s390x
|
||||||
|
%global rpmtarball %{SOURCE3}
|
||||||
|
%endif
|
||||||
|
%ifarch x86_64
|
||||||
|
%global rpmtarball %{SOURCE4}
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%description
|
||||||
|
OpenJDK Devkit
|
||||||
|
|
||||||
|
%prep
|
||||||
|
|
||||||
|
# Unpack OpenJDK sources only in build directory
|
||||||
|
%setup -q -T -c -a 0
|
||||||
|
|
||||||
|
# This syntax is deprecated:
|
||||||
|
# %patchN [...]
|
||||||
|
# and should be replaced with:
|
||||||
|
# %patch -PN [...]
|
||||||
|
# For example:
|
||||||
|
# %patch1001 -p1
|
||||||
|
# becomes:
|
||||||
|
# %patch -P1001 -p1
|
||||||
|
# The replacement format suggested by recent (circa Fedora 38) RPM
|
||||||
|
# deprecation messages:
|
||||||
|
# %patch N [...]
|
||||||
|
# is not backward-compatible with prior (circa RHEL-8) versions of
|
||||||
|
# rpmbuild.
|
||||||
|
pushd jdk-*
|
||||||
|
%patch -P0 -p1
|
||||||
|
%patch -P1 -p1
|
||||||
|
%patch -P2 -p1
|
||||||
|
%patch -P3 -p1
|
||||||
|
%patch -P4 -p1
|
||||||
|
%patch -P5 -p1
|
||||||
|
%patch -P6 -p1
|
||||||
|
%patch -P7 -p1
|
||||||
|
popd
|
||||||
|
|
||||||
|
mkdir -p devkit/download
|
||||||
|
pushd devkit/download
|
||||||
|
tar -xJf %{rpmtarball}
|
||||||
|
ln -s %{SOURCE5}
|
||||||
|
ln -s %{SOURCE6}
|
||||||
|
ln -s %{SOURCE7}
|
||||||
|
ln -s %{SOURCE8}
|
||||||
|
ln -s %{SOURCE9}
|
||||||
|
ln -s %{SOURCE10}
|
||||||
|
|
||||||
|
%build
|
||||||
|
|
||||||
|
devkit_dir=$(pwd)/devkit
|
||||||
|
today=$(date +%Y%m%d)
|
||||||
|
arch=%{_target_cpu}
|
||||||
|
result_name=${arch}-linux-gnu-to-${arch}-linux-gnu
|
||||||
|
result_path=result/${result_name}
|
||||||
|
|
||||||
|
pushd jdk-*/make/devkit
|
||||||
|
|
||||||
|
# Build devkit first using the native toolchain,
|
||||||
|
# than again using itself
|
||||||
|
for variant in bootstrap product ; do
|
||||||
|
if [ -e ${devkit_dir}-bootstrap/${result_path}/bin/gcc ] ; then
|
||||||
|
ROOTDIR=${devkit_dir}-bootstrap/${result_path};
|
||||||
|
BINDIR=${ROOTDIR}/bin;
|
||||||
|
TOOLS="CC=${BINDIR}/gcc CXX=${BINDIR}/g++ LD=${BINDIR}/ld \
|
||||||
|
AR=${BINDIR}/ar AS=${BINDIR}/as RANLIB=${BINDIR}/ranlib \
|
||||||
|
OBJDUMP=${BINDIR}/objdump"
|
||||||
|
LIBPATH="${ROOTDIR}/lib64:${ROOTDIR}/lib"
|
||||||
|
else
|
||||||
|
TOOLS="CC=$(which gcc) CXX=$(which g++) LD=$(which ld) \
|
||||||
|
AR=$(which ar) AS=$(which as) RANLIB=$(which ranlib) \
|
||||||
|
OBJDUMP=$(which objdump)"
|
||||||
|
fi
|
||||||
|
mkdir -p ${devkit_dir}-${variant}
|
||||||
|
ln -s ${devkit_dir}/download ${devkit_dir}-${variant}
|
||||||
|
LD_LIBRARY_PATH="${LIBPATH}" \
|
||||||
|
make -f Tools.gmk all ${TOOLS} \
|
||||||
|
HOST=${arch}-linux-gnu \
|
||||||
|
BUILD=${arch}-linux-gnu \
|
||||||
|
RESULT=${devkit_dir}-${variant}/result \
|
||||||
|
OUTPUT_ROOT=${devkit_dir}-${variant} \
|
||||||
|
TARGET=${arch}-linux-gnu \
|
||||||
|
PREFIX=${devkit_dir}-${variant}/${result_path} \
|
||||||
|
BASE_OS=RHEL
|
||||||
|
done
|
||||||
|
|
||||||
|
make -r -f Tars.gmk \
|
||||||
|
SRC_DIR=${devkit_dir}-product/${result_path} \
|
||||||
|
TAR_FILE=${devkit_dir}-product/result/sdk-${result_name}-${today}.tar.gz
|
||||||
|
popd
|
||||||
|
|
||||||
|
%install
|
||||||
|
mkdir -p %{buildroot}%{_datadir}/%{name}
|
||||||
|
cp -p devkit-product/result/*.tar.gz %{buildroot}%{_datadir}/%{name}/
|
||||||
|
|
||||||
|
%files
|
||||||
|
%{_datadir}/%{name}
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Fri Jan 17 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1.0-9
|
||||||
|
- Update devkit RPMs to latest updates
|
||||||
|
- Exclude SystemTap RPMs from s390x and ppc64le
|
||||||
|
- Add a date stamp to the RPM bundles
|
||||||
|
- Resolves: OPENJDK-3070
|
||||||
|
= Resolves: OPENJDK-3589
|
||||||
|
|
||||||
|
* Wed Nov 27 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1.0-8
|
||||||
|
- Add --enable-linker-build-id to gcc build
|
||||||
|
- Resolves: OPENJDK-3068
|
||||||
|
|
||||||
|
* Wed Oct 30 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1.0-7
|
||||||
|
- Improve build logging by also writing to stdout
|
||||||
|
- Cleanup patches and rebase on jdk-21.0.5-ga
|
||||||
|
- Drop JDK-8323671 patch which is upstream as of 21.0.3+3
|
||||||
|
- Resolves: OPENJDK-3071
|
||||||
|
|
||||||
|
* Tue Jun 11 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1.0-6
|
||||||
|
- Fix typo where 'as' binary is accidentally capitalised in AS=<path>/as
|
||||||
|
|
||||||
|
* Wed May 01 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1.0-5
|
||||||
|
- Bootstrap the devkit, building it again with itself
|
||||||
|
|
||||||
|
* Mon Apr 08 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1.0-4
|
||||||
|
- Include Thomas' patches to drop .comment sections and build binutils with deterministic archives
|
||||||
|
- Use backward-compatible patch syntax
|
||||||
|
|
||||||
|
* Tue Feb 06 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1.0-3
|
||||||
|
- Include JDK-8323671 patch so the binaries don't contain the full source path
|
||||||
|
|
||||||
|
* Fri Dec 08 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1.0-2
|
||||||
|
- Try to turn off multlib on x86_64 as we don't have the dependencies for it
|
||||||
|
|
||||||
|
* Tue Dec 05 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1.0-1
|
||||||
|
- Create RHEL 7 based devkit for building OpenJDK
|
||||||
164
remove-intree-libraries.sh
Normal file
164
remove-intree-libraries.sh
Normal file
@ -0,0 +1,164 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# Arguments: <JDK TREE> <MINIMAL|FULL>
|
||||||
|
TREE=${1}
|
||||||
|
TYPE=${2}
|
||||||
|
|
||||||
|
ZIP_SRC=src/java.base/share/native/libzip/zlib/
|
||||||
|
FREETYPE_SRC=src/java.desktop/share/native/libfreetype/
|
||||||
|
JPEG_SRC=src/java.desktop/share/native/libjavajpeg/
|
||||||
|
GIF_SRC=src/java.desktop/share/native/libsplashscreen/giflib/
|
||||||
|
PNG_SRC=src/java.desktop/share/native/libsplashscreen/libpng/
|
||||||
|
LCMS_SRC=src/java.desktop/share/native/liblcms/
|
||||||
|
|
||||||
|
if test "x${TREE}" = "x"; then
|
||||||
|
echo "$0 <JDK_TREE> (MINIMAL|FULL)";
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x${TYPE}" = "x"; then
|
||||||
|
TYPE=minimal;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x${TYPE}" != "xminimal" -a "x${TYPE}" != "xfull"; then
|
||||||
|
echo "Type must be minimal or full";
|
||||||
|
exit 2;
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Removing in-tree libraries from ${TREE}"
|
||||||
|
echo "Cleansing operation: ${TYPE}";
|
||||||
|
|
||||||
|
cd ${TREE}
|
||||||
|
|
||||||
|
echo "Removing built-in libs (they will be linked)"
|
||||||
|
|
||||||
|
# On full runs, allow for zlib & freetype having already been deleted by minimal
|
||||||
|
echo "Removing zlib"
|
||||||
|
if [ "x${TYPE}" = "xminimal" -a ! -d ${ZIP_SRC} ]; then
|
||||||
|
echo "${ZIP_SRC} does not exist. Refusing to proceed."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
rm -rvf ${ZIP_SRC}
|
||||||
|
echo "Removing freetype"
|
||||||
|
if [ "x${TYPE}" = "xminimal" -a ! -d ${FREETYPE_SRC} ]; then
|
||||||
|
echo "${FREETYPE_SRC} does not exist. Refusing to proceed."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
rm -rvf ${FREETYPE_SRC}
|
||||||
|
|
||||||
|
# Minimal is limited to just zlib and freetype so finish here
|
||||||
|
if test "x${TYPE}" = "xminimal"; then
|
||||||
|
echo "Finished.";
|
||||||
|
exit 0;
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Removing libjpeg"
|
||||||
|
if [ ! -f ${JPEG_SRC}/jdhuff.c ]; then # some file that should definitely exist
|
||||||
|
echo "${JPEG_SRC} does not contain jpeg sources. Refusing to proceed."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -vf ${JPEG_SRC}/jcomapi.c
|
||||||
|
rm -vf ${JPEG_SRC}/jdapimin.c
|
||||||
|
rm -vf ${JPEG_SRC}/jdapistd.c
|
||||||
|
rm -vf ${JPEG_SRC}/jdcoefct.c
|
||||||
|
rm -vf ${JPEG_SRC}/jdcolor.c
|
||||||
|
rm -vf ${JPEG_SRC}/jdct.h
|
||||||
|
rm -vf ${JPEG_SRC}/jddctmgr.c
|
||||||
|
rm -vf ${JPEG_SRC}/jdhuff.c
|
||||||
|
rm -vf ${JPEG_SRC}/jdhuff.h
|
||||||
|
rm -vf ${JPEG_SRC}/jdinput.c
|
||||||
|
rm -vf ${JPEG_SRC}/jdmainct.c
|
||||||
|
rm -vf ${JPEG_SRC}/jdmarker.c
|
||||||
|
rm -vf ${JPEG_SRC}/jdmaster.c
|
||||||
|
rm -vf ${JPEG_SRC}/jdmerge.c
|
||||||
|
rm -vf ${JPEG_SRC}/jdphuff.c
|
||||||
|
rm -vf ${JPEG_SRC}/jdpostct.c
|
||||||
|
rm -vf ${JPEG_SRC}/jdsample.c
|
||||||
|
rm -vf ${JPEG_SRC}/jerror.c
|
||||||
|
rm -vf ${JPEG_SRC}/jerror.h
|
||||||
|
rm -vf ${JPEG_SRC}/jidctflt.c
|
||||||
|
rm -vf ${JPEG_SRC}/jidctfst.c
|
||||||
|
rm -vf ${JPEG_SRC}/jidctint.c
|
||||||
|
rm -vf ${JPEG_SRC}/jidctred.c
|
||||||
|
rm -vf ${JPEG_SRC}/jinclude.h
|
||||||
|
rm -vf ${JPEG_SRC}/jmemmgr.c
|
||||||
|
rm -vf ${JPEG_SRC}/jmemsys.h
|
||||||
|
rm -vf ${JPEG_SRC}/jmemnobs.c
|
||||||
|
rm -vf ${JPEG_SRC}/jmorecfg.h
|
||||||
|
rm -vf ${JPEG_SRC}/jpegint.h
|
||||||
|
rm -vf ${JPEG_SRC}/jpeglib.h
|
||||||
|
rm -vf ${JPEG_SRC}/jquant1.c
|
||||||
|
rm -vf ${JPEG_SRC}/jquant2.c
|
||||||
|
rm -vf ${JPEG_SRC}/jutils.c
|
||||||
|
rm -vf ${JPEG_SRC}/jcapimin.c
|
||||||
|
rm -vf ${JPEG_SRC}/jcapistd.c
|
||||||
|
rm -vf ${JPEG_SRC}/jccoefct.c
|
||||||
|
rm -vf ${JPEG_SRC}/jccolor.c
|
||||||
|
rm -vf ${JPEG_SRC}/jcdctmgr.c
|
||||||
|
rm -vf ${JPEG_SRC}/jchuff.c
|
||||||
|
rm -vf ${JPEG_SRC}/jchuff.h
|
||||||
|
rm -vf ${JPEG_SRC}/jcinit.c
|
||||||
|
rm -vf ${JPEG_SRC}/jconfig.h
|
||||||
|
rm -vf ${JPEG_SRC}/jcmainct.c
|
||||||
|
rm -vf ${JPEG_SRC}/jcmarker.c
|
||||||
|
rm -vf ${JPEG_SRC}/jcmaster.c
|
||||||
|
rm -vf ${JPEG_SRC}/jcparam.c
|
||||||
|
rm -vf ${JPEG_SRC}/jcphuff.c
|
||||||
|
rm -vf ${JPEG_SRC}/jcprepct.c
|
||||||
|
rm -vf ${JPEG_SRC}/jcsample.c
|
||||||
|
rm -vf ${JPEG_SRC}/jctrans.c
|
||||||
|
rm -vf ${JPEG_SRC}/jdtrans.c
|
||||||
|
rm -vf ${JPEG_SRC}/jfdctflt.c
|
||||||
|
rm -vf ${JPEG_SRC}/jfdctfst.c
|
||||||
|
rm -vf ${JPEG_SRC}/jfdctint.c
|
||||||
|
rm -vf ${JPEG_SRC}/jversion.h
|
||||||
|
rm -vf ${JPEG_SRC}/README
|
||||||
|
|
||||||
|
echo "Removing giflib"
|
||||||
|
if [ ! -d ${GIF_SRC} ]; then
|
||||||
|
echo "${GIF_SRC} does not exist. Refusing to proceed."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
rm -rvf ${GIF_SRC}
|
||||||
|
|
||||||
|
echo "Removing libpng"
|
||||||
|
if [ ! -d ${PNG_SRC} ]; then
|
||||||
|
echo "${PNG_SRC} does not exist. Refusing to proceed."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
rm -rvf ${PNG_SRC}
|
||||||
|
|
||||||
|
echo "Removing lcms"
|
||||||
|
if [ ! -d ${LCMS_SRC} ]; then
|
||||||
|
echo "${LCMS_SRC} does not exist. Refusing to proceed."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
rm -vf ${LCMS_SRC}/cmscam02.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmscgats.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmscnvrt.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmserr.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmsgamma.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmsgmt.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmshalf.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmsintrp.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmsio0.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmsio1.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmslut.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmsmd5.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmsmtrx.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmsnamed.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmsopt.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmspack.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmspcs.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmsplugin.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmsps2.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmssamp.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmssm.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmstypes.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmsvirt.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmswtpnt.c
|
||||||
|
rm -vf ${LCMS_SRC}/cmsxform.c
|
||||||
|
rm -vf ${LCMS_SRC}/lcms2.h
|
||||||
|
rm -vf ${LCMS_SRC}/lcms2_internal.h
|
||||||
|
rm -vf ${LCMS_SRC}/lcms2_plugin.h
|
||||||
3
rpminspect.yaml
Normal file
3
rpminspect.yaml
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
---
|
||||||
|
inspections:
|
||||||
|
javabytecode: off
|
||||||
29
scripts/builds/build_centos.sh
Executable file
29
scripts/builds/build_centos.sh
Executable file
@ -0,0 +1,29 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# Copyright (C) 2024 Red Hat, Inc.
|
||||||
|
# Written by:
|
||||||
|
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Affero General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 3 of the
|
||||||
|
# License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU Affero General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# Builds the RPM on CentOS 9 or 10
|
||||||
|
|
||||||
|
centpkg -v build
|
||||||
|
|
||||||
|
# Local Variables:
|
||||||
|
# compile-command: "shellcheck build_centos.sh"
|
||||||
|
# fill-column: 80
|
||||||
|
# indent-tabs-mode: nil
|
||||||
|
# sh-basic-offset: 4
|
||||||
|
# End:
|
||||||
29
scripts/builds/build_centos_portable_build.sh
Executable file
29
scripts/builds/build_centos_portable_build.sh
Executable file
@ -0,0 +1,29 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# Copyright (C) 2024 Red Hat, Inc.
|
||||||
|
# Written by:
|
||||||
|
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Affero General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 3 of the
|
||||||
|
# License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU Affero General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# Builds the portable on CentOS
|
||||||
|
|
||||||
|
centpkg -v build --target java-openjdk-portable-build --rhel-target none
|
||||||
|
|
||||||
|
# Local Variables:
|
||||||
|
# compile-command: "shellcheck build_centos_portable_build.sh"
|
||||||
|
# fill-column: 80
|
||||||
|
# indent-tabs-mode: nil
|
||||||
|
# sh-basic-offset: 4
|
||||||
|
# End:
|
||||||
43
scripts/builds/build_rhel_10.sh
Executable file
43
scripts/builds/build_rhel_10.sh
Executable file
@ -0,0 +1,43 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# Copyright (C) 2024 Red Hat, Inc.
|
||||||
|
# Written by:
|
||||||
|
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Affero General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 3 of the
|
||||||
|
# License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU Affero General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# Builds the RPM on RHEL 10
|
||||||
|
|
||||||
|
NVR=${1}
|
||||||
|
USER=${2}
|
||||||
|
|
||||||
|
if test "${NVR}" = ""; then
|
||||||
|
echo "${0} <NVR> <USER>";
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "${USER}" = ""; then
|
||||||
|
echo "${0} <NVR> <USER>";
|
||||||
|
exit 2;
|
||||||
|
fi
|
||||||
|
|
||||||
|
METADATA="{\"osci\": {\"upstream_nvr\": \"${NVR}\", \"upstream_owner_name\": \"${USER}\"}, \"rhel-target\": \"latest\"}"
|
||||||
|
rhpkg -v build --target=java-openjdk-rhel-10-build --custom-user-metadata "${METADATA}"
|
||||||
|
|
||||||
|
# Local Variables:
|
||||||
|
# compile-command: "shellcheck build_rhel_10.sh"
|
||||||
|
# fill-column: 80
|
||||||
|
# indent-tabs-mode: nil
|
||||||
|
# sh-basic-offset: 4
|
||||||
|
# End:
|
||||||
29
scripts/builds/build_rhel_7_portable_build.sh
Executable file
29
scripts/builds/build_rhel_7_portable_build.sh
Executable file
@ -0,0 +1,29 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# Copyright (C) 2024 Red Hat, Inc.
|
||||||
|
# Written by:
|
||||||
|
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Affero General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 3 of the
|
||||||
|
# License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU Affero General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# Builds the portable on RHEL 7
|
||||||
|
|
||||||
|
rhpkg -v build --target=java-openjdk-rhel-7-build --skip-nvr-check
|
||||||
|
|
||||||
|
# Local Variables:
|
||||||
|
# compile-command: "shellcheck build_rhel_7_portable_build.sh"
|
||||||
|
# fill-column: 80
|
||||||
|
# indent-tabs-mode: nil
|
||||||
|
# sh-basic-offset: 4
|
||||||
|
# End:
|
||||||
43
scripts/builds/build_rhel_8.sh
Executable file
43
scripts/builds/build_rhel_8.sh
Executable file
@ -0,0 +1,43 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# Copyright (C) 2024 Red Hat, Inc.
|
||||||
|
# Written by:
|
||||||
|
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Affero General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 3 of the
|
||||||
|
# License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU Affero General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# Builds the RPM on RHEL 8
|
||||||
|
|
||||||
|
NVR=${1}
|
||||||
|
USER=${2}
|
||||||
|
|
||||||
|
if test "${NVR}" = ""; then
|
||||||
|
echo "${0} <NVR> <USER>";
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "${USER}" = ""; then
|
||||||
|
echo "${0} <NVR> <USER>";
|
||||||
|
exit 2;
|
||||||
|
fi
|
||||||
|
|
||||||
|
METADATA="{\"osci\": {\"upstream_nvr\": \"${NVR}\", \"upstream_owner_name\": \"${USER}\"}, \"rhel-target\": \"latest\"}"
|
||||||
|
rhpkg -v build --target=java-openjdk-rhel-8-build --custom-user-metadata "${METADATA}"
|
||||||
|
|
||||||
|
# Local Variables:
|
||||||
|
# compile-command: "shellcheck build_rhel_8.sh"
|
||||||
|
# fill-column: 80
|
||||||
|
# indent-tabs-mode: nil
|
||||||
|
# sh-basic-offset: 4
|
||||||
|
# End:
|
||||||
43
scripts/builds/build_rhel_9.sh
Executable file
43
scripts/builds/build_rhel_9.sh
Executable file
@ -0,0 +1,43 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# Copyright (C) 2024 Red Hat, Inc.
|
||||||
|
# Written by:
|
||||||
|
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Affero General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 3 of the
|
||||||
|
# License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU Affero General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# Builds the RPM on RHEL 9
|
||||||
|
|
||||||
|
NVR=${1}
|
||||||
|
USER=${2}
|
||||||
|
|
||||||
|
if test "${NVR}" = ""; then
|
||||||
|
echo "${0} <NVR> <USER>";
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "${USER}" = ""; then
|
||||||
|
echo "${0} <NVR> <USER>";
|
||||||
|
exit 2;
|
||||||
|
fi
|
||||||
|
|
||||||
|
METADATA="{\"osci\": {\"upstream_nvr\": \"${NVR}\", \"upstream_owner_name\": \"${USER}\"}, \"rhel-target\": \"latest\"}"
|
||||||
|
rhpkg -v build --target=java-openjdk-rhel-9-build --custom-user-metadata "${METADATA}"
|
||||||
|
|
||||||
|
# Local Variables:
|
||||||
|
# compile-command: "shellcheck build_rhel_9.sh"
|
||||||
|
# fill-column: 80
|
||||||
|
# indent-tabs-mode: nil
|
||||||
|
# sh-basic-offset: 4
|
||||||
|
# End:
|
||||||
29
scripts/builds/build_rhel_portable_build.sh
Executable file
29
scripts/builds/build_rhel_portable_build.sh
Executable file
@ -0,0 +1,29 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# Copyright (C) 2024 Red Hat, Inc.
|
||||||
|
# Written by:
|
||||||
|
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Affero General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 3 of the
|
||||||
|
# License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU Affero General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# Builds the portable on RHEL 8
|
||||||
|
|
||||||
|
rhpkg -v build --target=java-openjdk-rhel-8-build --skip-nvr-check
|
||||||
|
|
||||||
|
# Local Variables:
|
||||||
|
# compile-command: "shellcheck build_rhel_portable_build.sh"
|
||||||
|
# fill-column: 80
|
||||||
|
# indent-tabs-mode: nil
|
||||||
|
# sh-basic-offset: 4
|
||||||
|
# End:
|
||||||
43
scripts/builds/build_vanilla.sh
Executable file
43
scripts/builds/build_vanilla.sh
Executable file
@ -0,0 +1,43 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# Copyright (C) 2024 Red Hat, Inc.
|
||||||
|
# Written by:
|
||||||
|
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Affero General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 3 of the
|
||||||
|
# License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU Affero General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# Builds a scratch build of vanilla OpenJDK with no local patches
|
||||||
|
|
||||||
|
SEPARATE_ARCHES=${1}
|
||||||
|
CMD="--target java-openjdk-rhel-8-build --skip-nvr-check --nowait";
|
||||||
|
SUPPORTED_ARCHES="aarch64 ppc64le s390x x86_64";
|
||||||
|
|
||||||
|
if [ "x${SEPARATE_ARCHES}" = "x" ] ; then
|
||||||
|
SEPARATE_ARCHES=0;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ${SEPARATE_ARCHES} -eq 1 ] ; then
|
||||||
|
for arch in ${SUPPORTED_ARCHES}; do \
|
||||||
|
rhpkg -v build --arches ${arch} --scratch ${CMD} ; \
|
||||||
|
done && brew watch-task --mine
|
||||||
|
else
|
||||||
|
rhpkg -v build ${CMD} && brew watch-task --mine
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Local Variables:
|
||||||
|
# compile-command: "shellcheck build_vanilla.sh"
|
||||||
|
# fill-column: 80
|
||||||
|
# indent-tabs-mode: nil
|
||||||
|
# sh-basic-offset: 4
|
||||||
|
# End:
|
||||||
61
scripts/discover_trees.sh
Executable file
61
scripts/discover_trees.sh
Executable file
@ -0,0 +1,61 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
# Copyright (C) 2024 Red Hat, Inc.
|
||||||
|
# Written by Andrew John Hughes <gnu.andrew@redhat.com>.
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Affero General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 3 of the
|
||||||
|
# License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU Affero General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
|
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
TREE=${1}
|
||||||
|
|
||||||
|
if test "${TREE}" = ""; then
|
||||||
|
TREE=${PWD}
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -e "${TREE}"/nashorn/.hg ] || [ -e "${TREE}"/nashorn/merge.changeset ] ; then
|
||||||
|
NASHORN="nashorn" ;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -e "${TREE}"/corba/.hg ] || [ -e "${TREE}"/corba/merge.changeset ] ; then
|
||||||
|
CORBA="corba";
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -e "${TREE}"/jaxp/.hg ] || [ -e "${TREE}"/jaxp/merge.changeset ] ; then
|
||||||
|
JAXP="jaxp";
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -e "${TREE}"/jaxws/.hg ] || [ -e "${TREE}"/jaxws/merge.changeset ] ; then
|
||||||
|
JAXWS="jaxws";
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -e "${TREE}"/langtools/.hg ] || [ -e "${TREE}"/langtools/merge.changeset ] ; then
|
||||||
|
LANGTOOLS="langtools";
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -e "${TREE}"/jdk/.hg ] || [ -e "${TREE}"/jdk/merge.changeset ] ; then
|
||||||
|
JDK="jdk";
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -e "${TREE}"/hotspot/.hg ] || [ -e "${TREE}"/hotspot/merge.changeset ] ; then
|
||||||
|
HOTSPOT="hotspot";
|
||||||
|
fi
|
||||||
|
|
||||||
|
SUBTREES="${CORBA} ${JAXP} ${JAXWS} ${LANGTOOLS} ${NASHORN} ${JDK} ${HOTSPOT}";
|
||||||
|
echo "${SUBTREES}"
|
||||||
|
|
||||||
|
# Local Variables:
|
||||||
|
# compile-command: "shellcheck discover_trees.sh"
|
||||||
|
# fill-column: 80
|
||||||
|
# indent-tabs-mode: nil
|
||||||
|
# sh-basic-offset: 4
|
||||||
|
# End:
|
||||||
294
scripts/generate_source_tarball.sh
Executable file
294
scripts/generate_source_tarball.sh
Executable file
@ -0,0 +1,294 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Copyright (C) 2024 Red Hat, Inc.
|
||||||
|
# Written by:
|
||||||
|
# Andrew John Hughes <gnu.andrew@redhat.com>
|
||||||
|
# Thomas Fitzsimmons <fitzsim@redhat.com>
|
||||||
|
# Jiri Vanek <jvanek@redhat.com>
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Affero General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 3 of the
|
||||||
|
# License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU Affero General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
# Generates the source tarball for OpenJDK projects.
|
||||||
|
#
|
||||||
|
# There are multiple ways to specify the source code location and version:
|
||||||
|
#
|
||||||
|
# 1. Specify the version (VERSION), the location of the Git repository
|
||||||
|
# (REPO_ROOT) and the root of the output tarball name (FILE_NAME_ROOT)
|
||||||
|
# 2. Specify the version (VERSION) along with an upstream project name
|
||||||
|
# (PROJECT_NAME) and repository name (REPO_NAME) that can be used
|
||||||
|
# to construct the URL of the upstream OpenJDK repository.
|
||||||
|
# 3. Specify OPENJDK_LATEST=1 and allow the script to obtain the JDK
|
||||||
|
# feature version from the spec file, which is then used to
|
||||||
|
# obtain the latest build promotion from the upstream repository.
|
||||||
|
#
|
||||||
|
# An appropriate bootstrap JDK is also required for when ./configure
|
||||||
|
# is run within the checked out repository to generate the .src-rev.
|
||||||
|
# file. This can be specified by setting BOOT_JDK.
|
||||||
|
#
|
||||||
|
# Example 1:
|
||||||
|
# This will check out the specified version from the specified
|
||||||
|
# repository and construct a tarball called openjdk-17.0.3+5.tar.xz:
|
||||||
|
#
|
||||||
|
# $ VERSION=jdk-17.0.3+5 FILE_NAME_ROOT=open${VERSION} \
|
||||||
|
# REPO_ROOT=$HOME/projects/openjdk/upstream/17u \
|
||||||
|
# BOOT_JDK=/usr/lib/jvm/java-17-openjdk ./generate_source_tarball.sh
|
||||||
|
#
|
||||||
|
# Example 2:
|
||||||
|
# This will check out the same version as example 1, but from the
|
||||||
|
# upstream repository:
|
||||||
|
#
|
||||||
|
# $ VERSION=jdk-17.0.3+5 PROJECT_NAME=openjdk REPO_NAME=jdk17u \
|
||||||
|
# BOOT_JDK=/usr/lib/jvm/java-17-openjdk ./generate_source_tarball.sh
|
||||||
|
#
|
||||||
|
# Example 3:
|
||||||
|
# This will read the OpenJDK feature version from the spec file, then create a
|
||||||
|
# tarball from the most recent tag for that version in the upstream Git
|
||||||
|
# repository.
|
||||||
|
#
|
||||||
|
# $ OPENJDK_LATEST=1 \
|
||||||
|
# BOOT_JDK=/usr/lib/jvm/java-17-openjdk ./generate_source_tarball.sh
|
||||||
|
#
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
OPENJDK_URL_DEFAULT=https://github.com
|
||||||
|
COMPRESSION_DEFAULT=xz
|
||||||
|
|
||||||
|
if [ "$1" = "help" ] ; then
|
||||||
|
echo "Behaviour may be specified by setting the following variables:"
|
||||||
|
echo
|
||||||
|
echo "VERSION - the version of the specified OpenJDK project"
|
||||||
|
echo " (required unless OPENJDK_LATEST is set)"
|
||||||
|
echo "PROJECT_NAME - the name of the OpenJDK project being archived"
|
||||||
|
echo " (needed to compute REPO_ROOT and/or"
|
||||||
|
echo " FILE_NAME_ROOT automatically;"
|
||||||
|
echo " optional if they are set explicitly)"
|
||||||
|
echo "REPO_NAME - the name of the OpenJDK repository"
|
||||||
|
echo " (needed to compute REPO_ROOT automatically;"
|
||||||
|
echo " optional if REPO_ROOT is set explicitly)"
|
||||||
|
echo "OPENJDK_URL - the URL to retrieve code from"
|
||||||
|
echo " (defaults to ${OPENJDK_URL_DEFAULT})"
|
||||||
|
echo "COMPRESSION - the compression type to use"
|
||||||
|
echo " (defaults to ${COMPRESSION_DEFAULT})"
|
||||||
|
echo "FILE_NAME_ROOT - name of the archive, minus extensions"
|
||||||
|
echo " (defaults to PROJECT_NAME-VERSION)"
|
||||||
|
echo "REPO_ROOT - the location of the Git repository to archive"
|
||||||
|
echo " (defaults to OPENJDK_URL/PROJECT_NAME/REPO_NAME.git)"
|
||||||
|
echo "TO_COMPRESS - what part of clone to pack"
|
||||||
|
echo " (defaults to ${VERSION})"
|
||||||
|
echo "BOOT_JDK - the bootstrap JDK to satisfy the configure run"
|
||||||
|
echo " (defaults to packaged JDK version)"
|
||||||
|
echo "WITH_TEMP - run in a temporary directory"
|
||||||
|
echo " (defaults to disabled)"
|
||||||
|
echo "OPENJDK_LATEST - deduce VERSION from most recent upstream tag"
|
||||||
|
echo " (implies WITH_TEMP, computes everything else"
|
||||||
|
echo " automatically; Note: accesses network to read"
|
||||||
|
echo " tag list from remote Git repository)"
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$OPENJDK_LATEST" != "" ] ; then
|
||||||
|
FEATURE_VERSION=$(echo '%featurever' \
|
||||||
|
| rpmspec --shell ./*.spec 2>/dev/null \
|
||||||
|
| grep --after-context 1 featurever \
|
||||||
|
| tail --lines 1)
|
||||||
|
PROJECT_NAME=openjdk
|
||||||
|
REPO_NAME=jdk"${FEATURE_VERSION}"u
|
||||||
|
# Skip -ga tags since those are the same as the most recent non-ga tag, and
|
||||||
|
# the non-ga tag is the one that is used to generated the official source
|
||||||
|
# tarball. For example:
|
||||||
|
# ca760c86642aa2e0d9b571aaabac054c0239fbdc refs/tags/jdk-17.0.10-ga^{}
|
||||||
|
# 25a2e6c20c9a96853714284cabc6b456eb095070 refs/tags/jdk-17.0.10-ga
|
||||||
|
# ca760c86642aa2e0d9b571aaabac054c0239fbdc refs/tags/jdk-17.0.10+7^{}
|
||||||
|
# e49c5749b10f3e90274b72e9279f794fdd191d27 refs/tags/jdk-17.0.10+7
|
||||||
|
VERSION=$(git ls-remote --tags --refs --sort=-version:refname \
|
||||||
|
"${OPENJDK_URL_DEFAULT}/${PROJECT_NAME}/${REPO_NAME}.git" \
|
||||||
|
"jdk-${FEATURE_VERSION}*" \
|
||||||
|
| grep --invert-match '\-ga$' \
|
||||||
|
| head --lines 1 | cut --characters 52-)
|
||||||
|
FILE_NAME_ROOT=open${VERSION}
|
||||||
|
WITH_TEMP=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$WITH_TEMP" != "" ] ; then
|
||||||
|
pushd "$(mktemp --directory --tmpdir temp-generated-source-tarball-XXX)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$VERSION" = "" ] ; then
|
||||||
|
echo "No VERSION specified"
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
echo "Version: ${VERSION}"
|
||||||
|
|
||||||
|
NUM_VER=${VERSION##jdk-}
|
||||||
|
RELEASE_VER=${NUM_VER%%+*}
|
||||||
|
BUILD_VER=${NUM_VER##*+}
|
||||||
|
MAJOR_VER=${RELEASE_VER%%.*}
|
||||||
|
echo "Major version is ${MAJOR_VER}, release ${RELEASE_VER}, build ${BUILD_VER}"
|
||||||
|
|
||||||
|
if [ "$BOOT_JDK" = "" ] ; then
|
||||||
|
echo "No boot JDK specified".
|
||||||
|
BOOT_JDK=/usr/lib/jvm/java-${MAJOR_VER}-openjdk;
|
||||||
|
echo -n "Checking for ${BOOT_JDK}...";
|
||||||
|
if [ -d "${BOOT_JDK}" ] && [ -x "${BOOT_JDK}"/bin/java ] ; then
|
||||||
|
echo "Boot JDK found at ${BOOT_JDK}";
|
||||||
|
else
|
||||||
|
echo "Not found";
|
||||||
|
PREV_VER=$((MAJOR_VER - 1));
|
||||||
|
BOOT_JDK=/usr/lib/jvm/java-${PREV_VER}-openjdk;
|
||||||
|
echo -n "Checking for ${BOOT_JDK}...";
|
||||||
|
if [ -d ${BOOT_JDK} ] && [ -x ${BOOT_JDK}/bin/java ] ; then
|
||||||
|
echo "Boot JDK found at ${BOOT_JDK}";
|
||||||
|
else
|
||||||
|
echo "Not found";
|
||||||
|
exit 4;
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "Boot JDK: ${BOOT_JDK}";
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$OPENJDK_URL" = "" ] ; then
|
||||||
|
OPENJDK_URL=${OPENJDK_URL_DEFAULT}
|
||||||
|
echo "No OpenJDK URL specified; defaulting to ${OPENJDK_URL}"
|
||||||
|
else
|
||||||
|
echo "OpenJDK URL: ${OPENJDK_URL}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$COMPRESSION" = "" ] ; then
|
||||||
|
# rhel 5 needs tar.gz
|
||||||
|
COMPRESSION=${COMPRESSION_DEFAULT}
|
||||||
|
fi
|
||||||
|
echo "Creating a tar.${COMPRESSION} archive"
|
||||||
|
|
||||||
|
if [ "$FILE_NAME_ROOT" = "" ] ; then
|
||||||
|
if [ "$PROJECT_NAME" = "" ] ; then
|
||||||
|
echo "No PROJECT_NAME specified, needed by FILE_NAME_ROOT"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
FILE_NAME_ROOT=${PROJECT_NAME}-${VERSION}
|
||||||
|
echo "No file name root specified; default to ${FILE_NAME_ROOT}"
|
||||||
|
fi
|
||||||
|
if [ "$REPO_ROOT" = "" ] ; then
|
||||||
|
if [ "$PROJECT_NAME" = "" ] ; then
|
||||||
|
echo "No PROJECT_NAME specified, needed by REPO_ROOT"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [ "$REPO_NAME" = "" ] ; then
|
||||||
|
echo "No REPO_NAME specified, needed by REPO_ROOT"
|
||||||
|
exit 3
|
||||||
|
fi
|
||||||
|
REPO_ROOT="${OPENJDK_URL}/${PROJECT_NAME}/${REPO_NAME}.git"
|
||||||
|
echo "No repository root specified; default to ${REPO_ROOT}"
|
||||||
|
fi;
|
||||||
|
|
||||||
|
if [ "$TO_COMPRESS" = "" ] ; then
|
||||||
|
TO_COMPRESS="${VERSION}"
|
||||||
|
echo "No targets to be compressed specified ; default to ${TO_COMPRESS}"
|
||||||
|
fi;
|
||||||
|
|
||||||
|
echo -e "Settings:"
|
||||||
|
echo -e "\tVERSION: ${VERSION}"
|
||||||
|
echo -e "\tPROJECT_NAME: ${PROJECT_NAME}"
|
||||||
|
echo -e "\tREPO_NAME: ${REPO_NAME}"
|
||||||
|
echo -e "\tOPENJDK_URL: ${OPENJDK_URL}"
|
||||||
|
echo -e "\tCOMPRESSION: ${COMPRESSION}"
|
||||||
|
echo -e "\tFILE_NAME_ROOT: ${FILE_NAME_ROOT}"
|
||||||
|
echo -e "\tREPO_ROOT: ${REPO_ROOT}"
|
||||||
|
echo -e "\tTO_COMPRESS: ${TO_COMPRESS}"
|
||||||
|
echo -e "\tBOOT_JDK: ${BOOT_JDK}"
|
||||||
|
echo -e "\tWITH_TEMP: ${WITH_TEMP}"
|
||||||
|
echo -e "\tOPENJDK_LATEST: ${OPENJDK_LATEST}"
|
||||||
|
|
||||||
|
if [ -d "${FILE_NAME_ROOT}" ] ; then
|
||||||
|
echo "Reusing existing ${FILE_NAME_ROOT}"
|
||||||
|
STAT_TIME="$(stat --format=%Y "${FILE_NAME_ROOT}")"
|
||||||
|
TAR_TIME="$(date --date=@"${STAT_TIME}" --iso-8601=seconds)"
|
||||||
|
else
|
||||||
|
mkdir "${FILE_NAME_ROOT}"
|
||||||
|
pushd "${FILE_NAME_ROOT}"
|
||||||
|
echo "Cloning ${VERSION} root repository from ${REPO_ROOT}"
|
||||||
|
if realpath -q "${REPO_ROOT}"; then
|
||||||
|
echo "Local path detected; not adding depth argument";
|
||||||
|
DEPTH="--";
|
||||||
|
else
|
||||||
|
DEPTH="--depth=1";
|
||||||
|
echo "Remote repository detected; adding ${DEPTH}";
|
||||||
|
fi
|
||||||
|
git clone -b "${VERSION}" "${DEPTH}" "${REPO_ROOT}" "${VERSION}"
|
||||||
|
pushd "${VERSION}"
|
||||||
|
TAR_TIME="$(git log --max-count 1 --format=%cI)"
|
||||||
|
popd
|
||||||
|
popd
|
||||||
|
fi
|
||||||
|
pushd "${FILE_NAME_ROOT}"
|
||||||
|
# Generate .src-rev so build has knowledge of the revision the tarball was
|
||||||
|
# created from
|
||||||
|
mkdir build
|
||||||
|
pushd build
|
||||||
|
sh "${PWD}"/../"${VERSION}"/configure --with-boot-jdk="${BOOT_JDK}"
|
||||||
|
make store-source-revision
|
||||||
|
popd
|
||||||
|
rm -rf build
|
||||||
|
|
||||||
|
# Remove commit checks
|
||||||
|
echo "Removing $(find "${VERSION}" -name '.jcheck' -print)"
|
||||||
|
find "${VERSION}" -name '.jcheck' -print0 | xargs -0 rm -r
|
||||||
|
|
||||||
|
# Remove history and GHA
|
||||||
|
echo "find ${VERSION} -name '.hgtags'"
|
||||||
|
find "${VERSION}" -name '.hgtags' -exec rm -v '{}' '+'
|
||||||
|
echo "find ${VERSION} -name '.hgignore'"
|
||||||
|
find "${VERSION}" -name '.hgignore' -exec rm -v '{}' '+'
|
||||||
|
echo "find ${VERSION} -name '.gitattributes'"
|
||||||
|
find "${VERSION}" -name '.gitattributes' -exec rm -v '{}' '+'
|
||||||
|
echo "find ${VERSION} -name '.gitignore'"
|
||||||
|
find "${VERSION}" -name '.gitignore' -exec rm -v '{}' '+'
|
||||||
|
# Work around some Git objects not having write permissions.
|
||||||
|
echo "chmod --recursive u+w ${VERSION}/.git"
|
||||||
|
chmod --recursive u+w "${VERSION}"/.git
|
||||||
|
echo "find ${VERSION} -name '.git'"
|
||||||
|
find "${VERSION}" -name '.git' -exec rm -rv '{}' '+'
|
||||||
|
echo "find ${VERSION} -name '.github'"
|
||||||
|
find "${VERSION}" -name '.github' -exec rm -rv '{}' '+'
|
||||||
|
|
||||||
|
echo "Compressing remaining forest"
|
||||||
|
if [ "$COMPRESSION" = "xz" ] ; then
|
||||||
|
SWITCH=cJf
|
||||||
|
else
|
||||||
|
SWITCH=czf
|
||||||
|
fi
|
||||||
|
EA_PART="$(awk -F= \
|
||||||
|
'/^DEFAULT_PROMOTED_VERSION_PRE/ { if ($2) print "-"$2 }' \
|
||||||
|
"${VERSION}"/make/conf/version-numbers.conf)"
|
||||||
|
TARBALL_NAME=${FILE_NAME_ROOT}${EA_PART}.tar.${COMPRESSION}
|
||||||
|
XZ_OPT=${XZ_OPT-"-T0"} \
|
||||||
|
tar --mtime="${TAR_TIME}" --owner=root --group=root --sort=name \
|
||||||
|
--exclude-vcs -$SWITCH "${TARBALL_NAME}" "${TO_COMPRESS}"
|
||||||
|
mv "${TARBALL_NAME}" ..
|
||||||
|
popd
|
||||||
|
if [ "$WITH_TEMP" != "" ] ; then
|
||||||
|
echo "Tarball is: $(realpath .)/${TARBALL_NAME}"
|
||||||
|
popd
|
||||||
|
else
|
||||||
|
echo -n "Done. You may want to remove the uncompressed version"
|
||||||
|
echo " - $FILE_NAME_ROOT"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Local Variables:
|
||||||
|
# compile-command: "shellcheck generate_source_tarball.sh"
|
||||||
|
# fill-column: 80
|
||||||
|
# indent-tabs-mode: nil
|
||||||
|
# sh-basic-offset: 4
|
||||||
|
# End:
|
||||||
172
scripts/get_bundle_versions.sh
Executable file
172
scripts/get_bundle_versions.sh
Executable file
@ -0,0 +1,172 @@
|
|||||||
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
|
# Copyright (C) 2025 Red Hat, Inc.
|
||||||
|
# Original written by Antonio Vieiro <avieirov@redhat.com>
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Affero General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 3 of the
|
||||||
|
# License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU Affero General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
if [ $# -ne 1 ]; then
|
||||||
|
echo "Usage: $0 openjdk-root-directory"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
JDKROOT=$1
|
||||||
|
|
||||||
|
if [ ! -d "${JDKROOT}" ] ; then
|
||||||
|
echo "${JDKROOT} is not a directory.";
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Work out the OpenJDK version
|
||||||
|
# OpenJDK >= 10 has its version in the build machinery
|
||||||
|
# OpenJDK >= 17 stores it in a new location (JDK-8258246)
|
||||||
|
VERSION_FILE="${JDKROOT}"/make/conf/version-numbers.conf
|
||||||
|
printf "Checking for %s..." "${VERSION_FILE}";
|
||||||
|
if [ ! -f "${VERSION_FILE}" ] ; then
|
||||||
|
VERSION_FILE="${JDKROOT}"/make/autoconf/version-numbers
|
||||||
|
echo "Not found; using old version file ${VERSION_FILE}";
|
||||||
|
else
|
||||||
|
echo "found.";
|
||||||
|
fi
|
||||||
|
if [ -e "${VERSION_FILE}" ] ; then
|
||||||
|
openjdk_version=$(grep '^DEFAULT_VERSION_FEATURE' "${VERSION_FILE}" | cut -d '=' -f 2)
|
||||||
|
elif [ -e "${JDKROOT}"/jdk/src/java.base/share/classes/java/lang/Object.java ] ; then
|
||||||
|
openjdk_version=9;
|
||||||
|
elif [ -e "${JDKROOT}"/common/autoconf ] ; then
|
||||||
|
openjdk_version=8;
|
||||||
|
else
|
||||||
|
openjdk_version=7;
|
||||||
|
fi
|
||||||
|
echo "OpenJDK version: ${openjdk_version}";
|
||||||
|
|
||||||
|
#
|
||||||
|
# Freetype
|
||||||
|
#
|
||||||
|
if [ "${openjdk_version}" -gt 8 ] ; then
|
||||||
|
FREETYPE=src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
|
||||||
|
ABS_FREETYPE="${JDKROOT}"/"${FREETYPE}"
|
||||||
|
if [ ! -f "${ABS_FREETYPE}" ]; then
|
||||||
|
echo "Freetype header not found!"
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
FREETYPE_VERSION=$(awk '/#define FREETYPE_MAJOR/ {MAJOR=$3} /#define FREETYPE_MINOR/ {MINOR=$3} /#define FREETYPE_PATCH/ {PATCH=$3} END {printf "%s.%s.%s", MAJOR, MINOR, PATCH}' "${ABS_FREETYPE}")
|
||||||
|
else
|
||||||
|
echo "No bundled FreeType on ${openjdk_version}";
|
||||||
|
fi
|
||||||
|
|
||||||
|
# giflib
|
||||||
|
if [ "${openjdk_version}" -gt 8 ] ; then
|
||||||
|
GIFLIB=src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
|
||||||
|
else
|
||||||
|
GIFLIB=jdk/src/share/native/sun/awt/giflib/gif_lib.h
|
||||||
|
fi
|
||||||
|
ABS_GIFLIB="${JDKROOT}"/"${GIFLIB}"
|
||||||
|
if [ ! -f "${ABS_GIFLIB}" ]; then
|
||||||
|
echo "giflib header not found!"
|
||||||
|
exit 3
|
||||||
|
fi
|
||||||
|
GIFLIB_VERSION=$(awk '/#define GIFLIB_MAJOR/ {MAJOR=$3} /#define GIFLIB_MINOR/ {MINOR=$3} /#define GIFLIB_RELEASE/ {PATCH=$3} END {printf "%s.%s.%s", MAJOR, MINOR, PATCH}' "${ABS_GIFLIB}")
|
||||||
|
|
||||||
|
# harfbuzz
|
||||||
|
if [ "${openjdk_version}" -gt 8 ] ; then
|
||||||
|
HARFBUZZ=src/java.desktop/share/native/libharfbuzz/hb-version.h
|
||||||
|
ABS_HARFBUZZ="${JDKROOT}/${HARFBUZZ}"
|
||||||
|
if [ ! -f "${ABS_HARFBUZZ}" ]; then
|
||||||
|
echo "HarfBuzz header not found!"
|
||||||
|
exit 4
|
||||||
|
fi
|
||||||
|
HARFBUZZ_VERSION=$(awk '/#define HB_VERSION_MAJOR/ {MAJOR=$3} /#define HB_VERSION_MINOR/ {MINOR=$3} /#define HB_VERSION_MICRO/ {PATCH=$3} END {printf "%s.%s.%s", MAJOR, MINOR, PATCH}' "${ABS_HARFBUZZ}")
|
||||||
|
else
|
||||||
|
echo "No HarfBuzz on ${openjdk_version}";
|
||||||
|
fi
|
||||||
|
|
||||||
|
# lcms
|
||||||
|
if [ "${openjdk_version}" -gt 8 ] ; then
|
||||||
|
LCMS=src/java.desktop/share/native/liblcms/lcms2.h
|
||||||
|
else
|
||||||
|
LCMS=jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h
|
||||||
|
fi
|
||||||
|
ABS_LCMS="${JDKROOT}"/"${LCMS}"
|
||||||
|
if [ ! -f "${ABS_LCMS}" ]; then
|
||||||
|
echo "lcms header not found!"
|
||||||
|
exit 5
|
||||||
|
fi
|
||||||
|
LCMS_VERSION=$(awk '/#define LCMS_VERSION/ { MAJOR=int($3 / 1000); REST=$3 % 1000; MINOR=int(REST / 10); PATCH=REST % 10; } END {printf "%s.%s.%s", MAJOR, MINOR, PATCH}' "${ABS_LCMS}")
|
||||||
|
|
||||||
|
# jpeg
|
||||||
|
if [ "${openjdk_version}" -gt 8 ] ; then
|
||||||
|
JPEG=src/java.desktop/share/native/libjavajpeg/jpeglib.h
|
||||||
|
else
|
||||||
|
JPEG=jdk/src/share/native/sun/awt/image/jpeg/jpeglib.h
|
||||||
|
fi
|
||||||
|
ABS_JPEG="${JDKROOT}"/"${JPEG}"
|
||||||
|
if [ ! -f "${ABS_JPEG}" ]; then
|
||||||
|
echo "jpeg header not found!"
|
||||||
|
exit 6
|
||||||
|
fi
|
||||||
|
JPEG_VERSION=$(awk '/#define JPEG_LIB_VERSION/ { VERSION=$3; MAJOR=int(VERSION / 10); MINOR=VERSION%10; } END {printf "%s%c", MAJOR, (MINOR+96)}' "${ABS_JPEG}")
|
||||||
|
|
||||||
|
# png
|
||||||
|
if [ "${openjdk_version}" -gt 8 ] ; then
|
||||||
|
PNG=src/java.desktop/share/native/libsplashscreen/libpng/png.h
|
||||||
|
else
|
||||||
|
PNG=jdk/src/share/native/sun/awt/libpng/png.h
|
||||||
|
fi
|
||||||
|
ABS_PNG="${JDKROOT}"/"${PNG}"
|
||||||
|
if [ ! -f "${ABS_PNG}" ]; then
|
||||||
|
echo "png header not found!"
|
||||||
|
exit 7
|
||||||
|
fi
|
||||||
|
PNG_VERSION=$(awk '/#define PNG_LIBPNG_VER_STRING/ { VERSION=$3; gsub("\"", "", VERSION) } END {print VERSION}' "${ABS_PNG}")
|
||||||
|
|
||||||
|
# zlib
|
||||||
|
if [ "${openjdk_version}" -gt 8 ] ; then
|
||||||
|
ZLIB=src/java.base/share/native/libzip/zlib/zlib.h
|
||||||
|
else
|
||||||
|
ZLIB=jdk/src/share/native/java/util/zip/zlib/zlib.h
|
||||||
|
fi
|
||||||
|
ABS_ZLIB="${JDKROOT}"/"${ZLIB}"
|
||||||
|
if [ ! -f "${ABS_ZLIB}" ]; then
|
||||||
|
echo "zlib header not found!"
|
||||||
|
exit 8
|
||||||
|
fi
|
||||||
|
ZLIB_VERSION=$(awk '/#define ZLIB_VERSION/ { VERSION=$3; gsub("\"", "", VERSION) } END {print VERSION}' "${ABS_ZLIB}")
|
||||||
|
|
||||||
|
# Print output
|
||||||
|
printf "\nRPM definitions:\n"
|
||||||
|
if [ "${openjdk_version}" -gt 8 ] ; then
|
||||||
|
echo "# Version in ${FREETYPE}"
|
||||||
|
echo "Provides: bundled(freetype) = ${FREETYPE_VERSION}"
|
||||||
|
fi
|
||||||
|
echo "# Version in ${GIFLIB}"
|
||||||
|
echo "Provides: bundled(giflib) = ${GIFLIB_VERSION}"
|
||||||
|
if [ "${openjdk_version}" -gt 8 ] ; then
|
||||||
|
echo "# Version in ${HARFBUZZ}"
|
||||||
|
echo "Provides: bundled(harfbuzz) = ${HARFBUZZ_VERSION}"
|
||||||
|
fi
|
||||||
|
echo "# Version in ${LCMS}"
|
||||||
|
echo "Provides: bundled(lcms2) = ${LCMS_VERSION}"
|
||||||
|
echo "# Version in ${JPEG}"
|
||||||
|
echo "Provides: bundled(libjpeg) = ${JPEG_VERSION}"
|
||||||
|
echo "# Version in ${PNG}"
|
||||||
|
echo "Provides: bundled(libpng) = ${PNG_VERSION}"
|
||||||
|
echo "# Version in ${ZLIB}"
|
||||||
|
echo "Provides: bundled(zlib) = ${ZLIB_VERSION}"
|
||||||
|
|
||||||
|
# Local Variables:
|
||||||
|
# compile-command: "shellcheck get_bundle_versions.sh"
|
||||||
|
# fill-column: 80
|
||||||
|
# indent-tabs-mode: nil
|
||||||
|
# sh-basic-offset: 4
|
||||||
|
# End:
|
||||||
198
scripts/icedtea_sync.sh
Executable file
198
scripts/icedtea_sync.sh
Executable file
@ -0,0 +1,198 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Copyright (C) 2024 Red Hat, Inc.
|
||||||
|
# Written by Andrew John Hughes <gnu.andrew@redhat.com>.
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Affero General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 3 of the
|
||||||
|
# License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU Affero General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
ICEDTEA_USE_VCS=true
|
||||||
|
|
||||||
|
ICEDTEA_VERSION=3.15.0
|
||||||
|
ICEDTEA_URL=https://icedtea.classpath.org/download/source
|
||||||
|
ICEDTEA_SIGNING_KEY=CFDA0F9B35964222
|
||||||
|
|
||||||
|
ICEDTEA_HG_URL=https://icedtea.classpath.org/hg/icedtea11
|
||||||
|
set -e
|
||||||
|
|
||||||
|
RPM_DIR=${PWD}
|
||||||
|
if [ ! -f "${RPM_DIR}/jconsole.desktop.in" ] ; then
|
||||||
|
echo "Not in RPM source tree.";
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "${TMPDIR}" = ""; then
|
||||||
|
TMPDIR=/tmp;
|
||||||
|
fi
|
||||||
|
WORKDIR=${TMPDIR}/it.sync
|
||||||
|
|
||||||
|
echo "Using working directory ${WORKDIR}"
|
||||||
|
mkdir "${WORKDIR}"
|
||||||
|
pushd "${WORKDIR}"
|
||||||
|
|
||||||
|
if test "${WGET}" = ""; then
|
||||||
|
WGET=$(which wget);
|
||||||
|
if test "${WGET}" = ""; then
|
||||||
|
echo "wget not found";
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "${TAR}" = ""; then
|
||||||
|
TAR=$(which tar)
|
||||||
|
if test "${TAR}" = ""; then
|
||||||
|
echo "tar not found";
|
||||||
|
exit 2;
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Dependencies:";
|
||||||
|
echo -e "\tWGET: ${WGET}";
|
||||||
|
echo -e "\tTAR: ${TAR}\n";
|
||||||
|
|
||||||
|
if test "${ICEDTEA_USE_VCS}" = "true"; then
|
||||||
|
echo "Mode: Using VCS";
|
||||||
|
|
||||||
|
if test "${GREP}" = ""; then
|
||||||
|
GREP=$(which grep);
|
||||||
|
if test "${GREP}" = ""; then
|
||||||
|
echo "grep not found";
|
||||||
|
exit 3;
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "${CUT}" = ""; then
|
||||||
|
CUT=$(which cut);
|
||||||
|
if test "${CUT}" = ""; then
|
||||||
|
echo "cut not found";
|
||||||
|
exit 4;
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "${TR}" = ""; then
|
||||||
|
TR=$(which tr);
|
||||||
|
if test "${TR}" = ""; then
|
||||||
|
echo "tr not found";
|
||||||
|
exit 5;
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "${HG}" = ""; then
|
||||||
|
HG=$(which hg);
|
||||||
|
if test "${HG}" = ""; then
|
||||||
|
echo "hg not found";
|
||||||
|
exit 6;
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Dependencies:";
|
||||||
|
echo -e "\tGREP: ${GREP}";
|
||||||
|
echo -e "\tCUT: ${CUT}";
|
||||||
|
echo -e "\tTR: ${TR}";
|
||||||
|
echo -e "\tHG: ${HG}";
|
||||||
|
|
||||||
|
echo "Checking out repository from VCS...";
|
||||||
|
${HG} clone ${ICEDTEA_HG_URL} icedtea
|
||||||
|
|
||||||
|
echo "Obtaining version from configure.ac...";
|
||||||
|
ROOT_VER=$(${GREP} '^AC_INIT' icedtea/configure.ac|${CUT} -d ',' -f 2|${TR} -d '[][:space:]')
|
||||||
|
echo "Root version from configure: ${ROOT_VER}";
|
||||||
|
|
||||||
|
VCS_REV=$(${HG} log -R icedtea --template '{node|short}' -r tip)
|
||||||
|
echo "VCS revision: ${VCS_REV}";
|
||||||
|
|
||||||
|
ICEDTEA_VERSION="${ROOT_VER}-${VCS_REV}"
|
||||||
|
echo "Creating icedtea-${ICEDTEA_VERSION}";
|
||||||
|
mkdir "icedtea-${ICEDTEA_VERSION}"
|
||||||
|
echo "Copying required files from checkout to icedtea-${ICEDTEA_VERSION}";
|
||||||
|
# Commented out for now as IcedTea 6's jconsole.desktop.in is outdated
|
||||||
|
#cp -a icedtea/jconsole.desktop.in ../icedtea-${ICEDTEA_VERSION}
|
||||||
|
cp -a "${RPM_DIR}/jconsole.desktop.in" "icedtea-${ICEDTEA_VERSION}"
|
||||||
|
cp -a icedtea/tapset "icedtea-${ICEDTEA_VERSION}"
|
||||||
|
|
||||||
|
rm -rf icedtea
|
||||||
|
else
|
||||||
|
echo "Mode: Using tarball";
|
||||||
|
|
||||||
|
if test "${ICEDTEA_VERSION}" = ""; then
|
||||||
|
echo "No IcedTea version specified for tarball download.";
|
||||||
|
exit 3;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "${CHECKSUM}" = ""; then
|
||||||
|
CHECKSUM=$(which sha256sum)
|
||||||
|
if test "${CHECKSUM}" = ""; then
|
||||||
|
echo "sha256sum not found";
|
||||||
|
exit 4;
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "${PGP}" = ""; then
|
||||||
|
PGP=$(which gpg)
|
||||||
|
if test "${PGP}" = ""; then
|
||||||
|
echo "gpg not found";
|
||||||
|
exit 5;
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Dependencies:";
|
||||||
|
echo -e "\tCHECKSUM: ${CHECKSUM}";
|
||||||
|
echo -e "\tPGP: ${PGP}\n";
|
||||||
|
|
||||||
|
echo "Checking for IcedTea signing key ${ICEDTEA_SIGNING_KEY}...";
|
||||||
|
if ! gpg --list-keys ${ICEDTEA_SIGNING_KEY}; then
|
||||||
|
echo "IcedTea signing key ${ICEDTEA_SIGNING_KEY} not installed.";
|
||||||
|
exit 6;
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Downloading IcedTea release tarball...";
|
||||||
|
${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz
|
||||||
|
echo "Downloading IcedTea tarball signature...";
|
||||||
|
${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.tar.xz.sig
|
||||||
|
echo "Downloading IcedTea tarball checksums...";
|
||||||
|
${WGET} -v ${ICEDTEA_URL}/icedtea-${ICEDTEA_VERSION}.sha256
|
||||||
|
|
||||||
|
echo "Verifying checksums...";
|
||||||
|
${CHECKSUM} --check --ignore-missing icedtea-${ICEDTEA_VERSION}.sha256
|
||||||
|
|
||||||
|
echo "Checking signature...";
|
||||||
|
${PGP} --verify icedtea-${ICEDTEA_VERSION}.tar.xz.sig
|
||||||
|
|
||||||
|
echo "Extracting files...";
|
||||||
|
${TAR} xJf icedtea-${ICEDTEA_VERSION}.tar.xz \
|
||||||
|
icedtea-${ICEDTEA_VERSION}/tapset \
|
||||||
|
icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in
|
||||||
|
|
||||||
|
rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz
|
||||||
|
rm -vf icedtea-${ICEDTEA_VERSION}.tar.xz.sig
|
||||||
|
rm -vf icedtea-${ICEDTEA_VERSION}.sha256
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Replacing desktop files...";
|
||||||
|
mv -v "icedtea-${ICEDTEA_VERSION}/jconsole.desktop.in" "${RPM_DIR}"
|
||||||
|
|
||||||
|
echo "Creating new tapset tarball...";
|
||||||
|
mv -v "icedtea-${ICEDTEA_VERSION}" openjdk
|
||||||
|
${TAR} cJf "${RPM_DIR}/tapsets-icedtea-${ICEDTEA_VERSION}.tar.xz" openjdk
|
||||||
|
|
||||||
|
rm -rvf openjdk
|
||||||
|
|
||||||
|
popd
|
||||||
|
rm -rf "${WORKDIR}"
|
||||||
|
|
||||||
|
# Local Variables:
|
||||||
|
# compile-command: "shellcheck icedtea_sync.sh"
|
||||||
|
# fill-column: 80
|
||||||
|
# indent-tabs-mode: nil
|
||||||
|
# sh-basic-offset: 4
|
||||||
|
# End:
|
||||||
114
scripts/openjdk_news.sh
Executable file
114
scripts/openjdk_news.sh
Executable file
@ -0,0 +1,114 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Copyright (C) 2024 Red Hat, Inc.
|
||||||
|
# Written by Andrew John Hughes <gnu.andrew@redhat.com>, 2012-2022
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Affero General Public License as
|
||||||
|
# published by the Free Software Foundation, either version 3 of the
|
||||||
|
# License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU Affero General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
OLD_RELEASE=$1
|
||||||
|
NEW_RELEASE=$2
|
||||||
|
REPO=$3
|
||||||
|
SUBDIR=$4
|
||||||
|
SCRIPT_DIR=$(dirname "${0}")
|
||||||
|
|
||||||
|
if test "${SUBDIR}" = ""; then
|
||||||
|
echo "No subdirectory specified; using .";
|
||||||
|
SUBDIR=".";
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "$REPO" = ""; then
|
||||||
|
echo "No repository specified; using ${PWD}"
|
||||||
|
REPO=${PWD}
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "${TMPDIR}" = ""; then
|
||||||
|
TMPDIR=/tmp;
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Repository: ${REPO}"
|
||||||
|
|
||||||
|
if [ -e "${REPO}/.git" ] ; then
|
||||||
|
TYPE=git;
|
||||||
|
elif [ -e "${REPO}/.hg" ] ; then
|
||||||
|
TYPE=hg;
|
||||||
|
else
|
||||||
|
echo "No Mercurial or Git repository detected.";
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "$OLD_RELEASE" = "" || test "$NEW_RELEASE" = ""; then
|
||||||
|
echo "ERROR: Need to specify old and new release";
|
||||||
|
exit 2;
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Listing fixes between $OLD_RELEASE and $NEW_RELEASE in $REPO"
|
||||||
|
rm -f "${TMPDIR}/fixes2" "${TMPDIR}/fixes3" "${TMPDIR}/fixes"
|
||||||
|
for repos in . $("${SCRIPT_DIR}/discover_trees.sh" "${REPO}");
|
||||||
|
do
|
||||||
|
if test "$TYPE" = "hg"; then
|
||||||
|
hg log -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') - tag('$OLD_RELEASE')" -R "$REPO/$repos" -G -M "${REPO}/${SUBDIR}" | \
|
||||||
|
grep -E '^[o:| ]*summary'|grep -v 'Added tag'|sed -r 's#^[o:| ]*summary:\W*([0-9])# - JDK-\1#'| \
|
||||||
|
sed 's#^[o:| ]*summary:\W*# - #' >> "${TMPDIR}/fixes2";
|
||||||
|
hg log -v -r "tag('$NEW_RELEASE'):tag('$OLD_RELEASE') - tag('$OLD_RELEASE')" -R "$REPO/$repos" -G -M "${REPO}/${SUBDIR}" | \
|
||||||
|
grep -E '^[o:| ]*[0-9]{7}'|sed -r 's#^[o:| ]*([0-9]{7})# - JDK-\1#' >> "${TMPDIR}/fixes3";
|
||||||
|
else
|
||||||
|
git -C "${REPO}" log --no-merges --pretty=format:%B "${NEW_RELEASE}...${OLD_RELEASE}" -- "${SUBDIR}" |grep -E '^[0-9]{7}' | \
|
||||||
|
sed -r 's#^([0-9])# - JDK-\1#' >> "${TMPDIR}/fixes2";
|
||||||
|
touch "${TMPDIR}/fixes3" ; # unused
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
sort "${TMPDIR}/fixes2" "${TMPDIR}/fixes3" > "${TMPDIR}/fixes4"
|
||||||
|
uniq "${TMPDIR}/fixes4" > "${TMPDIR}/fixes"
|
||||||
|
rm -f "${TMPDIR}/fixes2" "${TMPDIR}/fixes3"
|
||||||
|
|
||||||
|
if ! [ -s "${TMPDIR}/fixes" ] ; then
|
||||||
|
echo "Failed to obtain fixes.";
|
||||||
|
exit 3;
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "In ${TMPDIR}/fixes:"
|
||||||
|
cat "${TMPDIR}/fixes"
|
||||||
|
|
||||||
|
printf "\nChecking for duplicates...";
|
||||||
|
if uniq -d "${TMPDIR}/fixes4" | grep 'JDK' > "${TMPDIR}/dupes"; then
|
||||||
|
printf "found.\nWARNING: Review the following duplicates:\n";
|
||||||
|
cat "${TMPDIR}/dupes";
|
||||||
|
else
|
||||||
|
echo "No apparent duplicates.";
|
||||||
|
fi
|
||||||
|
rm -f "${TMPDIR}/fixes4";
|
||||||
|
|
||||||
|
printf "\nChecking for backouts...";
|
||||||
|
if grep -i 'backout' "${TMPDIR}/fixes" > "${TMPDIR}/backouts"; then
|
||||||
|
printf "found.\nWARNING: Review the following backouts:\n"
|
||||||
|
cat "${TMPDIR}/backouts";
|
||||||
|
else
|
||||||
|
echo "No apparent backouts.";
|
||||||
|
fi
|
||||||
|
printf "\nChecking for bundled library updates...";
|
||||||
|
if grep -iE ':( \(tz\))? update.*(freetype|gif|harfbuzz|lcms|jpeg|png|timezone|zlib)' "${TMPDIR}/fixes" > "${TMPDIR}/bundles"; then
|
||||||
|
printf "found.\nWARNING: Review the following with respect to bundled provides:\n";
|
||||||
|
cat "${TMPDIR}/bundles";
|
||||||
|
echo "Compare the output of $(dirname "${0}")/get_bundle_versions.sh with the RPM using the JDK source tree"
|
||||||
|
else
|
||||||
|
echo "No apparent library updates.";
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Local Variables:
|
||||||
|
# compile-command: "shellcheck openjdk_news.sh"
|
||||||
|
# fill-column: 80
|
||||||
|
# indent-tabs-mode: nil
|
||||||
|
# sh-basic-offset: 4
|
||||||
|
# End:
|
||||||
2
sources
Normal file
2
sources
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
|
||||||
|
SHA512 (openjdk-21.0.8+9.tar.xz) = 81be6d151fdca910fbee9ea1a93b20af037d2dbafeb12fa368a6091096a22dcf997cf419bebe0261f016ce0fe1e74acd4fca54ca0840a3d69ad76ae7a1336e4c
|
||||||
21
tests/tests.yml
Normal file
21
tests/tests.yml
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
---
|
||||||
|
- hosts: localhost
|
||||||
|
roles:
|
||||||
|
- role: standard-test-source
|
||||||
|
tags:
|
||||||
|
- always
|
||||||
|
- role: standard-test-basic
|
||||||
|
tags:
|
||||||
|
- classic
|
||||||
|
- atomic
|
||||||
|
required_packages:
|
||||||
|
- java-21-openjdk-devel
|
||||||
|
tests:
|
||||||
|
- javaVersion1:
|
||||||
|
dir: ~
|
||||||
|
run: set -ex; useradd franta1; su franta1 -c 'java -version';
|
||||||
|
run: set -ex; useradd franta4; su franta4 -c 'javac -version';
|
||||||
|
run: ls -l /usr/lib/jvm;
|
||||||
|
- javaVersion2:
|
||||||
|
dir: ~
|
||||||
|
run: set -ex; useradd franta2; su franta2 -c 'java --version'
|
||||||
Loading…
Reference in New Issue
Block a user