Compare commits
3 Commits
c9s
...
imports/c8
| Author | SHA1 | Date | |
|---|---|---|---|
|
e99c73402f | ||
|
|
e103f0d4f9 | ||
|
|
726bc53b0f |
30
.gitignore
vendored
30
.gitignore
vendored
@ -1,28 +1,2 @@
|
||||
/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
|
||||
SOURCES/openjdk-21.0.2+13.tar.xz
|
||||
SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
|
||||
|
||||
2
.java-21-openjdk.metadata
Normal file
2
.java-21-openjdk.metadata
Normal file
@ -0,0 +1,2 @@
|
||||
0768105cb0e64a986b767cde0dabad6cafc76c6b SOURCES/openjdk-21.0.2+13.tar.xz
|
||||
c8281ee37b77d535c9c1af86609a531958ff7b34 SOURCES/tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz
|
||||
@ -116,7 +116,7 @@ index 00000000000..f48fc7f7e80
|
||||
+ AC_SUBST(NSS_LIBDIR)
|
||||
+])
|
||||
diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4
|
||||
index 51d4f724c33..feb0bcf3e75 100644
|
||||
index a1fc81564b1..ebad69d9dcf 100644
|
||||
--- a/make/autoconf/libraries.m4
|
||||
+++ b/make/autoconf/libraries.m4
|
||||
@@ -35,6 +35,7 @@ m4_include([lib-std.m4])
|
||||
@ -127,7 +127,7 @@ index 51d4f724c33..feb0bcf3e75 100644
|
||||
|
||||
################################################################################
|
||||
# Determine which libraries are needed for this configuration
|
||||
@@ -128,6 +129,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
|
||||
@@ -134,6 +135,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
|
||||
LIB_SETUP_X11
|
||||
|
||||
LIB_TESTS_SETUP_GTEST
|
||||
@ -136,10 +136,10 @@ index 51d4f724c33..feb0bcf3e75 100644
|
||||
BASIC_JDKLIB_LIBS=""
|
||||
BASIC_JDKLIB_LIBS_TARGET=""
|
||||
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
|
||||
index f6def153c82..4d7abc33427 100644
|
||||
index 0f85917814e..9419562b654 100644
|
||||
--- a/make/autoconf/spec.gmk.in
|
||||
+++ b/make/autoconf/spec.gmk.in
|
||||
@@ -873,6 +873,11 @@ INSTALL_SYSCONFDIR=@sysconfdir@
|
||||
@@ -867,6 +867,11 @@ INSTALL_SYSCONFDIR=@sysconfdir@
|
||||
# Libraries
|
||||
#
|
||||
|
||||
@ -2959,7 +2959,7 @@ index 00000000000..f8d505ca815
|
||||
+}
|
||||
\ No newline at end of file
|
||||
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
|
||||
index c3b412885a6..0e7ce73b158 100644
|
||||
index 6b26297b1b4..7ee5e07756c 100644
|
||||
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
|
||||
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/P11Key.java
|
||||
@@ -37,6 +37,8 @@ import javax.crypto.*;
|
||||
@ -2981,21 +2981,20 @@ index c3b412885a6..0e7ce73b158 100644
|
||||
private static final String PUBLIC = "public";
|
||||
private static final String PRIVATE = "private";
|
||||
private static final String SECRET = "secret";
|
||||
@@ -401,9 +406,10 @@ abstract class P11Key implements Key, Length {
|
||||
@@ -401,8 +406,10 @@ abstract class P11Key implements Key, Length {
|
||||
new CK_ATTRIBUTE(CKA_EXTRACTABLE),
|
||||
});
|
||||
|
||||
- boolean keySensitive =
|
||||
- (attrs[0].getBoolean() && P11Util.isNSS(session.token)) ||
|
||||
- attrs[1].getBoolean() || !attrs[2].getBoolean();
|
||||
- boolean keySensitive = (attrs[0].getBoolean() ||
|
||||
- attrs[1].getBoolean() || !attrs[2].getBoolean());
|
||||
+ boolean exportable = plainKeySupportEnabled && !algorithm.equals("DH");
|
||||
+ boolean keySensitive = (!exportable &&
|
||||
+ ((attrs[0].getBoolean() && P11Util.isNSS(session.token)) ||
|
||||
+ (attrs[0].getBoolean() ||
|
||||
+ attrs[1].getBoolean() || !attrs[2].getBoolean()));
|
||||
|
||||
return switch (algorithm) {
|
||||
case "RSA" -> P11RSAPrivateKeyInternal.of(session, keyID, algorithm,
|
||||
@@ -455,7 +461,8 @@ abstract class P11Key implements Key, Length {
|
||||
@@ -454,7 +461,8 @@ abstract class P11Key implements Key, Length {
|
||||
|
||||
public String getFormat() {
|
||||
token.ensureValid();
|
||||
@ -3005,7 +3004,7 @@ index c3b412885a6..0e7ce73b158 100644
|
||||
return null;
|
||||
} else {
|
||||
return "RAW";
|
||||
@@ -1625,4 +1632,3 @@ final class SessionKeyRef extends PhantomReference<P11Key> {
|
||||
@@ -1624,4 +1632,3 @@ final class SessionKeyRef extends PhantomReference<P11Key> {
|
||||
this.clear();
|
||||
}
|
||||
}
|
||||
@ -3205,7 +3204,7 @@ index 5cd6828d293..bae49c4e8a9 100644
|
||||
debug.println("logout succeeded");
|
||||
}
|
||||
diff --git a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java
|
||||
index a6f5f0a8764..9a07c96ca4e 100644
|
||||
index 3378409ca1c..7602a92a252 100644
|
||||
--- a/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java
|
||||
+++ b/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11/Token.java
|
||||
@@ -33,6 +33,7 @@ import java.lang.ref.*;
|
||||
@ -24,8 +24,7 @@
|
||||
# Enable static library builds by default.
|
||||
%bcond_without staticlibs
|
||||
# Build a fresh libjvm.so for use in a copy of the bootstrap JDK
|
||||
# Turned off until 21.0.5+1 or higher is in the buildroot
|
||||
%bcond_with fresh_libjvm
|
||||
%bcond_without fresh_libjvm
|
||||
# Build with system libraries
|
||||
%bcond_with system_libs
|
||||
|
||||
@ -151,8 +150,6 @@
|
||||
%else
|
||||
%global gdb_arches %{jit_arches} %{zero_arches}
|
||||
%endif
|
||||
# Architecture on which we run Java only tests
|
||||
%global jdk_test_arch x86_64
|
||||
|
||||
# By default, we build a slowdebug build during main build on JIT architectures
|
||||
%if %{with slowdebug}
|
||||
@ -317,7 +314,7 @@
|
||||
# New Version-String scheme-style defines
|
||||
%global featurever 21
|
||||
%global interimver 0
|
||||
%global updatever 5
|
||||
%global updatever 2
|
||||
%global patchver 0
|
||||
# buildjdkver is usually same as %%{featurever},
|
||||
# but in time of bootstrap of next jdk, it is featurever-1,
|
||||
@ -367,7 +364,7 @@
|
||||
# Define IcedTea version used for SystemTap tapsets and desktop file
|
||||
%global icedteaver 6.0.0pre00-c848b93a8598
|
||||
# Define current Git revision for the FIPS support patches
|
||||
%global fipsver 0a42e29b391
|
||||
%global fipsver 75ffdc48eda
|
||||
# Define JDK versions
|
||||
%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
|
||||
%global javaver %{featurever}
|
||||
@ -381,7 +378,7 @@
|
||||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{vcstag}
|
||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||
%global buildver 11
|
||||
%global buildver 13
|
||||
%global rpmrelease 1
|
||||
#%%global tagsuffix %%{nil}
|
||||
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
|
||||
@ -653,6 +650,10 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch
|
||||
#
|
||||
#############################################
|
||||
|
||||
# JDK-8009550, RH910107: Depend on pcsc-lite-libs instead of pcsc-lite-devel as this is only in optional repo
|
||||
# PR: https://github.com/openjdk/jdk/pull/15409
|
||||
Patch6: jdk8009550-rh910107-fail_to_load_pcsc_library.patch
|
||||
|
||||
# Currently empty
|
||||
|
||||
#############################################
|
||||
@ -708,12 +709,8 @@ BuildRequires: java-%{buildjdkver}-%{origin}%{?pkgos:-%{pkgos}}-devel
|
||||
%ifarch %{zero_arches}
|
||||
BuildRequires: libffi-devel
|
||||
%endif
|
||||
# Full documentation build requirements
|
||||
# pandoc is not available on RHEL 7
|
||||
%if 0%{?rhel} >= 8
|
||||
BuildRequires: graphviz
|
||||
BuildRequires: pandoc
|
||||
%endif
|
||||
# 2023c required as of JDK-8305113
|
||||
BuildRequires: tzdata-java >= 2023c
|
||||
# cacerts build requirement in portable mode
|
||||
BuildRequires: ca-certificates
|
||||
# Earlier versions have a bug in tree vectorization on PPC
|
||||
@ -731,22 +728,19 @@ BuildRequires: harfbuzz-devel
|
||||
BuildRequires: lcms2-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: zlib-devel
|
||||
%else
|
||||
# Version in src/java.desktop/share/legal/freetype.md
|
||||
Provides: bundled(freetype) = 2.13.2
|
||||
Provides: bundled(freetype) = 2.13.0
|
||||
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
|
||||
Provides: bundled(giflib) = 5.2.2
|
||||
Provides: bundled(giflib) = 5.2.1
|
||||
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
|
||||
Provides: bundled(harfbuzz) = 8.2.2
|
||||
# Version in src/java.desktop/share/native/liblcms/lcms2.h
|
||||
Provides: bundled(lcms2) = 2.16.0
|
||||
Provides: bundled(lcms2) = 2.15.0
|
||||
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
|
||||
Provides: bundled(libjpeg) = 6b
|
||||
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
|
||||
Provides: bundled(libpng) = 1.6.43
|
||||
# Version in src/java.base/share/native/libzip/zlib/zlib.h
|
||||
Provides: bundled(zlib) = 1.3.1
|
||||
Provides: bundled(libpng) = 1.6.40
|
||||
# We link statically against libstdc++ to increase portability
|
||||
BuildRequires: libstdc++-static
|
||||
%endif
|
||||
@ -928,7 +922,6 @@ echo "WARNING: The build of a fresh libjvm has been disabled due to a JDK versio
|
||||
echo "Build JDK version is %{buildjdkver}, feature JDK version is %{featurever}"
|
||||
%endif
|
||||
|
||||
export XZ_OPT="-T0"
|
||||
%setup -q -c -n %{uniquesuffix ""} -T -a 0
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1189084
|
||||
prioritylength=`expr length %{priority}`
|
||||
@ -945,22 +938,11 @@ sh %{SOURCE12} %{top_level_dir_name}
|
||||
%endif
|
||||
|
||||
# Patch the JDK
|
||||
# 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 %{top_level_dir_name}
|
||||
# Add crypto policy and FIPS support
|
||||
%patch -P1001 -p1
|
||||
%patch1001 -p1
|
||||
# Patches in need of upstreaming
|
||||
%patch6 -p1
|
||||
popd # openjdk
|
||||
|
||||
|
||||
@ -1015,7 +997,6 @@ export NUM_PROC=${NUM_PROC:-1}
|
||||
# Honor %%_smp_ncpus_max
|
||||
[ ${NUM_PROC} -gt %{?_smp_ncpus_max} ] && export NUM_PROC=%{?_smp_ncpus_max}
|
||||
%endif
|
||||
export XZ_OPT="-T0"
|
||||
|
||||
%ifarch s390x sparc64 alpha %{power64} %{aarch64}
|
||||
export ARCH_DATA_MODEL=64
|
||||
@ -1041,58 +1022,9 @@ EXTRA_CPP_FLAGS="$(echo ${EXTRA_CPP_FLAGS} | sed -e 's|-mstackrealign|-mincoming
|
||||
%endif
|
||||
export EXTRA_CFLAGS EXTRA_CPP_FLAGS
|
||||
|
||||
# Set modification times (mtimes) of files within JAR files generated
|
||||
# by the OpenJDK build to a timestamp that is constant across RPM
|
||||
# rebuilds. OpenJDK provides the --with-source-date configure option
|
||||
# for this purpose. Potential arguments in the RPM build context are:
|
||||
#
|
||||
# A) --with-source-date="${SOURCE_DATE_EPOCH}"
|
||||
# B) --with-source-date=version
|
||||
# C) --with-source-date="${OPENJDK_UPSTREAM_TAG_EPOCH}"
|
||||
#
|
||||
# Consider Option A. Fedora 38 (rpm-4.18.2) and RHEL-8 (rpm-4.14.3)
|
||||
# have different support for SOURCE_DATE_EPOCH. To keep
|
||||
# SOURCE_DATE_EPOCH constant across RPM rebuilds, one could set the
|
||||
# source_date_epoch_from_changelog macro to 1 on both Fedora 38 and
|
||||
# RHEL-8. However, on RHEL-8, this results in the RPM build times
|
||||
# being set to the timestamp of the most recent changelog. This is
|
||||
# bad for tracing when RPMs were actually built. Fedora 38 supports a
|
||||
# better behaviour via the introduction of the
|
||||
# use_source_date_epoch_as_buildtime macro, set to 0 by default.
|
||||
# There is no way to make this work on RHEL-8 as well though, so
|
||||
# option A is suboptimal.
|
||||
#
|
||||
# Option B uses the value of the DEFAULT_VERSION_DATE field from
|
||||
# make/conf/version-numbers.conf. DEFAULT_VERSION_DATE represents the
|
||||
# aspirational eventual JDK general availability (GA) release date.
|
||||
# When the RPM build occurs prior to GA, generated JAR files will have
|
||||
# payload mtimes in the future relative to the RPM build time.
|
||||
# Whereas for tarballs some tools will issue warnings about future
|
||||
# mtimes, per OPENJDK-2583 apparently this is no problem for Java and
|
||||
# JAR files.
|
||||
#
|
||||
# Option C uses the modification timestamp of files in the source
|
||||
# tarball. The reproducibility logic in generate_source_tarball.sh
|
||||
# sets them all to the commit time of the release-tagged OpenJDK
|
||||
# commit, as archived in the tarball. This timestamp is deterministic
|
||||
# across RPM rebuilds and is reliably in the past. Any file's mtime
|
||||
# will do, so use version-numbers.conf's.
|
||||
#
|
||||
# Use option B for JAR files, based on the discussion in OPENJDK-2583.
|
||||
#
|
||||
# For portable tarballs, use option C (OPENJDK_UPSTREAM_TAG_EPOCH) for
|
||||
# the modification times of all files in the portable tarballs. Doing
|
||||
# so eliminates one source of variability across RPM rebuilds.
|
||||
VERSION_FILE="$(pwd)"/"%{top_level_dir_name}"/make/conf/version-numbers.conf
|
||||
OPENJDK_UPSTREAM_TAG_EPOCH="$(stat --format=%Y "${VERSION_FILE}")"
|
||||
|
||||
echo "Building %{SOURCE11}"
|
||||
mkdir -p %{altjavaoutputdir}
|
||||
gcc ${EXTRA_CFLAGS} -o %{altjavaoutputdir}/%{alt_java_name} %{SOURCE11}
|
||||
echo "Generating %{alt_java_name} man page"
|
||||
altjavamanpage=%{altjavaoutputdir}/%{alt_java_name}.1
|
||||
echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > ${altjavamanpage}
|
||||
cat %{top_level_dir_name}/src/java.base/share/man/java.1 >> ${altjavamanpage}
|
||||
|
||||
echo "Building %{newjavaver}-%{buildver}, pre=%{ea_designator}, opt=%{lts_designator}"
|
||||
|
||||
@ -1134,6 +1066,9 @@ function buildjdk() {
|
||||
scl enable devtoolset-%{dtsversion} "bash ${top_dir_abs_src_path}/configure \
|
||||
%ifarch %{zero_arches}
|
||||
--with-jvm-variants=zero \
|
||||
%endif
|
||||
%ifarch %{ppc64le}
|
||||
--with-jobs=1 \
|
||||
%endif
|
||||
--with-cacerts-file=`readlink -f %{_sysconfdir}/pki/java/cacerts` \
|
||||
--with-version-build=%{buildver} \
|
||||
@ -1161,7 +1096,7 @@ function buildjdk() {
|
||||
--with-extra-cflags=\"$EXTRA_CFLAGS\" \
|
||||
--with-extra-ldflags=\"%{ourldflags}\" \
|
||||
--with-num-cores=\"$NUM_PROC\" \
|
||||
--with-source-date=\"version\" \
|
||||
--with-source-date=\"${SOURCE_DATE_EPOCH}\" \
|
||||
--disable-javac-server \
|
||||
%ifarch %{zgc_arches}
|
||||
--with-jvm-features=zgc \
|
||||
@ -1176,22 +1111,18 @@ function buildjdk() {
|
||||
|
||||
function stripjdk() {
|
||||
local outputdir=${1}
|
||||
local jdkimagepath=images/%{jdkimage}
|
||||
local jreimagepath=images/%{jreimage}
|
||||
local jmodimagepath=images/jmods
|
||||
local modulefile=lib/modules
|
||||
local jdkimagepath=${outputdir}/images/%{jdkimage}
|
||||
local jreimagepath=${outputdir}/images/%{jreimage}
|
||||
local jmodimagepath=${outputdir}/images/jmods
|
||||
local supportdir=${outputdir}/support
|
||||
local modulebuildpath=${outputdir}/jdk/modules
|
||||
local jdkoutdir=${outputdir}/${jdkimagepath}
|
||||
local jreoutdir=${outputdir}/${jreimagepath}
|
||||
|
||||
if [ "x$suffix" = "x" ] ; then
|
||||
# Keep the unstripped version for consumption by RHEL RPMs
|
||||
cp -a ${jdkoutdir}{,.unstripped}
|
||||
cp -a ${jdkimagepath}{,.unstripped}
|
||||
|
||||
# Strip the files
|
||||
for file in $(find ${jdkoutdir} ${jreoutdir} ${supportdir} ${modulebuildpath} -type f) ; do
|
||||
if file ${file} | cut -d ':' -f 2 | grep -q 'ELF'; then
|
||||
for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f) ; do
|
||||
if file ${file} | grep -q 'ELF'; then
|
||||
noextfile=${file/.so/};
|
||||
scl enable devtoolset-%{dtsversion} "objcopy --only-keep-debug ${file} ${noextfile}.debuginfo";
|
||||
scl enable devtoolset-%{dtsversion} "objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file}";
|
||||
@ -1204,53 +1135,24 @@ function stripjdk() {
|
||||
echo "Support directory missing.";
|
||||
exit 15
|
||||
fi
|
||||
# Build the java.base jmod a third time to fix the hashes of dependent jmods
|
||||
for cmd in $(find ${supportdir}/${jmodimagepath} -name '*.jmod_exec.cmdline') \
|
||||
${supportdir}/${jmodimagepath}/*java.base*exec.cmdline ; do
|
||||
for cmd in $(find ${supportdir} -name '*.jmod_exec.cmdline') ; do
|
||||
pre=${cmd/_exec/_pre};
|
||||
post=${cmd/_exec/_post};
|
||||
jmod=$(echo ${cmd}|sed 's#.*_create_##'|sed 's#_exec.cmdline##')
|
||||
echo "Rebuilding ${jmod} against stripped binaries...";
|
||||
if [ -e ${pre} ] ; then
|
||||
echo -e "Executing ${pre}...\n$(cat ${pre})";
|
||||
echo "Executing ${pre}...";
|
||||
cat ${pre} | sh -s ;
|
||||
fi
|
||||
echo "Executing ${cmd}...$(cat ${cmd})";
|
||||
echo "Executing ${cmd}...";
|
||||
cat ${cmd} | sh -s ;
|
||||
if [ -e ${post} ] ; then
|
||||
echo -e "Executing ${post}...\n$(cat ${post})";
|
||||
echo "Executing ${post}...";
|
||||
cat ${post} | sh -s ;
|
||||
fi
|
||||
done
|
||||
|
||||
# Rebuild the image with the stripped modules
|
||||
for image in ${jdkimagepath} ${jreimagepath} ; do
|
||||
outdir=${outputdir}/${image};
|
||||
jlink=${supportdir}/${image}/_jlink*_exec.cmdline;
|
||||
# Backup the existing image as it contains
|
||||
# files not generated by jlink
|
||||
mv ${outdir}{,.bak};
|
||||
# Regenerate the image using the command
|
||||
# generated using the initial build
|
||||
echo -e "Executing ${jlink}...\n$(cat ${jlink})";
|
||||
cat ${jlink} | sh -s;
|
||||
# Move the new jmods and module file from the new
|
||||
# image to the old one
|
||||
if [ -e ${outdir}.bak/jmods ] ; then
|
||||
rm -rf ${outdir}.bak/jmods;
|
||||
mv ${outdir}/jmods ${outdir}.bak;
|
||||
fi
|
||||
rm -f ${outdir}.bak/${modulefile};
|
||||
mv ${outdir}/${modulefile} ${outdir}.bak/$(dirname ${modulefile});
|
||||
# Restore the original image
|
||||
rm -rf ${outdir};
|
||||
mv ${outdir}{.bak,};
|
||||
# Update the CDS archives
|
||||
for cmd in ${supportdir}/${image}/*_gen_cds*_exec.cmdline ; do
|
||||
echo -e "Executing ${cmd}...\n$(cat ${cmd})";
|
||||
cat ${cmd} | sh -s;
|
||||
done
|
||||
done
|
||||
rm -rf ${jdkimagepath}/jmods
|
||||
cp -a ${jmodimagepath} ${jdkimagepath}
|
||||
fi
|
||||
}
|
||||
|
||||
@ -1304,6 +1206,13 @@ function installjdk() {
|
||||
# Install local files which are distributed with the JDK
|
||||
install -m 644 %{SOURCE10} ${imagepath}
|
||||
|
||||
# Create fake alt-java as a placeholder for future alt-java
|
||||
pushd ${imagepath}
|
||||
# add alt-java man page
|
||||
echo "Hardened java binary recommended for launching untrusted code from the Web e.g. javaws" > man/man1/%{alt_java_name}.1
|
||||
cat man/man1/java.1 >> man/man1/%{alt_java_name}.1
|
||||
popd
|
||||
|
||||
# Print release information
|
||||
cat ${imagepath}/release
|
||||
fi
|
||||
@ -1323,53 +1232,6 @@ function genchecksum() {
|
||||
popd
|
||||
}
|
||||
|
||||
# Create a reproducible tarball in an appropriate way for
|
||||
# the version of tar in use
|
||||
function createtar() {
|
||||
local directory=${1}
|
||||
local archive=${2}
|
||||
local filter=${3}
|
||||
local transform=${4}
|
||||
local exclude=${5}
|
||||
|
||||
if [ "x${filter}" != "x" ] ; then
|
||||
local filteroption="-name ${filter}";
|
||||
fi
|
||||
if [ "x${transform}" != "x" ] ; then
|
||||
local transoption="--transform ${transform}";
|
||||
fi
|
||||
if [ "x${exclude}" != "x" ] ; then
|
||||
local excludeoption="--exclude=${exclude}";
|
||||
fi
|
||||
|
||||
local common_tar_opts="--owner=0 --group=0 --numeric-owner \
|
||||
${transoption} ${excludeoption} --create --xz"
|
||||
# Capture tar version, removing the decimal point (so 1.28 => 128)
|
||||
tarver=$(tar --version|head -n1|sed -re 's|tar \(GNU tar\) ([0-9]).([0-9]*)|\1\2|')
|
||||
echo "Detected tar ${tarver}"
|
||||
if [ ${tarver} -gt 128 ] ; then
|
||||
local tar_time="$(date --utc --iso-8601=seconds --date=@"${OPENJDK_UPSTREAM_TAG_EPOCH}")"
|
||||
local tar_opts="--mtime=${tar_time} --sort=name ${common_tar_opts}"
|
||||
if test "x${filteroption}" = "x"; then
|
||||
tar ${tar_opts} --file ${archive} ${directory}
|
||||
else
|
||||
tar ${tar_opts} --file ${archive} $(find ${directory} ${filteroption})
|
||||
fi
|
||||
else
|
||||
# See https://reproducible-builds.org/docs/archives/
|
||||
# RHEL-7 has tar 1.26 which does not support --sort=name (added
|
||||
# in 1.28), so use find-piped-through-sort instead. Omit
|
||||
# --pax-option since it made the docs package not reproducible
|
||||
# due to PaxHeaders timestamp differences.
|
||||
local tar_opts="--mtime=@${OPENJDK_UPSTREAM_TAG_EPOCH} \
|
||||
--no-recursion --null --files-from - \
|
||||
${common_tar_opts}"
|
||||
find ${directory} ${filteroption} -print0 | \
|
||||
LC_ALL=C sort -z | \
|
||||
tar ${tar_opts} --file ${archive}
|
||||
fi
|
||||
}
|
||||
|
||||
function packagejdk() {
|
||||
local imagesdir=$(pwd)/${1}/images
|
||||
local docdir=$(pwd)/${1}/images/docs
|
||||
@ -1395,13 +1257,20 @@ function packagejdk() {
|
||||
jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
|
||||
staticname=%{staticlibsportablename -- "$nameSuffix"}
|
||||
staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
|
||||
debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
|
||||
unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
|
||||
# We only use docs for the release build
|
||||
docname=%{docportablename}
|
||||
docarchive=${packagesdir}/%{docportablearchive}
|
||||
built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
|
||||
# These are from the source tree so no debug variants
|
||||
miscname=%{miscportablename}
|
||||
miscarchive=${packagesdir}/%{miscportablearchive}
|
||||
|
||||
if [ "x$suffix" = "x" ] ; then
|
||||
unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
|
||||
|
||||
# Keep the unstripped version for consumption by RHEL RPMs
|
||||
mv %{jdkimage}.unstripped ${jdkname}
|
||||
createtar ${jdkname} ${unstrippedarchive}
|
||||
tar -cJf ${unstrippedarchive} ${jdkname}
|
||||
genchecksum ${unstrippedarchive}
|
||||
mv ${jdkname} %{jdkimage}.unstripped
|
||||
fi
|
||||
@ -1412,22 +1281,13 @@ function packagejdk() {
|
||||
|
||||
# Release images have external debug symbols
|
||||
if [ "x$suffix" = "x" ] ; then
|
||||
debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
|
||||
# We only use docs for the release build
|
||||
docname=%{docportablename}
|
||||
docarchive=${packagesdir}/%{docportablearchive}
|
||||
built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip
|
||||
# These are from the source tree so no debug variants
|
||||
miscname=%{miscportablename}
|
||||
miscarchive=${packagesdir}/%{miscportablearchive}
|
||||
|
||||
createtar ${jdkname} ${debugarchive} \*.debuginfo
|
||||
tar -cJf ${debugarchive} $(find ${jdkname} -name \*.debuginfo)
|
||||
genchecksum ${debugarchive}
|
||||
|
||||
mkdir ${docname}
|
||||
mv ${docdir} ${docname}
|
||||
mv ${bundledir}/${built_doc_archive} ${docname}
|
||||
createtar ${docname} ${docarchive}
|
||||
tar -cJf ${docarchive} ${docname}
|
||||
genchecksum ${docarchive}
|
||||
|
||||
mkdir ${miscname}
|
||||
@ -1437,23 +1297,23 @@ function packagejdk() {
|
||||
%if %{with_systemtap}
|
||||
cp -a ${tapsetdir}* ${miscname}
|
||||
%endif
|
||||
cp -av ${altjavadir}/%{alt_java_name}{,.1} ${miscname}
|
||||
createtar ${miscname} ${miscarchive}
|
||||
cp -av ${altjavadir}/%{alt_java_name} ${miscname}
|
||||
tar -cJf ${miscarchive} ${miscname}
|
||||
genchecksum ${miscarchive}
|
||||
fi
|
||||
|
||||
createtar ${jdkname} ${jdkarchive} "" "" "**.debuginfo"
|
||||
tar -cJf ${jdkarchive} --exclude='**.debuginfo' ${jdkname}
|
||||
genchecksum ${jdkarchive}
|
||||
|
||||
createtar ${jrename} ${jrearchive} "" "" "**.debuginfo"
|
||||
tar -cJf ${jrearchive} --exclude='**.debuginfo' ${jrename}
|
||||
genchecksum ${jrearchive}
|
||||
|
||||
%if %{include_staticlibs}
|
||||
# Static libraries (needed for building graal vm with native image)
|
||||
# Tar as overlay. Transform to the JDK name, since we just want to "add"
|
||||
# static libraries to that folder
|
||||
createtar "%{static_libs_image}/lib" ${staticarchive} "" \
|
||||
"s|^%{static_libs_image}/lib/*|${staticname}/lib/static/linux-%{archinstall}/glibc/|"
|
||||
tar -cJf ${staticarchive} \
|
||||
--transform "s|^%{static_libs_image}/lib/*|${staticname}/lib/static/linux-%{archinstall}/glibc/|" "%{static_libs_image}/lib"
|
||||
genchecksum ${staticarchive}
|
||||
%endif
|
||||
|
||||
@ -1557,12 +1417,9 @@ export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage}
|
||||
|
||||
# Check Shenandoah is enabled
|
||||
%if %{use_shenandoah_hotspot}
|
||||
$JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -version
|
||||
$JAVA_HOME//bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -version
|
||||
%endif
|
||||
|
||||
# Only test on one architecture (the fastest) for Java only tests
|
||||
%ifarch %{jdk_test_arch}
|
||||
|
||||
# Check unlimited policy has been used
|
||||
$JAVA_HOME/bin/javac -d . %{SOURCE13}
|
||||
$JAVA_HOME/bin/java --add-opens java.base/javax.crypto=ALL-UNNAMED TestCryptoLevel
|
||||
@ -1585,36 +1442,6 @@ $JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -versi
|
||||
$JAVA_HOME/bin/javac -d . %{SOURCE16}
|
||||
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
|
||||
|
||||
%if ! 0%{?flatpak}
|
||||
# Check translations are available for new timezones (during flatpak builds, the
|
||||
# tzdb.dat used by this test is not where the test expects it, so this is
|
||||
# disabled for flatpak builds)
|
||||
# Disable test until we are on the latest JDK
|
||||
$JAVA_HOME/bin/javac -d . %{SOURCE18}
|
||||
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
|
||||
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR
|
||||
%endif
|
||||
|
||||
# Check src.zip has all sources. See RHBZ#1130490
|
||||
unzip -l $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe'
|
||||
|
||||
# Check class files include useful debugging information
|
||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep "Compiled from"
|
||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep LineNumberTable
|
||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep LocalVariableTable
|
||||
|
||||
# Check generated class files include useful debugging information
|
||||
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep "Compiled from"
|
||||
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LineNumberTable
|
||||
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
|
||||
|
||||
%else
|
||||
|
||||
# Just run a basic java -version test on other architectures
|
||||
$JAVA_HOME/bin/java -version
|
||||
|
||||
%endif
|
||||
|
||||
# Check java launcher has no SSB mitigation
|
||||
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
|
||||
|
||||
@ -1626,6 +1453,16 @@ nm %{altjavaoutputdir}/%{alt_java_name} | grep prctl
|
||||
if ! nm %{altjavaoutputdir}/%{alt_java_name} | grep prctl ; then true ; else false; fi
|
||||
%endif
|
||||
|
||||
%if ! 0%{?flatpak}
|
||||
# Check translations are available for new timezones (during flatpak builds, the
|
||||
# tzdb.dat used by this test is not where the test expects it, so this is
|
||||
# disabled for flatpak builds)
|
||||
# Disable test until we are on the latest JDK
|
||||
$JAVA_HOME/bin/javac -d . %{SOURCE18}
|
||||
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
|
||||
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR
|
||||
%endif
|
||||
|
||||
%if %{include_staticlibs}
|
||||
# Check debug symbols in static libraries (smoke test)
|
||||
export STATIC_LIBS_HOME=${top_dir_abs_staticlibs_build_path}/images/%{static_libs_image}
|
||||
@ -1706,6 +1543,19 @@ EOF
|
||||
grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
|
||||
%endif
|
||||
|
||||
# Check src.zip has all sources. See RHBZ#1130490
|
||||
unzip -l $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe'
|
||||
|
||||
# Check class files include useful debugging information
|
||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep "Compiled from"
|
||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep LineNumberTable
|
||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep LocalVariableTable
|
||||
|
||||
# Check generated class files include useful debugging information
|
||||
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep "Compiled from"
|
||||
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LineNumberTable
|
||||
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
|
||||
|
||||
# build cycles check
|
||||
done
|
||||
|
||||
@ -1721,10 +1571,12 @@ for suffix in %{build_loop} ; do
|
||||
nameSuffix=`echo "$suffix"| sed s/-/./`
|
||||
fi
|
||||
|
||||
# These definitions should match those in packagejdk
|
||||
# These definitions should match those in installjdk
|
||||
jdkarchive=${packagesdir}/%{jdkportablearchive -- "$nameSuffix"}
|
||||
jrearchive=${packagesdir}/%{jreportablearchive -- "$nameSuffix"}
|
||||
staticarchive=${packagesdir}/%{staticlibsportablearchive -- "$nameSuffix"}
|
||||
debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
|
||||
unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT%{_jvmdir}
|
||||
|
||||
@ -1739,22 +1591,22 @@ for suffix in %{build_loop} ; do
|
||||
%endif
|
||||
|
||||
if [ "x$suffix" = "x" ] ; then
|
||||
# These definitions should match those in packagejdk
|
||||
debugarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.debuginfo"}
|
||||
unstrippedarchive=${packagesdir}/%{jdkportablearchive -- "${nameSuffix}.unstripped"}
|
||||
docarchive=${packagesdir}/%{docportablearchive}
|
||||
miscarchive=${packagesdir}/%{miscportablearchive}
|
||||
|
||||
mv ${debugarchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
mv ${debugarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
mv ${unstrippedarchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
mv ${unstrippedarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
fi
|
||||
done
|
||||
|
||||
# These definitions should match those in installjdk
|
||||
# Install outside the loop as there are no debug variants
|
||||
docarchive=${packagesdir}/%{docportablearchive}
|
||||
miscarchive=${packagesdir}/%{miscportablearchive}
|
||||
|
||||
mv ${docarchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
mv ${docarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
mv ${miscarchive} $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
mv ${miscarchive}.sha256sum $RPM_BUILD_ROOT%{_jvmdir}/
|
||||
fi
|
||||
done
|
||||
|
||||
# To show sha in the build log
|
||||
for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do
|
||||
@ -1773,8 +1625,6 @@ done
|
||||
# placeholder
|
||||
%endif
|
||||
|
||||
%if %{include_normal_build}
|
||||
|
||||
%files devel
|
||||
%{_jvmdir}/%{jdkportablearchive -- %%{nil}}
|
||||
%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
|
||||
@ -1791,16 +1641,6 @@ done
|
||||
%{_jvmdir}/%{jdkportablearchive -- .unstripped}
|
||||
%{_jvmdir}/%{jdkportablearchive -- .unstripped}.sha256sum
|
||||
|
||||
%files docs
|
||||
%{_jvmdir}/%{docportablearchive}
|
||||
%{_jvmdir}/%{docportablearchive}.sha256sum
|
||||
|
||||
%files misc
|
||||
%{_jvmdir}/%{miscportablearchive}
|
||||
%{_jvmdir}/%{miscportablearchive}.sha256sum
|
||||
|
||||
%endif
|
||||
|
||||
%if %{include_debug_build}
|
||||
|
||||
%files slowdebug
|
||||
@ -1837,171 +1677,15 @@ done
|
||||
|
||||
%endif
|
||||
|
||||
%files docs
|
||||
%{_jvmdir}/%{docportablearchive}
|
||||
%{_jvmdir}/%{docportablearchive}.sha256sum
|
||||
|
||||
%files misc
|
||||
%{_jvmdir}/%{miscportablearchive}
|
||||
%{_jvmdir}/%{miscportablearchive}.sha256sum
|
||||
|
||||
%changelog
|
||||
* Wed Oct 16 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.11-1
|
||||
- Update to jdk-21.0.5+11 (GA)
|
||||
- Update release notes to 21.0.5+11
|
||||
- Remove local JDK-8327501 & JDK-8328366 backport as this is now upstream.
|
||||
|
||||
* Sat Oct 12 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.10-1
|
||||
- Update to jdk-21.0.5+10 (GA)
|
||||
- Update release notes to 21.0.5+10
|
||||
- Switch to GA mode.
|
||||
- Revert JDK-8327501 & JDK-8328366 backport until more mature.
|
||||
- ** This tarball is embargoed until 2024-10-15 @ 1pm PT. **
|
||||
- Resolves: OPENJDK-3327
|
||||
- Resolves: OPENJDK-3084
|
||||
|
||||
* Thu Oct 10 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.9-0.1.ea
|
||||
- Update to jdk-21.0.5+9 (EA)
|
||||
- Update release notes to 21.0.5+9
|
||||
|
||||
* Wed Sep 18 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.5-0.1.ea
|
||||
- Update to jdk-21.0.5+5 (EA)
|
||||
- Update release notes to 21.0.5+5
|
||||
|
||||
* Sun Sep 15 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.1-0.1.ea
|
||||
- Update to jdk-21.0.5+1 (EA)
|
||||
- Update release notes to 21.0.5+1
|
||||
- Switch to EA mode
|
||||
- Bump giflib version to 5.2.2 following JDK-8328999
|
||||
- Bump libpng version to 1.6.43 following JDK-8329004
|
||||
- Turn off fresh_libjvm following JDK-8329088 which changes jdk.internal.vm.StackChunk in CDS archive
|
||||
- Add build scripts to repository to ease remembering all CentOS & RHEL targets and options
|
||||
- Make build scripts executable
|
||||
|
||||
* Fri Jul 12 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.4.0.7-1
|
||||
- Update to jdk-21.0.4+7 (GA)
|
||||
- Update release notes to 21.0.4+7
|
||||
- Switch to GA mode.
|
||||
- ** This tarball is embargoed until 2024-07-16 @ 1pm PT. **
|
||||
- Resolves: OPENJDK-2756
|
||||
- Resolves: OPENJDK-3163
|
||||
|
||||
* Wed Jun 26 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.4.0.5-0.1.ea
|
||||
- Update to jdk-21.0.4+5 (EA)
|
||||
- Update release notes to 21.0.4+5
|
||||
- Move unstripped, misc and doc tarball handling into normal build / no suffix blocks
|
||||
- Limit Java only tests to one architecture using jdk_test_arch
|
||||
- Drop unneeded tzdata-java build dependency following 3e3cf8fa2df7bac2f6a60a0ddd596ec39228a3e1
|
||||
- Resolves: OPENJDK-3132
|
||||
- Resolves: OPENJDK-3194
|
||||
- Resolves: OPENJDK-3181
|
||||
- Resolves: OPENJDK-3189
|
||||
|
||||
* Sat Jun 22 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.4.0.1-0.1.ea
|
||||
- Update to jdk-21.0.4+1 (EA)
|
||||
- Update release notes to 21.0.4+1
|
||||
- Switch to EA mode
|
||||
- Bump LCMS 2 version to 2.16.0 following JDK-8321489
|
||||
- Add zlib build requirement or bundled version (1.3.1), depending on system_libs setting
|
||||
- Resolves: OPENJDK-3060
|
||||
- Resolves: OPENJDK-3063
|
||||
|
||||
* Tue Jun 11 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.9-3
|
||||
- Re-run jlink to regenerate the jmods directory and lib/modules with stripped libraries
|
||||
- Rebuild CDS archives against the updated lib/modules
|
||||
- Resolves: OPENJDK-2829
|
||||
|
||||
* Wed May 01 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:21.0.3.0.9-2
|
||||
- createtar: Add exclude option
|
||||
- packagejdk: Exclude debuginfo when creating jdkarchive and jrearchive tarballs
|
||||
- Resolves: OPENJDK-2995
|
||||
|
||||
* Sat Apr 13 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.9-1
|
||||
- Update to jdk-21.0.3+9 (GA)
|
||||
- Update release notes to 21.0.3+9
|
||||
- Switch to GA mode.
|
||||
- Change --with-source-date value to 'version' to match Temurin builds
|
||||
- ** This tarball is embargoed until 2024-04-16 @ 1pm PT. **
|
||||
- Resolves: OPENJDK-2585
|
||||
|
||||
* Thu Apr 04 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.7-0.1.ea
|
||||
- Update to jdk-21.0.3+7 (EA)
|
||||
- Update release notes to 21.0.3+7
|
||||
- Require tzdata 2024a due to upstream inclusion of JDK-8322725
|
||||
- Only require tzdata 2023d for now as 2024a is unavailable in buildroot
|
||||
- Drop JDK-8009550 which is now available upstream
|
||||
- Re-generate FIPS patch against 21.0.3+7 following backport of JDK-8325254
|
||||
|
||||
* Thu Mar 21 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.1-0.2.ea
|
||||
- generate_source_tarball.sh: Update examples in header for clarity
|
||||
- generate_source_tarball.sh: Cleanup message issued when checkout already exists
|
||||
- generate_source_tarball.sh: Create directory in TMPDIR when using WITH_TEMP
|
||||
- generate_source_tarball.sh: Only add --depth=1 on non-local repositories
|
||||
- icedtea_sync.sh: Reinstate from rhel-8.9.0 branch
|
||||
- Move maintenance scripts to a scripts subdirectory
|
||||
- discover_trees.sh: Set compile-command and indentation instructions for Emacs
|
||||
- discover_trees.sh: shellcheck: Do not use -o (SC2166)
|
||||
- discover_trees.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268)
|
||||
- discover_trees.sh: shellcheck: Double-quote variable references (SC2086)
|
||||
- generate_source_tarball.sh: Add authorship
|
||||
- icedtea_sync.sh: Set compile-command and indentation instructions for Emacs
|
||||
- icedtea_sync.sh: shellcheck: Double-quote variable references (SC2086)
|
||||
- icedtea_sync.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268)
|
||||
- openjdk_news.sh: Set compile-command and indentation instructions for Emacs
|
||||
- openjdk_news.sh: shellcheck: Double-quote variable references (SC2086)
|
||||
- openjdk_news.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268)
|
||||
- openjdk_news.sh: shellcheck: Remove deprecated egrep usage (SC2196)
|
||||
- generate_source_tarball.sh: Output values of new options WITH_TEMP and OPENJDK_LATEST
|
||||
- generate_source_tarball.sh: Double-quote DEPTH reference (SC2086)
|
||||
- Vary reproducible tar creation by version of tar detected
|
||||
- Set OPENJDK_UPSTREAM_TAG_EPOCH & VERSION_FILE at start of build section as in 17u
|
||||
- generate_source_tarball.sh: Avoid empty DEPTH reference while still appeasing shellcheck
|
||||
|
||||
* Wed Mar 20 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:21.0.3.0.1-0.2.ea
|
||||
- generate_source_tarball.sh: Add WITH_TEMP environment variable
|
||||
- generate_source_tarball.sh: Multithread xz on all available cores
|
||||
- generate_source_tarball.sh: Add OPENJDK_LATEST environment variable
|
||||
- generate_source_tarball.sh: Update comment about tarball naming
|
||||
- generate_source_tarball.sh: Reformat comment header
|
||||
- generate_source_tarball.sh: Reformat and update help output
|
||||
- generate_source_tarball.sh: Do a shallow clone, for speed
|
||||
- generate_source_tarball.sh: Append -ea designator when required
|
||||
- generate_source_tarball.sh: Eliminate some removal prompting
|
||||
- generate_source_tarball.sh: Make tarball reproducible
|
||||
- generate_source_tarball.sh: Prefix temporary directory with temp-
|
||||
- generate_source_tarball.sh: Remove temporary directory exit conditions
|
||||
- generate_source_tarball.sh: Fix -ea logic to add dash
|
||||
- generate_source_tarball.sh: Set compile-command in Emacs
|
||||
- generate_source_tarball.sh: Remove REPO_NAME from FILE_NAME_ROOT
|
||||
- generate_source_tarball.sh: Move PROJECT_NAME and REPO_NAME checks
|
||||
- generate_source_tarball.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268)
|
||||
- generate_source_tarball.sh: shellcheck: Double-quote variable references (SC2086)
|
||||
- generate_source_tarball.sh: shellcheck: Do not use -a (SC2166)
|
||||
- generate_source_tarball.sh: shellcheck: Do not use $ on arithmetic variables (SC2004)
|
||||
- Use backward-compatible patch syntax
|
||||
- generate_source_tarball.sh: Ignore -ga tags with OPENJDK_LATEST
|
||||
- generate_source_tarball.sh: Fix whitespace
|
||||
- generate_source_tarball.sh: Remove trailing period in echo
|
||||
- generate_source_tarball.sh: Use long-style argument to grep
|
||||
- generate_source_tarball.sh: Add license
|
||||
- generate_source_tarball.sh: Add indentation instructions for Emacs
|
||||
- Remove -T0 argument from systemtap tar invocation
|
||||
|
||||
* Mon Mar 11 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.1-0.2.ea
|
||||
- Introduce tar_opts to avoid repetition of lengthy tar creation options
|
||||
- Add module build path to stripped directories to catch jpackageapplauncher files
|
||||
- Move alt-java man page to the misc tarball so it is not in the JDK image
|
||||
- Resolves: OPENJDK-2820
|
||||
- Resolves: OPENJDK-2821
|
||||
|
||||
* Thu Feb 08 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:21.0.3.0.1-0.2.ea
|
||||
- Invoke xz in multi-threaded mode
|
||||
- Remove ppc64le with-jobs=1 workaround
|
||||
- Make portable tarball modification times reproducible
|
||||
- Use RHEL-7 tar-1.26-compatible invocations for reproducible tarballs
|
||||
|
||||
* Fri Feb 02 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.1-0.1.ea
|
||||
- Update to jdk-21.0.3+1 (EA)
|
||||
- Update release notes to 21.0.3+1
|
||||
- Switch to EA mode
|
||||
- Require tzdata 2023d due to upstream inclusion of JDK-8322725
|
||||
- Bump FreeType version to 2.13.2 following JDK-8316028
|
||||
|
||||
* Sat Jan 27 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.2.0.13-2
|
||||
- Sync with upstream release notes
|
||||
|
||||
* Tue Jan 09 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.2.0.13-1
|
||||
- Update to jdk-21.0.2+13 (GA)
|
||||
- Update release notes to 21.0.2+13
|
||||
125
SOURCES/jdk8009550-rh910107-fail_to_load_pcsc_library.patch
Normal file
125
SOURCES/jdk8009550-rh910107-fail_to_load_pcsc_library.patch
Normal file
@ -0,0 +1,125 @@
|
||||
commit d0523302416bc6507696f20d1068f16427bcf6b8
|
||||
Author: Andrew Hughes <gnu.andrew@redhat.com>
|
||||
Date: Thu Aug 24 01:23:49 2023 +0100
|
||||
|
||||
8009550: PlatformPCSC should load versioned so
|
||||
|
||||
diff --git a/src/java.base/share/classes/sun/security/util/Debug.java b/src/java.base/share/classes/sun/security/util/Debug.java
|
||||
index bff273c6548..e5a6b288ff8 100644
|
||||
--- a/src/java.base/share/classes/sun/security/util/Debug.java
|
||||
+++ b/src/java.base/share/classes/sun/security/util/Debug.java
|
||||
@@ -81,6 +81,7 @@ public static void Help()
|
||||
System.err.println("logincontext login context results");
|
||||
System.err.println("jca JCA engine class debugging");
|
||||
System.err.println("keystore KeyStore debugging");
|
||||
+ System.err.println("pcsc Smartcard library debugging");
|
||||
System.err.println("policy loading and granting");
|
||||
System.err.println("provider security provider debugging");
|
||||
System.err.println("pkcs11 PKCS11 session manager debugging");
|
||||
diff --git a/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
|
||||
index bacff32efbc..d9f605ada1e 100644
|
||||
--- a/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
|
||||
+++ b/src/java.smartcardio/unix/classes/sun/security/smartcardio/PlatformPCSC.java
|
||||
@@ -1,5 +1,6 @@
|
||||
/*
|
||||
* Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * Copyright (c) 2023, Red Hat Inc. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@@ -46,8 +47,13 @@ class PlatformPCSC {
|
||||
|
||||
private static final String PROP_NAME = "sun.security.smartcardio.library";
|
||||
|
||||
- private static final String LIB1 = "/usr/$LIBISA/libpcsclite.so";
|
||||
- private static final String LIB2 = "/usr/local/$LIBISA/libpcsclite.so";
|
||||
+ private static final String[] LIB_TEMPLATES = { "/usr/$LIBISA/libpcsclite.so",
|
||||
+ "/usr/local/$LIBISA/libpcsclite.so",
|
||||
+ "/usr/lib/$ARCH-linux-gnu/libpcsclite.so",
|
||||
+ "/usr/lib/arm-linux-gnueabi/libpcsclite.so",
|
||||
+ "/usr/lib/arm-linux-gnueabihf/libpcsclite.so",
|
||||
+ "/usr/lib/$ARCH-kfreebsd-gnu/libpcsclite.so" };
|
||||
+ private static final String[] LIB_SUFFIXES = { ".1", ".0", "" };
|
||||
private static final String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC";
|
||||
|
||||
PlatformPCSC() {
|
||||
@@ -73,23 +79,38 @@ public Throwable run() {
|
||||
});
|
||||
|
||||
// expand $LIBISA to the system specific directory name for libraries
|
||||
+ // expand $ARCH to the Debian system architecture in use
|
||||
private static String expand(String lib) {
|
||||
int k = lib.indexOf("$LIBISA");
|
||||
- if (k == -1) {
|
||||
- return lib;
|
||||
+ if (k != -1) {
|
||||
+ String libDir;
|
||||
+ if ("64".equals(System.getProperty("sun.arch.data.model"))) {
|
||||
+ // assume Linux convention
|
||||
+ libDir = "lib64";
|
||||
+ } else {
|
||||
+ // must be 32-bit
|
||||
+ libDir = "lib";
|
||||
+ }
|
||||
+ lib = lib.replace("$LIBISA", libDir);
|
||||
}
|
||||
- String s1 = lib.substring(0, k);
|
||||
- String s2 = lib.substring(k + 7);
|
||||
- String libDir;
|
||||
- if ("64".equals(System.getProperty("sun.arch.data.model"))) {
|
||||
- // assume Linux convention
|
||||
- libDir = "lib64";
|
||||
- } else {
|
||||
- // must be 32-bit
|
||||
- libDir = "lib";
|
||||
+
|
||||
+ k = lib.indexOf("$ARCH");
|
||||
+ if (k != -1) {
|
||||
+ String arch = System.getProperty("os.arch");
|
||||
+ lib = lib.replace("$ARCH", getDebianArchitecture(arch));
|
||||
}
|
||||
- String s = s1 + libDir + s2;
|
||||
- return s;
|
||||
+
|
||||
+ return lib;
|
||||
+ }
|
||||
+
|
||||
+ private static String getDebianArchitecture(String jdkArch) {
|
||||
+ return switch (jdkArch) {
|
||||
+ case "amd64" -> "x86_64";
|
||||
+ case "ppc" -> "powerpc";
|
||||
+ case "ppc64" -> "powerpc64";
|
||||
+ case "ppc64le" -> "powerpc64le";
|
||||
+ default -> jdkArch;
|
||||
+ };
|
||||
}
|
||||
|
||||
private static String getLibraryName() throws IOException {
|
||||
@@ -98,15 +119,18 @@ private static String getLibraryName() throws IOException {
|
||||
if (lib.length() != 0) {
|
||||
return lib;
|
||||
}
|
||||
- lib = expand(LIB1);
|
||||
- if (new File(lib).isFile()) {
|
||||
- // if LIB1 exists, use that
|
||||
- return lib;
|
||||
- }
|
||||
- lib = expand(LIB2);
|
||||
- if (new File(lib).isFile()) {
|
||||
- // if LIB2 exists, use that
|
||||
- return lib;
|
||||
+
|
||||
+ for (String template : LIB_TEMPLATES) {
|
||||
+ for (String suffix : LIB_SUFFIXES) {
|
||||
+ lib = expand(template) + suffix;
|
||||
+ if (debug != null) {
|
||||
+ debug.println("Looking for " + lib);
|
||||
+ }
|
||||
+ if (new File(lib).isFile()) {
|
||||
+ // if library exists, use that
|
||||
+ return lib;
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
// As of macos 11, framework libraries have been removed from the file
|
||||
@ -142,8 +142,6 @@
|
||||
%global svml_arches x86_64
|
||||
# Set of architectures where we verify backtraces with gdb
|
||||
%global gdb_arches %{jit_arches} %{zero_arches}
|
||||
# Architecture on which we run Java only tests
|
||||
%global jdk_test_arch x86_64
|
||||
|
||||
# By default, we build a debug build during main build on JIT architectures
|
||||
%if %{with slowdebug}
|
||||
@ -222,13 +220,7 @@
|
||||
%global hotspot_target hotspot
|
||||
|
||||
# debugedit tool for rewriting ELF file paths
|
||||
%if 0%{?rhel} >= 10
|
||||
# From RHEL 10, the tool is in its own package installed in the usual location
|
||||
%global debugedit %{_bindir}/debugedit
|
||||
%else
|
||||
# On earlier versions of RHEL, it is part of the rpm package
|
||||
%global debugedit %{_rpmconfigdir}/debugedit
|
||||
%endif
|
||||
|
||||
# Filter out flags from the optflags macro that cause problems with the OpenJDK build
|
||||
# We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2
|
||||
@ -308,7 +300,7 @@
|
||||
# New Version-String scheme-style defines
|
||||
%global featurever 21
|
||||
%global interimver 0
|
||||
%global updatever 5
|
||||
%global updatever 2
|
||||
%global patchver 0
|
||||
# We don't add any LTS designator for STS packages (Fedora and EPEL).
|
||||
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
|
||||
@ -344,7 +336,7 @@
|
||||
# Define IcedTea version used for SystemTap tapsets and desktop file
|
||||
%global icedteaver 6.0.0pre00-c848b93a8598
|
||||
# Define current Git revision for the FIPS support patches
|
||||
%global fipsver 0a42e29b391
|
||||
%global fipsver 75ffdc48eda
|
||||
# Define JDK versions
|
||||
%global newjavaver %{featurever}.%{interimver}.%{updatever}.%{patchver}
|
||||
%global javaver %{featurever}
|
||||
@ -353,28 +345,16 @@
|
||||
# The tag used to create the OpenJDK tarball
|
||||
%global vcstag jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}
|
||||
|
||||
# Define the OS the portable JDK is built on
|
||||
# This is undefined for CentOS & openjdk-portable-rhel-8 builds and
|
||||
# equals 'rhel7' for openjdk-portable-rhel-7 builds
|
||||
%if 0%{?centos} == 0
|
||||
%global pkgos rhel7
|
||||
%endif
|
||||
|
||||
# Standard JPackage naming and versioning defines
|
||||
%global origin openjdk
|
||||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{vcstag}
|
||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||
%global buildver 11
|
||||
%global rpmrelease 2
|
||||
%global buildver 13
|
||||
%global rpmrelease 1
|
||||
# Settings used by the portable build
|
||||
%global portablerelease 1
|
||||
# Portable suffix differs between RHEL and CentOS
|
||||
%if 0%{?centos} == 0
|
||||
%global portablesuffix %{?pkgos:el7_9}%{!?pkgos:el8}
|
||||
%else
|
||||
%global portablesuffix el9
|
||||
%endif
|
||||
%global portablesuffix el7_9
|
||||
%global portablebuilddir /builddir/build/BUILD
|
||||
|
||||
# Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
|
||||
@ -1121,6 +1101,9 @@ exit 0
|
||||
%endif
|
||||
}
|
||||
|
||||
# x86 is not supported by OpenJDK 17
|
||||
ExcludeArch: %{ix86}
|
||||
|
||||
# not-duplicated requires/provides/obsoletes for normal/debug packages
|
||||
%define java_rpo() %{expand:
|
||||
Requires: fontconfig%{?_isa}
|
||||
@ -1157,8 +1140,8 @@ Requires: ca-certificates
|
||||
# Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros
|
||||
Requires: javapackages-filesystem
|
||||
# Require zone-info data provided by tzdata-java sub-package
|
||||
# 2024a required as of JDK-8325150
|
||||
Requires: tzdata-java >= 2024a
|
||||
# 2023c required as of JDK-8305113
|
||||
Requires: tzdata-java >= 2023c
|
||||
# for support of kernel stream control
|
||||
# libsctp.so.1 is being `dlopen`ed on demand
|
||||
Requires: lksctp-tools%{?_isa}
|
||||
@ -1166,7 +1149,7 @@ Requires: lksctp-tools%{?_isa}
|
||||
# tool to copy jdk's configs - should be Recommends only, but then only dnf/yum enforce it,
|
||||
# not rpm transaction and so no configs are persisted when pure rpm -u is run. It may be
|
||||
# considered as regression
|
||||
Requires: copy-jdk-configs >= 4.0
|
||||
Requires: copy-jdk-configs >= 3.3
|
||||
OrderWithRequires: copy-jdk-configs
|
||||
%endif
|
||||
# for printing support
|
||||
@ -1279,12 +1262,11 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
|
||||
|
||||
# Prevent brp-java-repack-jars from being run
|
||||
%global __jar_repack 0
|
||||
# Define the OS the portable JDK is built on
|
||||
%global pkgos rhel7
|
||||
# Define the root name of the portable packages
|
||||
%global pkgnameroot java-%{featurever}-%{origin}-portable%{?pkgos:-%{pkgos}}
|
||||
|
||||
# Define the architectures on which we build
|
||||
ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64
|
||||
|
||||
Name: java-%{javaver}-%{origin}
|
||||
Version: %{newjavaver}.%{buildver}
|
||||
Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
|
||||
@ -1359,7 +1341,6 @@ Source18: TestTranslations.java
|
||||
# Include portable spec and instructions on how to rebuild
|
||||
Source19: README.md
|
||||
Source20: java-%{featurever}-openjdk-portable.specfile
|
||||
Source21: NEWS
|
||||
|
||||
# Setup variables to reference correct sources
|
||||
%global releasezip %{_jvmdir}/%{name}-%{version}-%{prelease}.portable.unstripped.jdk.%{_arch}.tar.xz
|
||||
@ -1421,6 +1402,10 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch
|
||||
#
|
||||
#############################################
|
||||
|
||||
# JDK-8009550, RH910107: Depend on pcsc-lite-libs instead of pcsc-lite-devel as this is only in optional repo
|
||||
# PR: https://github.com/openjdk/jdk/pull/15409
|
||||
Patch6: jdk8009550-rh910107-fail_to_load_pcsc_library.patch
|
||||
|
||||
# Currently empty
|
||||
|
||||
#############################################
|
||||
@ -1442,10 +1427,6 @@ BuildRequires: automake
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: binutils
|
||||
BuildRequires: cups-devel
|
||||
# From RHEL 10, debugedit is in its own package
|
||||
%if 0%{?rhel} >= 10
|
||||
BuildRequires: debugedit
|
||||
%endif
|
||||
BuildRequires: desktop-file-utils
|
||||
# elfutils only are OK for build without AOT
|
||||
BuildRequires: elfutils-devel
|
||||
@ -1486,8 +1467,8 @@ BuildRequires: %{pkgnameroot}-misc = %{epoch}:%{version}-%{prelease}.%{portables
|
||||
%ifarch %{zero_arches}
|
||||
BuildRequires: libffi-devel
|
||||
%endif
|
||||
# 2024a required as of JDK-8325150
|
||||
BuildRequires: tzdata-java >= 2024a
|
||||
# 2023c required as of JDK-8305113
|
||||
BuildRequires: tzdata-java >= 2023c
|
||||
# Earlier versions have a bug in tree vectorization on PPC
|
||||
BuildRequires: gcc >= 4.8.3-8
|
||||
|
||||
@ -1503,22 +1484,19 @@ BuildRequires: harfbuzz-devel
|
||||
BuildRequires: lcms2-devel
|
||||
BuildRequires: libjpeg-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: zlib-devel
|
||||
%else
|
||||
# Version in src/java.desktop/share/legal/freetype.md
|
||||
Provides: bundled(freetype) = 2.13.2
|
||||
Provides: bundled(freetype) = 2.13.0
|
||||
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
|
||||
Provides: bundled(giflib) = 5.2.2
|
||||
Provides: bundled(giflib) = 5.2.1
|
||||
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
|
||||
Provides: bundled(harfbuzz) = 8.2.2
|
||||
# Version in src/java.desktop/share/native/liblcms/lcms2.h
|
||||
Provides: bundled(lcms2) = 2.16.0
|
||||
Provides: bundled(lcms2) = 2.15.0
|
||||
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
|
||||
Provides: bundled(libjpeg) = 6b
|
||||
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
|
||||
Provides: bundled(libpng) = 1.6.43
|
||||
# Version in src/java.base/share/native/libzip/zlib/zlib.h
|
||||
Provides: bundled(zlib) = 1.3.1
|
||||
Provides: bundled(libpng) = 1.6.40
|
||||
%endif
|
||||
|
||||
# this is always built, also during debug-only build
|
||||
@ -1862,7 +1840,6 @@ if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 -a %{includ
|
||||
exit 14
|
||||
fi
|
||||
|
||||
export XZ_OPT="-T0"
|
||||
%setup -q -c -n %{uniquesuffix ""} -T -a 0
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1189084
|
||||
prioritylength=`expr length %{priority}`
|
||||
@ -1879,22 +1856,11 @@ sh %{SOURCE12} %{top_level_dir_name}
|
||||
%endif
|
||||
|
||||
# Patch the JDK
|
||||
# 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 %{top_level_dir_name}
|
||||
# Add crypto policy and FIPS support
|
||||
%patch -P1001 -p1
|
||||
%patch1001 -p1
|
||||
# Patches in need of upstreaming
|
||||
%patch6 -p1
|
||||
popd # openjdk
|
||||
|
||||
|
||||
@ -1951,8 +1917,6 @@ function customisejdk() {
|
||||
fi
|
||||
}
|
||||
|
||||
export XZ_OPT="-T0"
|
||||
|
||||
mkdir -p $(dirname %{installoutputdir})
|
||||
|
||||
docdir=%{installoutputdir -- "-docs"}
|
||||
@ -2030,9 +1994,6 @@ export JAVA_HOME=$(pwd)/%{installoutputdir -- ${suffix}}
|
||||
$JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -version
|
||||
%endif
|
||||
|
||||
# Only test on one architecture (the fastest) for Java only tests
|
||||
%ifarch %{jdk_test_arch}
|
||||
|
||||
# Check unlimited policy has been used
|
||||
$JAVA_HOME/bin/javac -d . %{SOURCE13}
|
||||
$JAVA_HOME/bin/java --add-opens java.base/javax.crypto=ALL-UNNAMED TestCryptoLevel
|
||||
@ -2050,40 +2011,6 @@ $JAVA_HOME/bin/java -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -versi
|
||||
$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} true
|
||||
$JAVA_HOME/bin/java ${SEC_DEBUG} -Djava.security.disableSystemPropertiesFile=true ${PROG} false
|
||||
|
||||
# Check correct vendor values have been set
|
||||
$JAVA_HOME/bin/javac -d . %{SOURCE16}
|
||||
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE16})|sed "s|\.java||") "%{oj_vendor}" "%{oj_vendor_url}" "%{oj_vendor_bug_url}" "%{oj_vendor_version}"
|
||||
|
||||
%if ! 0%{?flatpak}
|
||||
# Check translations are available for new timezones (during flatpak builds, the
|
||||
# tzdb.dat used by this test is not where the test expects it, so this is
|
||||
# disabled for flatpak builds)
|
||||
# Disable test until we are on the latest JDK
|
||||
$JAVA_HOME/bin/javac -d . %{SOURCE18}
|
||||
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
|
||||
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR
|
||||
%endif
|
||||
|
||||
# Check src.zip has all sources. See RHBZ#1130490
|
||||
unzip -l $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe'
|
||||
|
||||
# Check class files include useful debugging information
|
||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep "Compiled from"
|
||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep LineNumberTable
|
||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep LocalVariableTable
|
||||
|
||||
# Check generated class files include useful debugging information
|
||||
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep "Compiled from"
|
||||
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LineNumberTable
|
||||
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
|
||||
|
||||
%else
|
||||
|
||||
# Just run a basic java -version test on other architectures
|
||||
$JAVA_HOME/bin/java -version
|
||||
|
||||
%endif
|
||||
|
||||
# Check java launcher has no SSB mitigation
|
||||
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
|
||||
|
||||
@ -2096,6 +2023,16 @@ nm ${alt_java_binary} | grep prctl
|
||||
if ! nm ${alt_java_binary} | grep prctl ; then true ; else false; fi
|
||||
%endif
|
||||
|
||||
%if ! 0%{?flatpak}
|
||||
# Check translations are available for new timezones (during flatpak builds, the
|
||||
# tzdb.dat used by this test is not where the test expects it, so this is
|
||||
# disabled for flatpak builds)
|
||||
# Disable test until we are on the latest JDK
|
||||
$JAVA_HOME/bin/javac -d . %{SOURCE18}
|
||||
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE18})|sed "s|\.java||") JRE
|
||||
$JAVA_HOME/bin/java -Djava.locale.providers=CLDR $(echo $(basename %{SOURCE18})|sed "s|\.java||") CLDR
|
||||
%endif
|
||||
|
||||
%if %{include_staticlibs}
|
||||
# Check debug symbols in static libraries (smoke test)
|
||||
export STATIC_LIBS_HOME=${JAVA_HOME}/lib/static/linux-%{archinstall}/glibc
|
||||
@ -2170,6 +2107,19 @@ EOF
|
||||
grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
|
||||
%endif
|
||||
|
||||
# Check src.zip has all sources. See RHBZ#1130490
|
||||
unzip -l $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe'
|
||||
|
||||
# Check class files include useful debugging information
|
||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep "Compiled from"
|
||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep LineNumberTable
|
||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep LocalVariableTable
|
||||
|
||||
# Check generated class files include useful debugging information
|
||||
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep "Compiled from"
|
||||
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LineNumberTable
|
||||
$JAVA_HOME/bin/javap -l java.nio.ByteBuffer | grep LocalVariableTable
|
||||
|
||||
# build cycles check
|
||||
done
|
||||
|
||||
@ -2221,8 +2171,6 @@ install -D -p -m 755 ${miscdir}/%{alt_java_name} $RPM_BUILD_ROOT%{jrebindir -- $
|
||||
ln -sf %{sdkdir -- $suffix} %{jrelnk -- $suffix}
|
||||
popd
|
||||
|
||||
# Copy alt-java man page into image so it gets installed with the others
|
||||
cp -a ${miscdir}/%{alt_java_name}.1 ${jdk_image}/man/man1
|
||||
# Install man pages
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_mandir}/man1
|
||||
pushd ${jdk_image}
|
||||
@ -2333,10 +2281,9 @@ else
|
||||
return
|
||||
end
|
||||
end
|
||||
arg = nil ; -- it is better to null the arg up, no meter if they exists or not, and use cjc as module in unified way, instead of relaying on "main" method during require "copy_jdk_configs.lua"
|
||||
cjc = require "copy_jdk_configs.lua"
|
||||
args = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
|
||||
cjc.mainProgram(args)
|
||||
-- run content of included file with fake args
|
||||
arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
|
||||
require "copy_jdk_configs.lua"
|
||||
|
||||
%post
|
||||
%{post_script %{nil}}
|
||||
@ -2532,158 +2479,6 @@ cjc.mainProgram(args)
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Oct 16 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.11-2
|
||||
- Update to jdk-21.0.5+11 (GA)
|
||||
- Update release notes to 21.0.5+11
|
||||
- Remove local JDK-8327501 & JDK-8328366 backport as this is now upstream.
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- Related: RHEL-61344
|
||||
|
||||
* Sun Oct 13 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.10-3
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- ** This tarball is embargoed until 2024-10-15 @ 1pm PT. **
|
||||
- Related: RHEL-61344
|
||||
|
||||
* Sat Oct 12 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.10-2
|
||||
- Update to jdk-21.0.5+10 (GA)
|
||||
- Update release notes to 21.0.5+10
|
||||
- Switch to GA mode.
|
||||
- Revert JDK-8327501 & JDK-8328366 backport until more mature.
|
||||
- ** This tarball is embargoed until 2024-10-15 @ 1pm PT. **
|
||||
- Resolves: RHEL-61344
|
||||
|
||||
* Fri Oct 11 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.5.0.9-0.2.ea
|
||||
- Update to jdk-21.0.5+9 (EA)
|
||||
- Update release notes to 21.0.5+9
|
||||
- Switch to EA mode
|
||||
- Bump giflib version to 5.2.2 following JDK-8328999
|
||||
- Bump libpng version to 1.6.43 following JDK-8329004
|
||||
- Sync with RHEL 7 portable build:
|
||||
- Use ExclusiveArch over ExcludeArch
|
||||
- pkgos definition needs to be early enough to be used in portablesuffix
|
||||
- Make build scripts executable
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- Resolves: RHEL-58797
|
||||
- Resolves: RHEL-17191
|
||||
|
||||
* Mon Oct 07 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.4.0.7-2
|
||||
- Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9')
|
||||
- Handle debugedit being a separate package installed in /usr on RHEL/CentOS 10
|
||||
- Add build scripts to repository to ease remembering all CentOS & RHEL targets and options
|
||||
- Related: RHEL-58797
|
||||
|
||||
* Fri Jul 12 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.4.0.7-1
|
||||
- Update to jdk-21.0.4+7 (GA)
|
||||
- Update release notes to 21.0.4+7
|
||||
- Switch to GA mode.
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- Add missing section headers in NEWS
|
||||
- ** This tarball is embargoed until 2024-07-16 @ 1pm PT. **
|
||||
- Resolves: RHEL-47023
|
||||
|
||||
* Wed Jun 26 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.4.0.5-0.1.ea
|
||||
- Update to jdk-21.0.4+5 (EA)
|
||||
- Update release notes to 21.0.4+5
|
||||
- Limit Java only tests to one architecture using jdk_test_arch
|
||||
- Actually require tzdata 2024a now it is available in the buildroot
|
||||
- Resolves: RHEL-45355
|
||||
- Resolves: RHEL-47395
|
||||
|
||||
* Sat Jun 22 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.4.0.1-0.1.ea
|
||||
- Update to jdk-21.0.4+1 (EA)
|
||||
- Update release notes to 21.0.4+1
|
||||
- Switch to EA mode
|
||||
- Bump LCMS 2 version to 2.16.0 following JDK-8321489
|
||||
- Add zlib build requirement or bundled version (1.3.1), depending on system_libs setting
|
||||
- Restore NEWS file so portable can be rebuilt
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- Related: RHEL-45355
|
||||
- Resolves: RHEL-46029
|
||||
|
||||
* Sun Apr 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.9-1
|
||||
- Update to jdk-21.0.3+9 (GA)
|
||||
- Update release notes to 21.0.3+9
|
||||
- Switch to GA mode.
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- ** This tarball is embargoed until 2024-04-16 @ 1pm PT. **
|
||||
- Resolves: RHEL-32424
|
||||
|
||||
* Sun Apr 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.7-0.1.ea
|
||||
- Update to jdk-21.0.3+7 (EA)
|
||||
- Update release notes to 21.0.3+7
|
||||
- Require tzdata 2024a due to upstream inclusion of JDK-8322725
|
||||
- Only require tzdata 2023d for now as 2024a is unavailable in buildroot
|
||||
- Drop JDK-8009550 which is now available upstream
|
||||
- Re-generate FIPS patch against 21.0.3+7 following backport of JDK-8325254
|
||||
- Resolves: RHEL-30946
|
||||
|
||||
* Sun Apr 14 2024 Thomas Fitzsimmons <fitzsim@redhat.com> - 1:21.0.3.0.1-0.2.ea
|
||||
- Invoke xz in multi-threaded mode
|
||||
- generate_source_tarball.sh: Add WITH_TEMP environment variable
|
||||
- generate_source_tarball.sh: Multithread xz on all available cores
|
||||
- generate_source_tarball.sh: Add OPENJDK_LATEST environment variable
|
||||
- generate_source_tarball.sh: Update comment about tarball naming
|
||||
- generate_source_tarball.sh: Reformat comment header
|
||||
- generate_source_tarball.sh: Reformat and update help output
|
||||
- generate_source_tarball.sh: Do a shallow clone, for speed
|
||||
- generate_source_tarball.sh: Append -ea designator when required
|
||||
- generate_source_tarball.sh: Eliminate some removal prompting
|
||||
- generate_source_tarball.sh: Make tarball reproducible
|
||||
- generate_source_tarball.sh: Prefix temporary directory with temp-
|
||||
- generate_source_tarball.sh: Remove temporary directory exit conditions
|
||||
- generate_source_tarball.sh: Fix -ea logic to add dash
|
||||
- generate_source_tarball.sh: Set compile-command in Emacs
|
||||
- generate_source_tarball.sh: Remove REPO_NAME from FILE_NAME_ROOT
|
||||
- generate_source_tarball.sh: Move PROJECT_NAME and REPO_NAME checks
|
||||
- generate_source_tarball.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268)
|
||||
- generate_source_tarball.sh: shellcheck: Double-quote variable references (SC2086)
|
||||
- generate_source_tarball.sh: shellcheck: Do not use -a (SC2166)
|
||||
- generate_source_tarball.sh: shellcheck: Do not use $ on arithmetic variables (SC2004)
|
||||
- Use backward-compatible patch syntax
|
||||
- generate_source_tarball.sh: Ignore -ga tags with OPENJDK_LATEST
|
||||
- generate_source_tarball.sh: Fix whitespace
|
||||
- generate_source_tarball.sh: Remove trailing period in echo
|
||||
- generate_source_tarball.sh: Use long-style argument to grep
|
||||
- generate_source_tarball.sh: Add license
|
||||
- generate_source_tarball.sh: Add indentation instructions for Emacs
|
||||
- Related: RHEL-30946
|
||||
|
||||
* Sun Apr 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.1-0.2.ea
|
||||
- Install alt-java man page from the misc tarball as it is no longer in the JDK image
|
||||
- generate_source_tarball.sh: Update examples in header for clarity
|
||||
- generate_source_tarball.sh: Cleanup message issued when checkout already exists
|
||||
- generate_source_tarball.sh: Create directory in TMPDIR when using WITH_TEMP
|
||||
- generate_source_tarball.sh: Only add --depth=1 on non-local repositories
|
||||
- Move maintenance scripts to a scripts subdirectory
|
||||
- discover_trees.sh: Set compile-command and indentation instructions for Emacs
|
||||
- discover_trees.sh: shellcheck: Do not use -o (SC2166)
|
||||
- discover_trees.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268)
|
||||
- discover_trees.sh: shellcheck: Double-quote variable references (SC2086)
|
||||
- generate_source_tarball.sh: Add authorship
|
||||
- icedtea_sync.sh: Set compile-command and indentation instructions for Emacs
|
||||
- icedtea_sync.sh: shellcheck: Double-quote variable references (SC2086)
|
||||
- icedtea_sync.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268)
|
||||
- openjdk_news.sh: Set compile-command and indentation instructions for Emacs
|
||||
- openjdk_news.sh: shellcheck: Double-quote variable references (SC2086)
|
||||
- openjdk_news.sh: shellcheck: Remove x-prefixes since we use Bash (SC2268)
|
||||
- openjdk_news.sh: shellcheck: Remove deprecated egrep usage (SC2196)
|
||||
- generate_source_tarball.sh: Output values of new options WITH_TEMP and OPENJDK_LATEST
|
||||
- generate_source_tarball.sh: Double-quote DEPTH reference (SC2086)
|
||||
- generate_source_tarball.sh: Avoid empty DEPTH reference while still appeasing shellcheck
|
||||
- Related: RHEL-30946
|
||||
|
||||
* Sun Apr 14 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.3.0.1-0.1.ea
|
||||
- Update to jdk-21.0.3+1 (EA)
|
||||
- Update release notes to 21.0.3+1
|
||||
- Switch to EA mode
|
||||
- Require tzdata 2023d due to upstream inclusion of JDK-8322725
|
||||
- Bump FreeType version to 2.13.2 following JDK-8316028
|
||||
- Related: RHEL-30946
|
||||
|
||||
* Fri Apr 12 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.2.0.13-2
|
||||
- Define portablesuffix according to whether pkgos is defined or not
|
||||
- Related: RHEL-30946
|
||||
|
||||
* Tue Jan 09 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.2.0.13-1
|
||||
- Update to jdk-21.0.2+13 (GA)
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
@ -2691,16 +2486,17 @@ cjc.mainProgram(args)
|
||||
- Bump HarfBuzz version to 8.2.2 following JDK-8313643
|
||||
- Drop local JDK-8311630 patch which is now upstream
|
||||
- ** This tarball is embargoed until 2024-01-16 @ 1pm PT. **
|
||||
- Resolves: RHEL-20999
|
||||
- Resolves: RHEL-20984
|
||||
|
||||
* Mon Nov 06 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.1.0.12-3
|
||||
- Include JDK-8311630 patch to implement Foreign Function & Memory preview API on s390x
|
||||
- Sync the copy of the portable specfile with the latest update
|
||||
- Resolves: RHEL-16290
|
||||
- Resolves: RHEL-16378
|
||||
|
||||
* Mon Oct 30 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.1.0.12-2
|
||||
- Define pkgnameroot to simplify build requirements and allow '-rhel7' suffix on RHEL
|
||||
- Related: RHEL-12998
|
||||
- Switch to using portable binaries built on RHEL 7
|
||||
- Sync the copy of the portable specfile with the RHEL 7 version
|
||||
- Related: RHEL-12995
|
||||
|
||||
* Fri Oct 27 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.1.0.12-1
|
||||
- Update to jdk-21.0.1.0+12 (GA)
|
||||
@ -2722,21 +2518,21 @@ cjc.mainProgram(args)
|
||||
- Add missing jfr, jpackage and jwebserver alternative ghosts
|
||||
- Move jcmd to the headless package
|
||||
- Revert alt-java binary location to being within the JDK tree
|
||||
- Resolves: RHEL-12998
|
||||
- Resolves: RHEL-14953
|
||||
- Resolves: RHEL-13925
|
||||
- Resolves: RHEL-14957
|
||||
- Related: RHEL-14945
|
||||
- Resolves: RHEL-11321
|
||||
- Resolves: RHEL-14947
|
||||
- Resolves: RHEL-12995
|
||||
- Resolves: RHEL-14952
|
||||
- Resolves: RHEL-14961
|
||||
- Resolves: RHEL-14956
|
||||
- Related: RHEL-14944
|
||||
- Resolves: RHEL-14960
|
||||
- Resolves: RHEL-14950
|
||||
|
||||
* Fri Oct 27 2023 Jiri Vanek <jvanek@redhat.com> - 1:21.0.1.0.12-1
|
||||
- Exclude classes_nocoops.jsa on i686 and arm32
|
||||
- Related: RHEL-14945
|
||||
- Related: RHEL-14944
|
||||
|
||||
* Fri Oct 27 2023 Severin Gehwolf <sgehwolf@redhat.com> - 1:21.0.1.0.12-1
|
||||
- Fix packaging of CDS archives
|
||||
- Resolves: RHEL-14945
|
||||
- Resolves: RHEL-14944
|
||||
|
||||
* Thu Aug 24 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.0.0.35-2
|
||||
- Update documentation (README.md)
|
||||
@ -2747,7 +2543,7 @@ cjc.mainProgram(args)
|
||||
- * No use of system libjpeg turbo to warrant RH649512 patch any more
|
||||
- Replace RH1684077 pcsc-lite-libs patch with better JDK-8009550 fix being upstreamed
|
||||
- Adapt alt-java test to new binary where there is always a set_speculation function
|
||||
- Related: RHEL-12998
|
||||
- Related: RHEL-12995
|
||||
|
||||
* Mon Aug 21 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:21.0.0.0.35-1
|
||||
- Update to jdk-21.0.0+35
|
||||
@ -2759,12 +2555,11 @@ cjc.mainProgram(args)
|
||||
- Re-enable tzdata tests now we are on the latest JDK and things are back in sync
|
||||
- Install jaxp.properties introduced by JDK-8303530
|
||||
- Install lible.so introduced by JDK-8306983
|
||||
- Related: RHEL-12998
|
||||
- Resolves: RHEL-41087
|
||||
- Related: RHEL-12995
|
||||
|
||||
* Mon Aug 21 2023 Petra Alice Mikova <pmikova@redhat.com> - 1:21.0.0.0.35-1
|
||||
- Replace smoke test files used in the staticlibs test, as fdlibm was removed by JDK-8303798
|
||||
- Related: RHEL-12998
|
||||
- Related: RHEL-12995
|
||||
|
||||
* Wed Aug 16 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:20.0.0.0.36-1
|
||||
- Update to jdk-20.0.2+9
|
||||
@ -2772,12 +2567,12 @@ cjc.mainProgram(args)
|
||||
- Update system crypto policy & FIPS patch from new fips-20u tree
|
||||
- Update generate_tarball.sh ICEDTEA_VERSION
|
||||
- Update CLDR reference data following update to 42 (Rocky Mountain-Normalzeit => Rocky-Mountain-Normalzeit)
|
||||
- Related: RHEL-12998
|
||||
- Related: RHEL-12995
|
||||
|
||||
* Wed Aug 16 2023 Jiri Vanek <jvanek@redhat.com> - 1:20.0.0.0.36-1
|
||||
- Dropped JDK-8295447, JDK-8296239 & JDK-8299439 patches now upstream
|
||||
- Adapted rh1750419-redhat_alt_java.patch
|
||||
- Related: RHEL-12998
|
||||
- Related: RHEL-12995
|
||||
|
||||
* Tue Aug 15 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:19.0.1.0.10-1
|
||||
- Update to jdk-19.0.2 release
|
||||
@ -2786,7 +2581,7 @@ cjc.mainProgram(args)
|
||||
- Remove references to sample directory removed by JDK-8284999
|
||||
- Add local patch JDK-8295447 (javac NPE) which was accepted into 19u upstream but not in the GA tag
|
||||
- Add local patches for JDK-8296239 & JDK-8299439 (Croatia Euro update) which are present in 8u, 11u & 17u releases
|
||||
- Related: RHEL-12998
|
||||
- Related: RHEL-12995
|
||||
|
||||
* Thu Aug 10 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:18.0.2.0.9-1
|
||||
- Update to jdk-18.0.2 release
|
||||
@ -2797,26 +2592,22 @@ cjc.mainProgram(args)
|
||||
- Drop tzdata patches added for 17.0.7 which will eventually appear in the upstream tarball when we reach OpenJDK 21
|
||||
- Disable tzdata tests until we are on the latest JDK and things are back in sync
|
||||
- Use empty nss.fips.cfg until it is again available via the FIPS patch
|
||||
- Related: RHEL-12998
|
||||
- Related: RHEL-12995
|
||||
|
||||
* Thu Aug 10 2023 Petra Alice Mikova <pmikova@redhat.com> - 1:18.0.2.0.9-1
|
||||
- Update to ea version of jdk18
|
||||
- Add new slave jwebserver and corresponding manpage
|
||||
- Adjust rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
|
||||
- Related: RHEL-12998
|
||||
- Related: RHEL-12995
|
||||
|
||||
* Thu Aug 10 2023 FeRD (Frank Dana) <ferdnyc@gmail.com> - 1:18.0.2.0.9-1
|
||||
- Add javaver- and origin-specific javadoc and javadoczip alternatives.
|
||||
- Related: RHEL-12998
|
||||
|
||||
* Tue Aug 08 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.7.0.7-4
|
||||
- Set portablerelease and portablerhel to use the CentOS 9 build
|
||||
- Related: RHEL-12998
|
||||
- Related: RHEL-12995
|
||||
|
||||
* Tue Aug 08 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.7.0.7-4
|
||||
- Add files missed by centpkg import.
|
||||
- Related: rhbz#2192748
|
||||
- Related: RHEL-12995
|
||||
|
||||
* Fri Aug 04 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.7.0.7-3
|
||||
- Create java-21-openjdk package based on java-17-openjdk
|
||||
- Related: rhbz#2192748
|
||||
- Related: rhbz#2192749
|
||||
@ -1,7 +0,0 @@
|
||||
# recipients: java-qa
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
inspections:
|
||||
javabytecode: off
|
||||
@ -1,29 +0,0 @@
|
||||
#!/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:
|
||||
@ -1,29 +0,0 @@
|
||||
#!/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:
|
||||
@ -1,43 +0,0 @@
|
||||
#!/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:
|
||||
@ -1,29 +0,0 @@
|
||||
#!/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:
|
||||
@ -1,43 +0,0 @@
|
||||
#!/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:
|
||||
@ -1,43 +0,0 @@
|
||||
#!/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:
|
||||
@ -1,29 +0,0 @@
|
||||
#!/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:
|
||||
@ -1,43 +0,0 @@
|
||||
#!/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:
|
||||
@ -1,61 +0,0 @@
|
||||
#!/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:
|
||||
@ -1,294 +0,0 @@
|
||||
#!/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:
|
||||
@ -1,198 +0,0 @@
|
||||
#!/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:
|
||||
@ -1,83 +0,0 @@
|
||||
#!/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" | uniq > "${TMPDIR}/fixes"
|
||||
rm -f "${TMPDIR}/fixes2" "${TMPDIR}/fixes3"
|
||||
|
||||
echo "In ${TMPDIR}/fixes:"
|
||||
cat "${TMPDIR}/fixes"
|
||||
|
||||
# Local Variables:
|
||||
# compile-command: "shellcheck openjdk_news.sh"
|
||||
# fill-column: 80
|
||||
# indent-tabs-mode: nil
|
||||
# sh-basic-offset: 4
|
||||
# End:
|
||||
2
sources
2
sources
@ -1,2 +0,0 @@
|
||||
SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
|
||||
SHA512 (openjdk-21.0.5+11.tar.xz) = f416e746593589cc7d37dbde55098038412939947c41c05baf2da31e44c42d0242cb8f6a4a5659d3d7b9a27e775d9ef375f754acda5e143ada5987e288dbe87a
|
||||
@ -1,21 +0,0 @@
|
||||
---
|
||||
- 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