|
|
|
@ -330,9 +330,8 @@
|
|
|
|
%global stapinstall %{nil}
|
|
|
|
%global stapinstall %{nil}
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
# always off for portable builds
|
|
|
|
|
|
|
|
%ifarch %{systemtap_arches}
|
|
|
|
%ifarch %{systemtap_arches}
|
|
|
|
%global with_systemtap 0
|
|
|
|
%global with_systemtap 1
|
|
|
|
%else
|
|
|
|
%else
|
|
|
|
%global with_systemtap 0
|
|
|
|
%global with_systemtap 0
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
@ -340,7 +339,7 @@
|
|
|
|
# New Version-String scheme-style defines
|
|
|
|
# New Version-String scheme-style defines
|
|
|
|
%global featurever 11
|
|
|
|
%global featurever 11
|
|
|
|
%global interimver 0
|
|
|
|
%global interimver 0
|
|
|
|
%global updatever 19
|
|
|
|
%global updatever 20
|
|
|
|
%global patchver 0
|
|
|
|
%global patchver 0
|
|
|
|
# buildjdkver is usually same as %%{featurever},
|
|
|
|
# buildjdkver is usually same as %%{featurever},
|
|
|
|
# but in time of bootstrap of next jdk, it is featurever-1,
|
|
|
|
# but in time of bootstrap of next jdk, it is featurever-1,
|
|
|
|
@ -386,8 +385,8 @@
|
|
|
|
%global origin_nice OpenJDK
|
|
|
|
%global origin_nice OpenJDK
|
|
|
|
%global top_level_dir_name %{origin}
|
|
|
|
%global top_level_dir_name %{origin}
|
|
|
|
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
|
|
|
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
|
|
|
%global buildver 7
|
|
|
|
%global buildver 8
|
|
|
|
%global rpmrelease 2
|
|
|
|
%global rpmrelease 1
|
|
|
|
#%%global tagsuffix %%{nil}
|
|
|
|
#%%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
|
|
|
|
# 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
|
|
|
|
%if %is_system_jdk
|
|
|
|
%if %is_system_jdk
|
|
|
|
@ -444,9 +443,9 @@
|
|
|
|
%define uniquesuffix() %{expand:%{fullversion}.%{_arch}%{?1}}
|
|
|
|
%define uniquesuffix() %{expand:%{fullversion}.%{_arch}%{?1}}
|
|
|
|
# portable only declarations
|
|
|
|
# portable only declarations
|
|
|
|
%global jreimage jre
|
|
|
|
%global jreimage jre
|
|
|
|
%define jreportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el8\\(_[0-9]\\)*;portable%{1}.jre.;g" | sed "s;openjdkportable;el;g")
|
|
|
|
%define jreportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable%{1}.jre;g")
|
|
|
|
%define jdkportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el8\\(_[0-9]\\)*;portable%{1}.jdk.;g" | sed "s;openjdkportable;el;g")
|
|
|
|
%define jdkportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable%{1}.jdk;g")
|
|
|
|
%define staticlibsportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el8\\(_[0-9]\\)*;portable%{1}.static-libs.;g" | sed "s;openjdkportable;el;g")
|
|
|
|
%define staticlibsportablenameimpl() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable%{1}.static-libs;g")
|
|
|
|
%define jreportablearchive() %{expand:%{jreportablenameimpl -- %%{1}}.tar.xz}
|
|
|
|
%define jreportablearchive() %{expand:%{jreportablenameimpl -- %%{1}}.tar.xz}
|
|
|
|
%define jdkportablearchive() %{expand:%{jdkportablenameimpl -- %%{1}}.tar.xz}
|
|
|
|
%define jdkportablearchive() %{expand:%{jdkportablenameimpl -- %%{1}}.tar.xz}
|
|
|
|
%define staticlibsportablearchive() %{expand:%{staticlibsportablenameimpl -- %%{1}}.tar.xz}
|
|
|
|
%define staticlibsportablearchive() %{expand:%{staticlibsportablenameimpl -- %%{1}}.tar.xz}
|
|
|
|
@ -455,9 +454,9 @@
|
|
|
|
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
|
|
|
|
# Intentionally use jdkportablenameimpl here since we want to have static-libs files overlayed on
|
|
|
|
# top of the JDK archive
|
|
|
|
# top of the JDK archive
|
|
|
|
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
|
|
|
|
%define staticlibsportablename() %{expand:%{jdkportablenameimpl -- %%{1}}}
|
|
|
|
%define docportablename() %(echo %{uniquesuffix ""} | sed "s;el8\\(_[0-9]\\)*;portable.docs.;g" | sed "s;openjdkportable;el;g")
|
|
|
|
%define docportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.docs;g")
|
|
|
|
%define docportablearchive() %{docportablename}.tar.xz
|
|
|
|
%define docportablearchive() %{docportablename}.tar.xz
|
|
|
|
%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;el8\\(_[0-9]\\)*;portable.misc.;g" | sed "s;openjdkportable;el;g")
|
|
|
|
%define miscportablename() %(echo %{uniquesuffix ""} | sed "s;el%{rhel}\\(_[0-9]\\)*;portable.misc;g")
|
|
|
|
%define miscportablearchive() %{miscportablename}.tar.xz
|
|
|
|
%define miscportablearchive() %{miscportablename}.tar.xz
|
|
|
|
|
|
|
|
|
|
|
|
#################################################################
|
|
|
|
#################################################################
|
|
|
|
@ -502,20 +501,6 @@
|
|
|
|
%global alternatives_requires %{_sbindir}/alternatives
|
|
|
|
%global alternatives_requires %{_sbindir}/alternatives
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
%if %{with_systemtap}
|
|
|
|
|
|
|
|
# Where to install systemtap tapset (links)
|
|
|
|
|
|
|
|
# We would like these to be in a package specific sub-dir,
|
|
|
|
|
|
|
|
# but currently systemtap doesn't support that, so we have to
|
|
|
|
|
|
|
|
# use the root tapset dir for now. To distinguish between 64
|
|
|
|
|
|
|
|
# and 32 bit architectures we place the tapsets under the arch
|
|
|
|
|
|
|
|
# specific dir (note that systemtap will only pickup the tapset
|
|
|
|
|
|
|
|
# for the primary arch for now). Systemtap uses the machine name
|
|
|
|
|
|
|
|
# aka target_cpu as architecture specific directory name.
|
|
|
|
|
|
|
|
%global tapsetroot /usr/share/systemtap
|
|
|
|
|
|
|
|
%global tapsetdirttapset %{tapsetroot}/tapset/
|
|
|
|
|
|
|
|
%global tapsetdir %{tapsetdirttapset}/%{stapinstall}
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Portables have no repo (requires/provides), but these are awesome for orientation in spec
|
|
|
|
# Portables have no repo (requires/provides), but these are awesome for orientation in spec
|
|
|
|
# Also scriptlets are happily missing and files are handled old fashion
|
|
|
|
# Also scriptlets are happily missing and files are handled old fashion
|
|
|
|
# not-duplicated requires/provides/obsoletes for normal/debug packages
|
|
|
|
# not-duplicated requires/provides/obsoletes for normal/debug packages
|
|
|
|
@ -588,8 +573,7 @@ Source0: openjdk-jdk%{featurever}u-%{vcstag}-4curve.tar.xz
|
|
|
|
# Use 'icedtea_sync.sh' to update the following
|
|
|
|
# Use 'icedtea_sync.sh' to update the following
|
|
|
|
# They are based on code contained in the IcedTea project (6.x).
|
|
|
|
# They are based on code contained in the IcedTea project (6.x).
|
|
|
|
# Systemtap tapsets. Zipped up to keep it small.
|
|
|
|
# Systemtap tapsets. Zipped up to keep it small.
|
|
|
|
# Disabled in portables
|
|
|
|
Source8: tapsets-icedtea-%%{icedteaver}.tar.xz
|
|
|
|
#Source8: tapsets-icedtea-%%{icedteaver}.tar.xz
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Desktop files. Adapted from IcedTea
|
|
|
|
# Desktop files. Adapted from IcedTea
|
|
|
|
# Disabled in portables
|
|
|
|
# Disabled in portables
|
|
|
|
@ -698,10 +682,6 @@ Patch2001: jdk8242332-rh2108712-sha3-sunpkcs11.patch
|
|
|
|
# able to be removed once that release is out
|
|
|
|
# able to be removed once that release is out
|
|
|
|
# and used by this RPM.
|
|
|
|
# and used by this RPM.
|
|
|
|
#############################################
|
|
|
|
#############################################
|
|
|
|
# JDK-8274864: Remove Amman/Cairo hacks in ZoneInfoFile
|
|
|
|
|
|
|
|
Patch2002: jdk8274864-remove_amman_cairo_hacks.patch
|
|
|
|
|
|
|
|
# JDK-8305113: (tz) Update Timezone Data to 2023c
|
|
|
|
|
|
|
|
Patch2003: jdk8305113-tzdata2023c.patch
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#############################################
|
|
|
|
#############################################
|
|
|
|
#
|
|
|
|
#
|
|
|
|
@ -749,9 +729,7 @@ BuildRequires: java-%{buildjdkver}-openjdk-devel
|
|
|
|
BuildRequires: libffi-devel
|
|
|
|
BuildRequires: libffi-devel
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
# 2023c required as of JDK-8305113
|
|
|
|
# 2023c required as of JDK-8305113
|
|
|
|
#BuildRequires: tzdata-java >= 2023c
|
|
|
|
BuildRequires: tzdata-java >= 2023c
|
|
|
|
# Temporarily lowering requirement until https://errata.devel.redhat.com/advisory/112353 ships
|
|
|
|
|
|
|
|
BuildRequires: tzdata-java >= 2022g
|
|
|
|
|
|
|
|
# cacerts build requirement in portable mode
|
|
|
|
# cacerts build requirement in portable mode
|
|
|
|
BuildRequires: ca-certificates
|
|
|
|
BuildRequires: ca-certificates
|
|
|
|
# Earlier versions have a bug in tree vectorization on PPC
|
|
|
|
# Earlier versions have a bug in tree vectorization on PPC
|
|
|
|
@ -775,9 +753,9 @@ Provides: bundled(freetype) = 2.12.1
|
|
|
|
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
|
|
|
|
# Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h
|
|
|
|
Provides: bundled(giflib) = 5.2.1
|
|
|
|
Provides: bundled(giflib) = 5.2.1
|
|
|
|
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
|
|
|
|
# Version in src/java.desktop/share/native/libharfbuzz/hb-version.h
|
|
|
|
Provides: bundled(harfbuzz) = 4.4.1
|
|
|
|
Provides: bundled(harfbuzz) = 7.0.1
|
|
|
|
# Version in src/java.desktop/share/native/liblcms/lcms2.h
|
|
|
|
# Version in src/java.desktop/share/native/liblcms/lcms2.h
|
|
|
|
Provides: bundled(lcms2) = 2.12.0
|
|
|
|
Provides: bundled(lcms2) = 2.15.0
|
|
|
|
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
|
|
|
|
# Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h
|
|
|
|
Provides: bundled(libjpeg) = 6b
|
|
|
|
Provides: bundled(libjpeg) = 6b
|
|
|
|
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
|
|
|
|
# Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h
|
|
|
|
@ -979,9 +957,6 @@ pushd %{top_level_dir_name}
|
|
|
|
%patch1000 -p1
|
|
|
|
%patch1000 -p1
|
|
|
|
# PKCS11 SHA3 backport
|
|
|
|
# PKCS11 SHA3 backport
|
|
|
|
%patch2001 -p1
|
|
|
|
%patch2001 -p1
|
|
|
|
# tzdata update
|
|
|
|
|
|
|
|
%patch2002 -p1
|
|
|
|
|
|
|
|
%patch2003 -p1
|
|
|
|
|
|
|
|
popd # openjdk
|
|
|
|
popd # openjdk
|
|
|
|
|
|
|
|
|
|
|
|
%patch600
|
|
|
|
%patch600
|
|
|
|
@ -999,18 +974,8 @@ cp -r tapset tapset%{fastdebug_suffix}
|
|
|
|
|
|
|
|
|
|
|
|
for suffix in %{build_loop} ; do
|
|
|
|
for suffix in %{build_loop} ; do
|
|
|
|
for file in "tapset"$suffix/*.in; do
|
|
|
|
for file in "tapset"$suffix/*.in; do
|
|
|
|
OUTPUT_FILE=`echo $file | sed -e "s:\.stp\.in$:-%{version}-%{release}.%{_arch}.stp:g"`
|
|
|
|
sed -i -e "s:@JAVA_SPEC_VER@:%{javaver}:g" $file
|
|
|
|
sed -e "s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/server/libjvm.so:g" $file > $file.1
|
|
|
|
sed -i -e "s:@INSTALL_ARCH_DIR@:%{archinstall}:g" $file
|
|
|
|
sed -e "s:@JAVA_SPEC_VER@:%{javaver}:g" $file.1 > $file.2
|
|
|
|
|
|
|
|
# TODO find out which architectures other than i686 have a client vm
|
|
|
|
|
|
|
|
%ifarch %{ix86}
|
|
|
|
|
|
|
|
sed -e "s:@ABS_CLIENT_LIBJVM_SO@:%{_jvmdir}/%{sdkdir -- $suffix}/lib/client/libjvm.so:g" $file.2 > $OUTPUT_FILE
|
|
|
|
|
|
|
|
%else
|
|
|
|
|
|
|
|
sed -e "/@ABS_CLIENT_LIBJVM_SO@/d" $file.2 > $OUTPUT_FILE
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
sed -i -e "s:@ABS_JAVA_HOME_DIR@:%{_jvmdir}/%{sdkdir -- $suffix}:g" $OUTPUT_FILE
|
|
|
|
|
|
|
|
sed -i -e "s:@INSTALL_ARCH_DIR@:%{archinstall}:g" $OUTPUT_FILE
|
|
|
|
|
|
|
|
sed -i -e "s:@prefix@:%{_jvmdir}/%{sdkdir -- $suffix}/:g" $OUTPUT_FILE
|
|
|
|
|
|
|
|
done
|
|
|
|
done
|
|
|
|
done
|
|
|
|
done
|
|
|
|
# systemtap tapsets ends
|
|
|
|
# systemtap tapsets ends
|
|
|
|
@ -1135,16 +1100,57 @@ function buildjdk() {
|
|
|
|
cat spec.gmk
|
|
|
|
cat spec.gmk
|
|
|
|
|
|
|
|
|
|
|
|
make JAVAC_FLAGS=-g LOG=trace $maketargets || \
|
|
|
|
make JAVAC_FLAGS=-g LOG=trace $maketargets || \
|
|
|
|
( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name "hs_err_pid*.log" | xargs cat && false )
|
|
|
|
( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name "hs_err_pid*.log" | xargs cat && false )
|
|
|
|
|
|
|
|
|
|
|
|
popd
|
|
|
|
popd
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function stripjdk() {
|
|
|
|
|
|
|
|
local outputdir=${1}
|
|
|
|
|
|
|
|
local jdkimagepath=${outputdir}/images/%{jdkimage}
|
|
|
|
|
|
|
|
local jreimagepath=${outputdir}/images/%{jreimage}
|
|
|
|
|
|
|
|
local jmodimagepath=${outputdir}/images/jmods
|
|
|
|
|
|
|
|
local supportdir=${outputdir}/support
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
if file ${file} | grep -q 'ELF'; then
|
|
|
|
|
|
|
|
noextfile=${file/.so/};
|
|
|
|
|
|
|
|
objcopy --only-keep-debug ${file} ${noextfile}.debuginfo;
|
|
|
|
|
|
|
|
objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file};
|
|
|
|
|
|
|
|
strip -g ${file};
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Rebuild jmod files against the stripped binaries
|
|
|
|
|
|
|
|
if [ ! -d ${supportdir} ] ; then
|
|
|
|
|
|
|
|
echo "Support directory missing.";
|
|
|
|
|
|
|
|
exit 15
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
for cmd in $(find ${supportdir} -name '*.jmod.cmdline') ; do
|
|
|
|
|
|
|
|
jmod=$(cat ${cmd} | sed -r 's|.*support/(.*$)|\1|');
|
|
|
|
|
|
|
|
echo "Rebuilding ${jmod} against stripped binaries...";
|
|
|
|
|
|
|
|
echo "Removing old jmod ${jmod}...";
|
|
|
|
|
|
|
|
rm -vf ${jmod}
|
|
|
|
|
|
|
|
rm -vf ${jdkimagepath}/jmods/$(basename ${jmod});
|
|
|
|
|
|
|
|
echo "Executing $(cat ${cmd})...";
|
|
|
|
|
|
|
|
cat ${cmd} | sh -s ;
|
|
|
|
|
|
|
|
echo "Moving jmod to image...";
|
|
|
|
|
|
|
|
mv -v ${supportdir}/${jmod} ${jdkimagepath}/jmods;
|
|
|
|
|
|
|
|
done
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
function installjdk() {
|
|
|
|
function installjdk() {
|
|
|
|
local outputdir=${1}
|
|
|
|
local outputdir=${1}
|
|
|
|
local installdir=${2}
|
|
|
|
local installdir=${2}
|
|
|
|
local jdkimagepath=${installdir}/images/%{jdkimage}
|
|
|
|
local jdkimagepath=${installdir}/images/%{jdkimage}
|
|
|
|
local jreimagepath=${installdir}/images/%{jreimage}
|
|
|
|
local jreimagepath=${installdir}/images/%{jreimage}
|
|
|
|
|
|
|
|
local unstripped=${jdkimagepath}.unstripped
|
|
|
|
|
|
|
|
|
|
|
|
echo "Installing build from ${outputdir} to ${installdir}..."
|
|
|
|
echo "Installing build from ${outputdir} to ${installdir}..."
|
|
|
|
mkdir -p ${installdir}
|
|
|
|
mkdir -p ${installdir}
|
|
|
|
@ -1160,7 +1166,7 @@ function installjdk() {
|
|
|
|
rm -rf ${outputdir}
|
|
|
|
rm -rf ${outputdir}
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
for imagepath in ${jdkimagepath} ${jreimagepath} ; do
|
|
|
|
for imagepath in ${jdkimagepath} ${jreimagepath} ${unstripped}; do
|
|
|
|
|
|
|
|
|
|
|
|
if [ -d ${imagepath} ] ; then
|
|
|
|
if [ -d ${imagepath} ] ; then
|
|
|
|
# the build (erroneously) removes read permissions from some jars
|
|
|
|
# the build (erroneously) removes read permissions from some jars
|
|
|
|
@ -1210,6 +1216,7 @@ function packagejdk() {
|
|
|
|
local bundledir=$(pwd)/${1}/bundles
|
|
|
|
local bundledir=$(pwd)/${1}/bundles
|
|
|
|
local packagesdir=$(pwd)/${2}
|
|
|
|
local packagesdir=$(pwd)/${2}
|
|
|
|
local srcdir=$(pwd)/%{top_level_dir_name}
|
|
|
|
local srcdir=$(pwd)/%{top_level_dir_name}
|
|
|
|
|
|
|
|
local tapsetdir=$(pwd)/tapset
|
|
|
|
|
|
|
|
|
|
|
|
echo "Packaging build from ${imagesdir} to ${packagesdir}..."
|
|
|
|
echo "Packaging build from ${imagesdir} to ${packagesdir}..."
|
|
|
|
mkdir -p ${packagesdir}
|
|
|
|
mkdir -p ${packagesdir}
|
|
|
|
@ -1237,42 +1244,39 @@ function packagejdk() {
|
|
|
|
miscname=%{miscportablename}
|
|
|
|
miscname=%{miscportablename}
|
|
|
|
miscarchive=${packagesdir}/%{miscportablearchive}
|
|
|
|
miscarchive=${packagesdir}/%{miscportablearchive}
|
|
|
|
|
|
|
|
|
|
|
|
# Rename directories for packaging
|
|
|
|
|
|
|
|
mv %{jdkimage} ${jdkname}
|
|
|
|
|
|
|
|
mv %{jreimage} ${jrename}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Release images have external debug symbols
|
|
|
|
|
|
|
|
if [ "x$suffix" = "x" ] ; then
|
|
|
|
if [ "x$suffix" = "x" ] ; then
|
|
|
|
# Keep the unstripped version for consumption by RHEL RPMs
|
|
|
|
# Keep the unstripped version for consumption by RHEL RPMs
|
|
|
|
|
|
|
|
mv %{jdkimage}.unstripped ${jdkname}
|
|
|
|
tar -cJf ${unstrippedarchive} ${jdkname}
|
|
|
|
tar -cJf ${unstrippedarchive} ${jdkname}
|
|
|
|
genchecksum ${unstrippedarchive}
|
|
|
|
genchecksum ${unstrippedarchive}
|
|
|
|
|
|
|
|
mv ${jdkname} %{jdkimage}.unstripped
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
# Strip the files
|
|
|
|
# Rename directories for packaging
|
|
|
|
for file in $(find ${jdkname} ${jrename} -type f) ; do
|
|
|
|
mv %{jdkimage} ${jdkname}
|
|
|
|
if file ${file} | grep -q 'ELF'; then
|
|
|
|
mv %{jreimage} ${jrename}
|
|
|
|
noextfile=${file/.so/};
|
|
|
|
|
|
|
|
objcopy --only-keep-debug ${file} ${noextfile}.debuginfo;
|
|
|
|
|
|
|
|
objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file};
|
|
|
|
|
|
|
|
strip -g ${file};
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Release images have external debug symbols
|
|
|
|
|
|
|
|
if [ "x$suffix" = "x" ] ; then
|
|
|
|
tar -cJf ${debugarchive} $(find ${jdkname} -name \*.debuginfo)
|
|
|
|
tar -cJf ${debugarchive} $(find ${jdkname} -name \*.debuginfo)
|
|
|
|
genchecksum ${debugarchive}
|
|
|
|
genchecksum ${debugarchive}
|
|
|
|
|
|
|
|
|
|
|
|
mkdir ${docname}
|
|
|
|
mkdir ${docname}
|
|
|
|
mv ${docdir} ${docname}
|
|
|
|
mv ${docdir} ${docname}
|
|
|
|
mv ${bundledir}/${built_doc_archive} ${docname}
|
|
|
|
mv ${bundledir}/${built_doc_archive} ${docname}
|
|
|
|
tar -cJf ${docarchive} ${docname}
|
|
|
|
tar -cJf ${docarchive} ${docname}
|
|
|
|
genchecksum ${docarchive}
|
|
|
|
genchecksum ${docarchive}
|
|
|
|
|
|
|
|
|
|
|
|
mkdir ${miscname}
|
|
|
|
mkdir ${miscname}
|
|
|
|
for s in 16 24 32 48 ; do
|
|
|
|
for s in 16 24 32 48 ; do
|
|
|
|
cp -av ${srcdir}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png ${miscname}
|
|
|
|
cp -av ${srcdir}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png ${miscname}
|
|
|
|
done
|
|
|
|
done
|
|
|
|
cp -a ${srcdir}/src/sample ${miscname}
|
|
|
|
cp -a ${srcdir}/src/sample ${miscname}
|
|
|
|
tar -cJf ${miscarchive} ${miscname}
|
|
|
|
%if %{with_systemtap}
|
|
|
|
genchecksum ${miscarchive}
|
|
|
|
cp -a ${tapsetdir}* ${miscname}
|
|
|
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
tar -cJf ${miscarchive} ${miscname}
|
|
|
|
|
|
|
|
genchecksum ${miscarchive}
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
tar -cJf ${jdkarchive} --exclude='**.debuginfo' ${jdkname}
|
|
|
|
tar -cJf ${jdkarchive} --exclude='**.debuginfo' ${jdkname}
|
|
|
|
@ -1349,10 +1353,12 @@ for suffix in %{build_loop} ; do
|
|
|
|
buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt} ${debug_symbols}
|
|
|
|
buildjdk ${bootbuilddir} ${systemjdk} "%{bootstrap_targets}" ${debugbuild} ${link_opt} ${debug_symbols}
|
|
|
|
installjdk ${bootbuilddir} ${bootinstalldir}
|
|
|
|
installjdk ${bootbuilddir} ${bootinstalldir}
|
|
|
|
buildjdk ${builddir} $(pwd)/${bootinstalldir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
|
|
|
|
buildjdk ${builddir} $(pwd)/${bootinstalldir}/images/%{jdkimage} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
|
|
|
|
|
|
|
|
stripjdk ${builddir}
|
|
|
|
installjdk ${builddir} ${installdir}
|
|
|
|
installjdk ${builddir} ${installdir}
|
|
|
|
%{!?with_artifacts:rm -rf ${bootinstalldir}}
|
|
|
|
%{!?with_artifacts:rm -rf ${bootinstalldir}}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
|
|
|
|
buildjdk ${builddir} ${systemjdk} "${maketargets}" ${debugbuild} ${link_opt} ${debug_symbols}
|
|
|
|
|
|
|
|
stripjdk ${builddir}
|
|
|
|
installjdk ${builddir} ${installdir}
|
|
|
|
installjdk ${builddir} ${installdir}
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
packagejdk ${installdir} ${packagesdir}
|
|
|
|
packagejdk ${installdir} ${packagesdir}
|
|
|
|
@ -1642,6 +1648,37 @@ done
|
|
|
|
%{_jvmdir}/%{miscportablearchive}.sha256sum
|
|
|
|
%{_jvmdir}/%{miscportablearchive}.sha256sum
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
%changelog
|
|
|
|
|
|
|
|
* Fri Jul 14 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.20.0.8-1
|
|
|
|
|
|
|
|
- Update to jdk-11.0.20.0+8 (GA)
|
|
|
|
|
|
|
|
- Update release notes to 11.0.20.0+8
|
|
|
|
|
|
|
|
- Switch to GA mode for release
|
|
|
|
|
|
|
|
- Bump bundled HarfBuzz version to 7.0.1 as in jdk-11.0.20+7
|
|
|
|
|
|
|
|
- ** This tarball is embargoed until 2023-07-18 @ 1pm PT. **
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Jul 14 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.20.0.1-0.3.ea
|
|
|
|
|
|
|
|
- Determine path of output jmod path from command rather than guessing
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Jul 14 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.20.0.1-0.3.ea
|
|
|
|
|
|
|
|
- Rebuild jmods using the stripped binaries in release builds
|
|
|
|
|
|
|
|
- Fix trailing '.' in tarball name
|
|
|
|
|
|
|
|
- Make sure the unstripped JDK is customised by the installjdk function
|
|
|
|
|
|
|
|
- Resolves: OPENJDK-1975
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Jul 14 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.20.0.1-0.2.ea
|
|
|
|
|
|
|
|
- Re-enable SystemTap support and perform only substitutions possible without final NVR available
|
|
|
|
|
|
|
|
- Include tapsets in the miscellaneous tarball
|
|
|
|
|
|
|
|
- Drop unused globals for tapset installation
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Jun 30 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.20.0.1-0.2.ea
|
|
|
|
|
|
|
|
- Bump bundled LCMS version to 2.15 as in jdk-11.0.20+1.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Jun 30 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.20.0.1-0.1.ea
|
|
|
|
|
|
|
|
- Update to jdk-11.0.20+1 (EA)
|
|
|
|
|
|
|
|
- Update release notes to 11.0.20+1
|
|
|
|
|
|
|
|
- Switch to EA mode
|
|
|
|
|
|
|
|
- Drop local inclusion of JDK-8274864 & JDK-8305113 as they are included in 11.0.20+1
|
|
|
|
|
|
|
|
- Bump tzdata requirement to 2023c now it is available in the buildroot
|
|
|
|
|
|
|
|
|
|
|
|
* Mon Apr 24 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.19.0.7-2
|
|
|
|
* Mon Apr 24 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.19.0.7-2
|
|
|
|
- Sync with existing RHEL 8 build, in order to start building portables on RHEL 8
|
|
|
|
- Sync with existing RHEL 8 build, in order to start building portables on RHEL 8
|
|
|
|
- Remove use of devtoolset (RHEL 8 native compilers should be sufficient)
|
|
|
|
- Remove use of devtoolset (RHEL 8 native compilers should be sufficient)
|
|
|
|
|
Andrew Lukoshko
2 years ago