Update to OpenJDK 14
- update to jdk 14+36 ea build - remove JDK-8224851 patch, as OpenJDK 14 already contains it - removed pack200 and unpack200 binaries, slaves, manpages and libunpack.so library - added listings for jpackage binary, manpages and added slave records to alternatives Replace pr3755 patch with pr3782 from icedtea14 Replace all occurences in the generate_source_tarball.sh script. Mark the builds as ga, as OpenJDK 14 was released today
This commit is contained in:
Petra Mikova
parent
936ffd4bbc
commit
3119a367a5
|
|
@ -7,3 +7,4 @@
|
|||
/jdk-jdk13-jdk-13+33.tar.xz
|
||||
/jdk-updates-jdk13u-jdk-13.0.1+9.tar.xz
|
||||
/jdk-updates-jdk13u-jdk-13.0.2+8.tar.xz
|
||||
/jdk-jdk14-jdk-14+36.tar.xz
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# Example:
|
||||
# When used from local repo set REPO_ROOT pointing to file:// with your repo
|
||||
# If your local repo follows upstream forests conventions, it may be enough to set OPENJDK_URL
|
||||
# If you want to use a local copy of patch PR3755, set the path to it in the PR3755 variable
|
||||
# If you want to use a local copy of patch PR3782, set the path to it in the PR3782 variable
|
||||
#
|
||||
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
|
||||
# PROJECT_NAME=jdk
|
||||
|
|
@ -26,9 +26,9 @@
|
|||
# level folder, name is created, based on parameter
|
||||
#
|
||||
|
||||
if [ ! "x$PR3755" = "x" ] ; then
|
||||
if [ ! -f "$PR3755" ] ; then
|
||||
echo "You have specified PR3755 as $PR3755 but it does not exist. Exiting"
|
||||
if [ ! "x$PR3782" = "x" ] ; then
|
||||
if [ ! -f "$PR3782" ] ; then
|
||||
echo "You have specified PR3782 as $PR3782 but it does not exist. Exiting"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
|
@ -47,7 +47,7 @@ if [ "x$1" = "xhelp" ] ; then
|
|||
echo "COMPRESSION - the compression type to use (optional; defaults to ${COMPRESSION_DEFAULT})"
|
||||
echo "FILE_NAME_ROOT - name of the archive, minus extensions (optional; defaults to PROJECT_NAME-REPO_NAME-VERSION)"
|
||||
echo "TO_COMPRESS - what part of clone to pack (default is openjdk)"
|
||||
echo "PR3755 - the path to the PR3755 patch to apply (optional; downloaded if unavailable)"
|
||||
echo "PR3782 - the path to the PR3782 patch to apply (optional; downloaded if unavailable)"
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
|
|
@ -125,18 +125,18 @@ pushd "${FILE_NAME_ROOT}"
|
|||
rm -vf ${CRYPTO_PATH}/ecp_224.c
|
||||
|
||||
echo "Syncing EC list with NSS"
|
||||
if [ "x$PR3755" = "x" ] ; then
|
||||
if [ "x$PR3782" = "x" ] ; then
|
||||
# originally for 8:
|
||||
# get pr3755.patch (from http://icedtea.classpath.org/hg/icedtea11) from most correct tag
|
||||
# Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3755)
|
||||
echo "PR3755 not found. Downloading..."
|
||||
wget http://icedtea.classpath.org/hg/icedtea13/raw-file/tip/patches/pr3755.patch
|
||||
echo "Applying ${PWD}/pr3755.patch"
|
||||
patch -Np1 < pr3755.patch
|
||||
rm pr3755.patch
|
||||
# get pr3782.patch (from http://icedtea.classpath.org/hg/icedtea14) from most correct tag
|
||||
# Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3782)
|
||||
echo "PR3782 not found. Downloading..."
|
||||
wget https://icedtea.classpath.org/hg/icedtea14/raw-file/tip/patches/pr3782.patch
|
||||
echo "Applying ${PWD}/pr3782.patch"
|
||||
patch -Np1 < pr3782.patch
|
||||
rm pr3782.patch
|
||||
else
|
||||
echo "Applying ${PR3755}"
|
||||
patch -Np1 < $PR3755
|
||||
echo "Applying ${PR3782}"
|
||||
patch -Np1 < $PR3782
|
||||
fi;
|
||||
find . -name '*.orig' -exec rm -vf '{}' ';'
|
||||
popd
|
||||
|
|
|
|||
|
|
@ -198,8 +198,8 @@
|
|||
%endif
|
||||
|
||||
# New Version-String scheme-style defines
|
||||
%global majorver 13
|
||||
%global securityver 2
|
||||
%global majorver 14
|
||||
%global securityver 0
|
||||
# buildjdkver is usually same as %%{majorver},
|
||||
# but in time of bootstrap of next jdk, it is majorver-1,
|
||||
# and this it is better to change it here, on single place
|
||||
|
|
@ -217,7 +217,7 @@
|
|||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{origin}
|
||||
%global minorver 0
|
||||
%global buildver 8
|
||||
%global buildver 36
|
||||
%global rpmrelease 1
|
||||
# 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
|
||||
|
|
@ -262,7 +262,7 @@
|
|||
# fix for https://bugzilla.redhat.com/show_bug.cgi?id=1111349
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1590796#c14
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1655938
|
||||
%global _privatelibs libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libunpack[.]so.*|libzip[.]so.*
|
||||
%global _privatelibs libsplashscreen[.]so.*|libawt_xawt[.]so.*|libjli[.]so.*|libattach[.]so.*|libawt[.]so.*|libextnet[.]so.*|libawt_headless[.]so.*|libdt_socket[.]so.*|libfontmanager[.]so.*|libinstrument[.]so.*|libj2gss[.]so.*|libj2pcsc[.]so.*|libj2pkcs11[.]so.*|libjaas[.]so.*|libjavajpeg[.]so.*|libjdwp[.]so.*|libjimage[.]so.*|libjsound[.]so.*|liblcms[.]so.*|libmanagement[.]so.*|libmanagement_agent[.]so.*|libmanagement_ext[.]so.*|libmlib_image[.]so.*|libnet[.]so.*|libnio[.]so.*|libprefs[.]so.*|librmi[.]so.*|libsaproc[.]so.*|libsctp[.]so.*|libsunec[.]so.*|libzip[.]so.*
|
||||
%global _publiclibs libjawt[.]so.*|libjava[.]so.*|libjvm[.]so.*|libverify[.]so.*|libjsig[.]so.*
|
||||
%if %is_system_jdk
|
||||
%global __provides_exclude ^(%{_privatelibs})$
|
||||
|
|
@ -328,24 +328,18 @@ alternatives \\
|
|||
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{sdkdir %%1} \\
|
||||
--slave %{_bindir}/jjs jjs %{jrebindir %%1}/jjs \\
|
||||
--slave %{_bindir}/keytool keytool %{jrebindir %%1}/keytool \\
|
||||
--slave %{_bindir}/pack200 pack200 %{jrebindir %%1}/pack200 \\
|
||||
--slave %{_bindir}/rmid rmid %{jrebindir %%1}/rmid \\
|
||||
--slave %{_bindir}/rmiregistry rmiregistry %{jrebindir %%1}/rmiregistry \\
|
||||
--slave %{_bindir}/unpack200 unpack200 %{jrebindir %%1}/unpack200 \\
|
||||
--slave %{_mandir}/man1/java.1$ext java.1$ext \\
|
||||
%{_mandir}/man1/java-%{uniquesuffix %%1}.1$ext \\
|
||||
--slave %{_mandir}/man1/jjs.1$ext jjs.1$ext \\
|
||||
%{_mandir}/man1/jjs-%{uniquesuffix %%1}.1$ext \\
|
||||
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\
|
||||
%{_mandir}/man1/keytool-%{uniquesuffix %%1}.1$ext \\
|
||||
--slave %{_mandir}/man1/pack200.1$ext pack200.1$ext \\
|
||||
%{_mandir}/man1/pack200-%{uniquesuffix %%1}.1$ext \\
|
||||
--slave %{_mandir}/man1/rmid.1$ext rmid.1$ext \\
|
||||
%{_mandir}/man1/rmid-%{uniquesuffix %%1}.1$ext \\
|
||||
--slave %{_mandir}/man1/rmiregistry.1$ext rmiregistry.1$ext \\
|
||||
%{_mandir}/man1/rmiregistry-%{uniquesuffix %%1}.1$ext \\
|
||||
--slave %{_mandir}/man1/unpack200.1$ext unpack200.1$ext \\
|
||||
%{_mandir}/man1/unpack200-%{uniquesuffix %%1}.1$ext
|
||||
|
||||
for X in %{origin} %{javaver} ; do
|
||||
alternatives --install %{_jvmdir}/jre-"$X" jre_"$X" %{_jvmdir}/%{sdkdir %%1} $PRIORITY --family %{name}.%{_arch}
|
||||
|
|
@ -423,6 +417,7 @@ alternatives \\
|
|||
--slave %{_bindir}/jimage jimage %{sdkbindir %%1}/jimage \\
|
||||
--slave %{_bindir}/jinfo jinfo %{sdkbindir %%1}/jinfo \\
|
||||
--slave %{_bindir}/jmap jmap %{sdkbindir %%1}/jmap \\
|
||||
--slave %{_bindir}/jpackage jpackage %{sdkbindir %%1}/jpackage \\
|
||||
--slave %{_bindir}/jps jps %{sdkbindir %%1}/jps \\
|
||||
--slave %{_bindir}/jrunscript jrunscript %{sdkbindir %%1}/jrunscript \\
|
||||
--slave %{_bindir}/jshell jshell %{sdkbindir %%1}/jshell \\
|
||||
|
|
@ -453,6 +448,8 @@ alternatives \\
|
|||
%{_mandir}/man1/jinfo-%{uniquesuffix %%1}.1$ext \\
|
||||
--slave %{_mandir}/man1/jmap.1$ext jmap.1$ext \\
|
||||
%{_mandir}/man1/jmap-%{uniquesuffix %%1}.1$ext \\
|
||||
--slave %{_mandir}/man1/jpackage.1$ext jpackage.1$ext \\
|
||||
%{_mandir}/man1/jpackage-%{uniquesuffix %%1}.1$ext \\
|
||||
--slave %{_mandir}/man1/jps.1$ext jps.1$ext \\
|
||||
%{_mandir}/man1/jps-%{uniquesuffix %%1}.1$ext \\
|
||||
--slave %{_mandir}/man1/jrunscript.1$ext jrunscript.1$ext \\
|
||||
|
|
@ -555,10 +552,8 @@ exit 0
|
|||
%{_jvmdir}/%{sdkdir %%1}/bin/java
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jjs
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/keytool
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/pack200
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/rmid
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/rmiregistry
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/unpack200
|
||||
%dir %{_jvmdir}/%{sdkdir %%1}/lib
|
||||
%ifarch %{jit_arches}
|
||||
%{_jvmdir}/%{sdkdir %%1}/lib/classlist
|
||||
|
|
@ -606,7 +601,6 @@ exit 0
|
|||
%endif
|
||||
%{_jvmdir}/%{sdkdir %%1}/lib/libsctp.so
|
||||
%{_jvmdir}/%{sdkdir %%1}/lib/libsunec.so
|
||||
%{_jvmdir}/%{sdkdir %%1}/lib/libunpack.so
|
||||
%{_jvmdir}/%{sdkdir %%1}/lib/libverify.so
|
||||
%{_jvmdir}/%{sdkdir %%1}/lib/libzip.so
|
||||
%dir %{_jvmdir}/%{sdkdir %%1}/lib/jfr
|
||||
|
|
@ -615,10 +609,8 @@ exit 0
|
|||
%{_mandir}/man1/java-%{uniquesuffix %%1}.1*
|
||||
%{_mandir}/man1/jjs-%{uniquesuffix %%1}.1*
|
||||
%{_mandir}/man1/keytool-%{uniquesuffix %%1}.1*
|
||||
%{_mandir}/man1/pack200-%{uniquesuffix %%1}.1*
|
||||
%{_mandir}/man1/rmid-%{uniquesuffix %%1}.1*
|
||||
%{_mandir}/man1/rmiregistry-%{uniquesuffix %%1}.1*
|
||||
%{_mandir}/man1/unpack200-%{uniquesuffix %%1}.1*
|
||||
%{_jvmdir}/%{sdkdir %%1}/lib/server/
|
||||
%{_jvmdir}/%{sdkdir %%1}/lib/client/
|
||||
%ifarch %{jit_arches}
|
||||
|
|
@ -699,6 +691,7 @@ exit 0
|
|||
%{_jvmdir}/%{sdkdir %%1}/bin/jlink
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jmap
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jmod
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jpackage
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jps
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jrunscript
|
||||
%{_jvmdir}/%{sdkdir %%1}/bin/jshell
|
||||
|
|
@ -727,6 +720,7 @@ exit 0
|
|||
%{_mandir}/man1/jdeps-%{uniquesuffix %%1}.1*
|
||||
%{_mandir}/man1/jinfo-%{uniquesuffix %%1}.1*
|
||||
%{_mandir}/man1/jmap-%{uniquesuffix %%1}.1*
|
||||
%{_mandir}/man1/jpackage-%{uniquesuffix %%1}.1*
|
||||
%{_mandir}/man1/jps-%{uniquesuffix %%1}.1*
|
||||
%{_mandir}/man1/jrunscript-%{uniquesuffix %%1}.1*
|
||||
%{_mandir}/man1/jstack-%{uniquesuffix %%1}.1*
|
||||
|
|
@ -1006,7 +1000,7 @@ URL: http://openjdk.java.net/
|
|||
|
||||
# to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh
|
||||
# update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
|
||||
Source0: jdk-updates-jdk%{majorver}u-jdk-%{majorver}.%{minorver}.%{securityver}+%{buildver}.tar.xz
|
||||
Source0: jdk-jdk%{majorver}-jdk-%{majorver}+%{buildver}.tar.xz
|
||||
Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
|
||||
|
||||
# Desktop files. Adapted from IcedTea
|
||||
|
|
@ -1610,7 +1604,7 @@ if ! echo $suffix | grep -q "debug" ; then
|
|||
# Install Javadoc documentation
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
|
||||
cp -a %{buildoutputdir $suffix}/images/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir $suffix}
|
||||
cp -a %{buildoutputdir $suffix}/bundles/jdk-%{majorver}.%{minorver}.%{securityver}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir $suffix}.zip
|
||||
cp -a %{buildoutputdir $suffix}/bundles/jdk-%{majorver}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir $suffix}.zip
|
||||
fi
|
||||
|
||||
|
||||
|
|
@ -1811,6 +1805,11 @@ require "copy_jdk_configs.lua"
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Mar 13 2020 Petra Alice Mikova <pmikova@redhat.com> - 1:14.0.0.36-1.rolling
|
||||
- update to jdk 14+36 ga build
|
||||
- removed pack200 and unpack200 binaries, slaves, manpages and libunpack.so library
|
||||
- added listings for jpackage binary, manpages and added slave records to alternatives
|
||||
|
||||
* Fri Jan 17 2020 Petra Alice Mikova <pmikova@redhat.com> - 1:13.0.2.8-1.rolling
|
||||
- removed patch jdk8231405_guarantee_d_nonequals_null_failed_null_dominator_info.patch
|
||||
- removed patch jdk8231583_fix_register_clash_in_sbsa_resolve_forwarding_pointer_borrowing.patch
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (jdk-updates-jdk13u-jdk-13.0.2+8.tar.xz) = b7b30b650d67705546dba4eab195a8f86fdb7c2ecdd2d2925fe8aefcf015ea00c0d4af600a7aa2f0ed26a4259f6591d645ca607c5c992c2c6fd2b756d5aac8c1
|
||||
SHA512 (jdk-jdk14-jdk-14+36.tar.xz) = eb4c358907c99b4fab2d1e6179d72df647738340984db958bbd1e5f73217bd13d531b019464c5ae2a9fd95a024394e1154d66c298e5988cba9e9f59a9f391359
|
||||
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
|
||||
|
|
|
|||
Loading…
Reference in New Issue