|
|
|
|
@ -1,4 +1,4 @@
|
|
|
|
|
# debug_package %%{nil} is portable-jdks specific
|
|
|
|
|
## debug_package %%{nil} is portable-jdks specific
|
|
|
|
|
%define debug_package %{nil}
|
|
|
|
|
|
|
|
|
|
# RPM conditionals so as to be able to dynamically produce
|
|
|
|
|
@ -25,7 +25,7 @@
|
|
|
|
|
# Enable static library builds by default.
|
|
|
|
|
%bcond_without staticlibs
|
|
|
|
|
# Remove build artifacts by default
|
|
|
|
|
%bcond_with artifacts
|
|
|
|
|
%bcond_without artifacts
|
|
|
|
|
# Build a fresh libjvm.so for use in a copy of the bootstrap JDK
|
|
|
|
|
%bcond_without fresh_libjvm
|
|
|
|
|
# Build with system libraries
|
|
|
|
|
@ -147,6 +147,8 @@
|
|
|
|
|
%global zgc_arches x86_64
|
|
|
|
|
# Set of architectures for which alt-java has SSB mitigation
|
|
|
|
|
%global ssbd_arches x86_64
|
|
|
|
|
# Architecture on which we run Java only tests
|
|
|
|
|
%global jdk_test_arch x86_64
|
|
|
|
|
# Set of architectures where we verify backtraces with gdb
|
|
|
|
|
# s390x fails on RHEL 7 so we exclude it there
|
|
|
|
|
%if (0%{?rhel} > 0 && 0%{?rhel} < 8)
|
|
|
|
|
@ -339,7 +341,7 @@
|
|
|
|
|
# New Version-String scheme-style defines
|
|
|
|
|
%global featurever 11
|
|
|
|
|
%global interimver 0
|
|
|
|
|
%global updatever 21
|
|
|
|
|
%global updatever 25
|
|
|
|
|
%global patchver 0
|
|
|
|
|
# buildjdkver is usually same as %%{featurever},
|
|
|
|
|
# but in time of bootstrap of next jdk, it is featurever-1,
|
|
|
|
|
@ -571,7 +573,7 @@ Source0: openjdk-jdk%{featurever}u-%{vcstag}.tar.xz
|
|
|
|
|
# Use 'icedtea_sync.sh' to update the following
|
|
|
|
|
# They are based on code contained in the IcedTea project (6.x).
|
|
|
|
|
# Systemtap tapsets. Zipped up to keep it small.
|
|
|
|
|
Source8: tapsets-icedtea-%%{icedteaver}.tar.xz
|
|
|
|
|
Source8: tapsets-icedtea-%{icedteaver}.tar.xz
|
|
|
|
|
|
|
|
|
|
# Desktop files. Adapted from IcedTea
|
|
|
|
|
# Disabled in portables
|
|
|
|
|
@ -673,25 +675,13 @@ Patch2002: jdk8242332-rh2108712-sha3-sunpkcs11.patch
|
|
|
|
|
|
|
|
|
|
#############################################
|
|
|
|
|
#
|
|
|
|
|
# Patches appearing in 11.0.21
|
|
|
|
|
#
|
|
|
|
|
# This section includes patches which are present
|
|
|
|
|
# in the listed OpenJDK 11u release and should be
|
|
|
|
|
# able to be removed once that release is out
|
|
|
|
|
# and used by this RPM.
|
|
|
|
|
#############################################
|
|
|
|
|
|
|
|
|
|
#############################################
|
|
|
|
|
#
|
|
|
|
|
# Patches appearing in 11.0.22
|
|
|
|
|
# Patches appearing in 11.0.23
|
|
|
|
|
#
|
|
|
|
|
# This section includes patches which are present
|
|
|
|
|
# in the listed OpenJDK 8u release and should be
|
|
|
|
|
# able to be removed once that release is out
|
|
|
|
|
# and used by this RPM.
|
|
|
|
|
#############################################
|
|
|
|
|
# JDK-8312489, OJ2095: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar
|
|
|
|
|
Patch2000: jdk8312489-max_sig_default_increase.patch
|
|
|
|
|
|
|
|
|
|
#############################################
|
|
|
|
|
#
|
|
|
|
|
@ -738,8 +728,6 @@ BuildRequires: java-%{buildjdkver}-openjdk-devel
|
|
|
|
|
%ifarch %{zero_arches}
|
|
|
|
|
BuildRequires: libffi-devel
|
|
|
|
|
%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
|
|
|
|
|
@ -757,19 +745,22 @@ BuildRequires: harfbuzz-devel
|
|
|
|
|
BuildRequires: lcms2-devel
|
|
|
|
|
BuildRequires: libjpeg-devel
|
|
|
|
|
BuildRequires: libpng-devel
|
|
|
|
|
BuildRequires: zlib-devel
|
|
|
|
|
%else
|
|
|
|
|
# Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h
|
|
|
|
|
Provides: bundled(freetype) = 2.13.0
|
|
|
|
|
Provides: bundled(freetype) = 2.13.2
|
|
|
|
|
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
|
|
|
|
|
Provides: bundled(giflib) = 5.2.1
|
|
|
|
|
Provides: bundled(giflib) = 5.2.2
|
|
|
|
|
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
|
|
|
|
|
Provides: bundled(harfbuzz) = 7.2.0
|
|
|
|
|
Provides: bundled(harfbuzz) = 8.2.2
|
|
|
|
|
# Version in src/java.desktop/share/native/liblcms/lcms2.h
|
|
|
|
|
Provides: bundled(lcms2) = 2.15.0
|
|
|
|
|
Provides: bundled(lcms2) = 2.16.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.39
|
|
|
|
|
Provides: bundled(libpng) = 1.6.43
|
|
|
|
|
# Version in src/java.base/share/native/libzip/zlib/zlib.h
|
|
|
|
|
Provides: bundled(zlib) = 1.3.1
|
|
|
|
|
# We link statically against libstdc++ to increase portability
|
|
|
|
|
BuildRequires: libstdc++-static
|
|
|
|
|
%endif
|
|
|
|
|
@ -959,20 +950,18 @@ sh %{SOURCE12} %{top_level_dir_name}
|
|
|
|
|
|
|
|
|
|
# Patch the JDK
|
|
|
|
|
pushd %{top_level_dir_name}
|
|
|
|
|
%patch1 -p1
|
|
|
|
|
%patch3 -p1
|
|
|
|
|
%patch -P1 -p1
|
|
|
|
|
%patch -P3 -p1
|
|
|
|
|
# Add crypto policy and FIPS support
|
|
|
|
|
%patch1001 -p1
|
|
|
|
|
%patch -P1001 -p1
|
|
|
|
|
# nss.cfg PKCS11 support; must come last as it also alters java.security
|
|
|
|
|
%patch1000 -p1
|
|
|
|
|
# JDK-8312489 backport, coming in 11.0.22
|
|
|
|
|
%patch2000 -p1
|
|
|
|
|
%patch -P1000 -p1
|
|
|
|
|
# PKCS11 SHA3 backport
|
|
|
|
|
%patch2002 -p1
|
|
|
|
|
%patch -P2002 -p1
|
|
|
|
|
# alt-java
|
|
|
|
|
%patch600 -p1
|
|
|
|
|
%patch -P600 -p1
|
|
|
|
|
# RSA default
|
|
|
|
|
%patch1003 -p1
|
|
|
|
|
%patch -P1003 -p1
|
|
|
|
|
popd # openjdk
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -1076,9 +1065,6 @@ function buildjdk() {
|
|
|
|
|
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} \
|
|
|
|
|
@ -1125,13 +1111,14 @@ function stripjdk() {
|
|
|
|
|
local jreimagepath=${outputdir}/images/%{jreimage}
|
|
|
|
|
local jmodimagepath=${outputdir}/images/jmods
|
|
|
|
|
local supportdir=${outputdir}/support
|
|
|
|
|
local modulefile=lib/modules
|
|
|
|
|
|
|
|
|
|
if [ "x$suffix" = "x" ] ; then
|
|
|
|
|
# Keep the unstripped version for consumption by RHEL RPMs
|
|
|
|
|
cp -a ${jdkimagepath}{,.unstripped}
|
|
|
|
|
|
|
|
|
|
# Strip the files
|
|
|
|
|
for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f) ; do
|
|
|
|
|
# Strip libraries and executables
|
|
|
|
|
for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f | grep -v '\.o$' | grep -v '\.debuginfo$' | grep -v '\.class$' ) ; do
|
|
|
|
|
if file ${file} | grep -q 'ELF'; then
|
|
|
|
|
noextfile=${file/.so/};
|
|
|
|
|
objcopy --only-keep-debug ${file} ${noextfile}.debuginfo;
|
|
|
|
|
@ -1145,7 +1132,8 @@ function stripjdk() {
|
|
|
|
|
echo "Support directory missing.";
|
|
|
|
|
exit 15
|
|
|
|
|
fi
|
|
|
|
|
for cmd in $(find ${supportdir} -name '*.jmod.cmdline') ; do
|
|
|
|
|
echo "Rebuilding jmod files against the stripped binaries"
|
|
|
|
|
for cmd in $(find ${supportdir}/jmods -name '*.jmod.cmdline') ; do
|
|
|
|
|
jmod=$(cat ${cmd} | sed -r 's|.*support/(.*$)|\1|');
|
|
|
|
|
echo "Rebuilding ${jmod} against stripped binaries...";
|
|
|
|
|
echo "Removing old jmod ${jmod}...";
|
|
|
|
|
@ -1153,9 +1141,36 @@ function stripjdk() {
|
|
|
|
|
rm -vf ${jdkimagepath}/jmods/$(basename ${jmod});
|
|
|
|
|
echo "Executing $(cat ${cmd})...";
|
|
|
|
|
cat ${cmd} | sh -s ;
|
|
|
|
|
echo "Moving jmod to image...";
|
|
|
|
|
echo "Moving jmod to image and image/jmods...";
|
|
|
|
|
cp -v ${supportdir}/${jmod} ${jmodimagepath};
|
|
|
|
|
mv -v ${supportdir}/${jmod} ${jdkimagepath}/jmods;
|
|
|
|
|
done
|
|
|
|
|
echo "Rebuilding images with stripped modules..."
|
|
|
|
|
for image in %{jdkimage} %{jreimage} ; do
|
|
|
|
|
outdir=${outputdir}/images/${image};
|
|
|
|
|
jlink=${supportdir}/images/${image}.cmdline;
|
|
|
|
|
echo "Running ${jlink}..."
|
|
|
|
|
if [ ! -f ${jlink} ]; then
|
|
|
|
|
echo "Cannot find JLINK command: ${jlink}"
|
|
|
|
|
echo "Supportdir images contains:"
|
|
|
|
|
ls -ali ${supportdir}/images
|
|
|
|
|
exit 16
|
|
|
|
|
fi
|
|
|
|
|
# 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
|
|
|
|
|
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 -vf ${outdir}/jmods ${outdir}.bak;
|
|
|
|
|
fi
|
|
|
|
|
# ... and move the modulefile too...
|
|
|
|
|
mv -vf ${outdir}/${modulefile} ${outdir}.bak/$(dirname ${modulefile});
|
|
|
|
|
# Restore the original image
|
|
|
|
|
rm -rf ${outdir};
|
|
|
|
|
mv -vf ${outdir}{.bak,};
|
|
|
|
|
done
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -1248,17 +1263,10 @@ 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}
|
|
|
|
|
tar -cJf ${unstrippedarchive} ${jdkname}
|
|
|
|
|
@ -1267,11 +1275,20 @@ function packagejdk() {
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Rename directories for packaging
|
|
|
|
|
cp -r %{jdkimage} ${jdkname}
|
|
|
|
|
cp -r %{jreimage} ${jrename}
|
|
|
|
|
mv %{jdkimage} ${jdkname}
|
|
|
|
|
mv %{jreimage} ${jrename}
|
|
|
|
|
|
|
|
|
|
# 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}
|
|
|
|
|
|
|
|
|
|
tar -cJf ${debugarchive} $(find ${jdkname} -name \*.debuginfo)
|
|
|
|
|
genchecksum ${debugarchive}
|
|
|
|
|
|
|
|
|
|
@ -1310,8 +1327,8 @@ function packagejdk() {
|
|
|
|
|
|
|
|
|
|
# Revert directory renaming so testing will run
|
|
|
|
|
# TODO: testing should run on the packaged JDK
|
|
|
|
|
rm -rf ${jdkname} %{jdkimage}
|
|
|
|
|
rm -rf ${jrename} %{jreimage}
|
|
|
|
|
mv ${jdkname} %{jdkimage}
|
|
|
|
|
mv ${jrename} %{jreimage}
|
|
|
|
|
|
|
|
|
|
popd #images
|
|
|
|
|
|
|
|
|
|
@ -1404,48 +1421,58 @@ export JAVA_HOME=${top_dir_abs_main_build_path}/images/%{jdkimage}
|
|
|
|
|
$JAVA_HOME//bin/java -XX:+UseShenandoahGC -version
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
|
|
|
|
|
# Check ECC is working
|
|
|
|
|
$JAVA_HOME/bin/javac -d . %{SOURCE14}
|
|
|
|
|
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
|
|
|
|
|
|
|
|
|
|
# Check system crypto (policy) is active and can be disabled
|
|
|
|
|
# Test takes a single argument - true or false - to state whether system
|
|
|
|
|
# security properties are enabled or not.
|
|
|
|
|
$JAVA_HOME/bin/javac -d . %{SOURCE15}
|
|
|
|
|
export PROG=$(echo $(basename %{SOURCE15})|sed "s|\.java||")
|
|
|
|
|
export SEC_DEBUG="-Djava.security.debug=properties"
|
|
|
|
|
#Portable specific: set false whereas its true for upstream
|
|
|
|
|
$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} false
|
|
|
|
|
$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}"
|
|
|
|
|
# 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
|
|
|
|
|
|
|
|
|
|
# Check ECC is working
|
|
|
|
|
$JAVA_HOME/bin/javac -d . %{SOURCE14}
|
|
|
|
|
$JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
|
|
|
|
|
|
|
|
|
|
# Check system crypto (policy) is active and can be disabled
|
|
|
|
|
# Test takes a single argument - true or false - to state whether system
|
|
|
|
|
# security properties are enabled or not.
|
|
|
|
|
$JAVA_HOME/bin/javac -d . %{SOURCE15}
|
|
|
|
|
export PROG=$(echo $(basename %{SOURCE15})|sed "s|\.java||")
|
|
|
|
|
export SEC_DEBUG="-Djava.security.debug=properties"
|
|
|
|
|
#Portable specific: set false whereas its true for upstream
|
|
|
|
|
$JAVA_HOME/bin/java ${SEC_DEBUG} ${PROG} false
|
|
|
|
|
$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}"
|
|
|
|
|
|
|
|
|
|
# Check java launcher has no SSB mitigation
|
|
|
|
|
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
|
|
|
|
|
|
|
|
|
|
# Check alt-java launcher has SSB mitigation on supported architectures
|
|
|
|
|
%ifarch %{ssbd_arches}
|
|
|
|
|
nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
|
|
|
|
|
%else
|
|
|
|
|
if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# Check translations are available for new timezones
|
|
|
|
|
$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
|
|
|
|
|
|
|
|
|
|
%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}
|
|
|
|
|
readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep w_remainder.c
|
|
|
|
|
readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep e_remainder.c
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# Check java launcher has no SSB mitigation
|
|
|
|
|
if ! nm $JAVA_HOME/bin/java | grep set_speculation ; then true ; else false; fi
|
|
|
|
|
|
|
|
|
|
# Check alt-java launcher has SSB mitigation on supported architectures
|
|
|
|
|
%ifarch %{ssbd_arches}
|
|
|
|
|
nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation
|
|
|
|
|
%else
|
|
|
|
|
if ! nm $JAVA_HOME/bin/%{alt_java_name} | grep set_speculation ; then true ; else false; fi
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# Check translations are available for new timezones
|
|
|
|
|
$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
|
|
|
|
|
# Just run a basic java -version test on other architectures
|
|
|
|
|
$JAVA_HOME/bin/java -version
|
|
|
|
|
|
|
|
|
|
%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}
|
|
|
|
|
readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep w_remainder.c
|
|
|
|
|
readelf --debug-dump $STATIC_LIBS_HOME/lib/libfdlibm.a | grep e_remainder.c
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# Release builds strip the debug symbols into external .debuginfo files
|
|
|
|
|
@ -1547,12 +1574,10 @@ for suffix in %{build_loop} ; do
|
|
|
|
|
nameSuffix=`echo "$suffix"| sed s/-/./`
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# These definitions should match those in installjdk
|
|
|
|
|
# These definitions should match those in packagejdk
|
|
|
|
|
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}
|
|
|
|
|
|
|
|
|
|
@ -1567,23 +1592,23 @@ 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}/
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
# 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}/
|
|
|
|
|
|
|
|
|
|
# To show sha in the build log
|
|
|
|
|
for file in `ls $RPM_BUILD_ROOT%{_jvmdir}/*.sha256sum` ; do
|
|
|
|
|
ls -l $file ;
|
|
|
|
|
@ -1601,6 +1626,8 @@ done
|
|
|
|
|
# placeholder
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if %{include_normal_build}
|
|
|
|
|
|
|
|
|
|
%files devel
|
|
|
|
|
%{_jvmdir}/%{jdkportablearchive -- %%{nil}}
|
|
|
|
|
%{_jvmdir}/%{jdkportablearchive -- .debuginfo}
|
|
|
|
|
@ -1617,6 +1644,16 @@ 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
|
|
|
|
|
@ -1653,15 +1690,118 @@ done
|
|
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%files docs
|
|
|
|
|
%{_jvmdir}/%{docportablearchive}
|
|
|
|
|
%{_jvmdir}/%{docportablearchive}.sha256sum
|
|
|
|
|
%changelog
|
|
|
|
|
* Wed Oct 16 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 1:11.0.25.0.9-1
|
|
|
|
|
- Rebuilt for MSVSphere 8.10
|
|
|
|
|
|
|
|
|
|
%files misc
|
|
|
|
|
%{_jvmdir}/%{miscportablearchive}
|
|
|
|
|
%{_jvmdir}/%{miscportablearchive}.sha256sum
|
|
|
|
|
* Thu Oct 10 2024 Antonio Vieiro <avieirov@redhat.com> - 1:11.0.25.0.9-1
|
|
|
|
|
- Update to jdk-11.0.25+9 (GA)
|
|
|
|
|
- Update release notes to 11.0.25+9
|
|
|
|
|
- Switch to GA mode for release
|
|
|
|
|
- Resolves: OPENJDK-3090
|
|
|
|
|
- ** This tarball is embargoed until 2024-10-15 @ 1pm PT. **
|
|
|
|
|
|
|
|
|
|
* Mon Oct 07 2024 Antonio Vieiro <avieirov@redhat.com> - 1:11.0.25.0.8-0.2.ea
|
|
|
|
|
- Updated NEWS
|
|
|
|
|
- Using %bcond_without artifacts
|
|
|
|
|
|
|
|
|
|
* Wed Oct 02 2024 Antonio Vieiro <avieirov@redhat.com> - 1:11.0.25.0.8-0.1.ea
|
|
|
|
|
- Update to jdk-11.0.25+8 (EA)
|
|
|
|
|
- Update release notes to 11.0.25+8
|
|
|
|
|
|
|
|
|
|
* Thu Sep 26 2024 Antonio Vieiro <avieirov@redhat.com> - 1:11.0.25.0.7-0.1.ea
|
|
|
|
|
- Update to jdk-11.0.25+7 (EA)
|
|
|
|
|
- Update release notes to 11.0.25+7
|
|
|
|
|
|
|
|
|
|
* Thu Sep 12 2024 Antonio Vieiro <avieirov@redhat.com> - 1:11.0.25.0.6-0.1.ea
|
|
|
|
|
- Update to jdk-11.0.25+6 (EA)
|
|
|
|
|
- Update release notes to 11.0.25+6
|
|
|
|
|
|
|
|
|
|
* Thu Sep 05 2024 Antonio Vieiro <avieirov@redhat.com> - 1:11.0.25.0.5-0.1.ea
|
|
|
|
|
- Update to jdk-11.0.25+5 (EA)
|
|
|
|
|
- Update release notes to 11.0.25+5
|
|
|
|
|
- Switch to EA mode
|
|
|
|
|
- Bump giflib version to 5.2.2 following JDK-8328999
|
|
|
|
|
- Bump libpng version to 1.6.43 following JDK-8329004
|
|
|
|
|
|
|
|
|
|
* Mon Aug 26 2024 Antonio Vieiro <avieirov@redhat.com> - 1:11.0.24.0.8-6
|
|
|
|
|
- Add missing modulefile in stripjdk
|
|
|
|
|
- Skip `.o` and others in stripping loop
|
|
|
|
|
- Resolves: OPENJDK-3056
|
|
|
|
|
|
|
|
|
|
* Tue Aug 20 2024 Antonio Vieiro <avieirov@redhat.com> - 1:11.0.24.0.8-5
|
|
|
|
|
- Limit Java only tests to one 'jdk_test_arch'
|
|
|
|
|
- Resolves: OPENJDK-3184
|
|
|
|
|
|
|
|
|
|
* Mon Aug 19 2024 Antonio Vieiro <avieirov@redhat.com> - 1:11.0.24.0.8-4
|
|
|
|
|
- Rebuild the lib/modules jimage against the updated jmods
|
|
|
|
|
- Resolves: OPENJDK-3056
|
|
|
|
|
|
|
|
|
|
* Fri Jul 26 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.24.0.8-2
|
|
|
|
|
- Drop unneeded tzdata-java build dependency following 3e3cf8fa2df7bac2f6a60a0ddd596ec39228a3e1
|
|
|
|
|
- Resolves: OPENJDK-3192
|
|
|
|
|
|
|
|
|
|
* Fri Jul 26 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.24.0.8-2
|
|
|
|
|
- Move unstripped, misc and doc tarball handling into normal build / no suffix blocks
|
|
|
|
|
- Resolves: OPENJDK-3217
|
|
|
|
|
|
|
|
|
|
* Wed Jul 10 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.24.0.8-2
|
|
|
|
|
- Adjusted DTLS & RPATH NEWS entries to match OpenJDK 17 & 21 release notes
|
|
|
|
|
|
|
|
|
|
* Wed Jul 10 2024 Anton Bobrov <abobrov@redhat.com> - 1:11.0.24.0.8-1
|
|
|
|
|
- Update to jdk-11.0.24+8 (GA)
|
|
|
|
|
- Update release notes to 11.0.24+8
|
|
|
|
|
- Switch to GA mode for release
|
|
|
|
|
- ** This tarball is embargoed until 2024-07-16 @ 1pm PT. **
|
|
|
|
|
|
|
|
|
|
* Mon Jun 24 2024 Anton Bobrov <abobrov@redhat.com> - 1:11.0.24.0.6-0.2.ea
|
|
|
|
|
- Add zlib build required or bundled version (1.3.1), depending on system_libs setting
|
|
|
|
|
- Related: OPENJDK-3066
|
|
|
|
|
|
|
|
|
|
* Thu Jun 06 2024 Anton Bobrov <abobrov@redhat.com> - 1:11.0.24.0.6-0.1.ea
|
|
|
|
|
- Update to jdk-11.0.24+6 (EA)
|
|
|
|
|
- Update release notes to 11.0.24+6
|
|
|
|
|
- Switch to EA mode
|
|
|
|
|
- Update LCMS to 2.16 (JDK-8321489)
|
|
|
|
|
- Improve VCS exclusion in generate_source_tarball.sh script
|
|
|
|
|
- Bring outdated patch macros in the spec file up to date
|
|
|
|
|
|
|
|
|
|
* Thu Apr 18 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.23.0.9-3
|
|
|
|
|
- Sync release notes with upstream version: https://bit.ly/openjdk11023
|
|
|
|
|
|
|
|
|
|
* Thu Apr 11 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.23.0.9-2
|
|
|
|
|
- Fix 11.0.22 release date in NEWS
|
|
|
|
|
|
|
|
|
|
* Wed Apr 10 2024 Anton Bobrov <abobrov@redhat.com> - 1:11.0.23.0.9-1
|
|
|
|
|
- Update to jdk-11.0.23+9 (GA)
|
|
|
|
|
- Update release notes to 11.0.23+9
|
|
|
|
|
- Switch to GA mode for release
|
|
|
|
|
- Require tzdata 2024a due to upstream inclusion of JDK-8322725
|
|
|
|
|
- Only require tzdata 2023d for now as 2024a is unavailable in buildroot
|
|
|
|
|
- Speed up PPC build by removing ppc64le --with-jobs=1 workaround
|
|
|
|
|
- ** This tarball is embargoed until 2024-04-16 @ 1pm PT. **
|
|
|
|
|
|
|
|
|
|
* Thu Mar 21 2024 Anton Bobrov <abobrov@redhat.com> - 1:11.0.23.0.1-0.1.ea
|
|
|
|
|
- Update to jdk-11.0.23+1 (EA)
|
|
|
|
|
- Update release notes to 11.0.23+1
|
|
|
|
|
- Switch to EA mode
|
|
|
|
|
|
|
|
|
|
* Wed Jan 10 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.22.0.7-1
|
|
|
|
|
- Update to jdk-11.0.22+7 (GA)
|
|
|
|
|
- Update release notes to 11.0.22+7
|
|
|
|
|
- Switch to GA mode for release
|
|
|
|
|
- ** This tarball is embargoed until 2024-01-16 @ 1pm PT. **
|
|
|
|
|
|
|
|
|
|
* Mon Jan 08 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.22.0.6-0.1.ea
|
|
|
|
|
- Update to jdk-11.0.22+6 (EA)
|
|
|
|
|
- Update release notes to 11.0.22+6
|
|
|
|
|
|
|
|
|
|
* Thu Jan 04 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.22.0.1-0.1.ea
|
|
|
|
|
- Update to jdk-11.0.22+1 (EA)
|
|
|
|
|
- Update release notes to 11.0.22+1
|
|
|
|
|
- Switch to EA mode
|
|
|
|
|
- Drop local copy of JDK-8312489 which is now included upstream
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Wed Oct 11 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.21.0.9-1
|
|
|
|
|
- Update to jdk-11.0.21+9 (GA)
|
|
|
|
|
- Update release notes to 11.0.21+9
|
Arkady L. Shane