Merge master
This commit is contained in:
noah
commit
72d708e42f
BIN
jdk-jdk17-jdk-17+35.tar.gz
Normal file
BIN
jdk-jdk17-jdk-17+35.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
@ -75,6 +75,9 @@
|
||||
%global jit_arches x86_64 %{aarch64}
|
||||
%global aot_arches x86_64 %{aarch64}
|
||||
|
||||
# Set of architectures for which java has short vector math library (libsvml.so)
|
||||
%global svml_arches x86_64
|
||||
|
||||
# By default, we build a debug build during main build on JIT architectures
|
||||
%if %{with slowdebug}
|
||||
%ifarch %{jit_arches}
|
||||
@ -97,9 +100,9 @@
|
||||
%global rev_build_loop %{build_loop2} %{build_loop1}
|
||||
|
||||
%ifarch %{jit_arches}
|
||||
%global bootstrap_build 1
|
||||
%global bootstrap_build 0
|
||||
%else
|
||||
%global bootstrap_build 1
|
||||
%global bootstrap_build 0
|
||||
%endif
|
||||
|
||||
%if %{bootstrap_build}
|
||||
@ -148,11 +151,11 @@
|
||||
|
||||
# New Version-String scheme-style defines
|
||||
# If you bump majorver, you must bump also vendor_version_string
|
||||
%global majorver 16
|
||||
# Used via new version scheme. JDK 16 was
|
||||
# GA'ed in March 2021 => 21.3
|
||||
%global vendor_version_string 21.3
|
||||
%global securityver 1
|
||||
%global majorver 17
|
||||
# Used via new version scheme. JDK 17 was
|
||||
# GA'ed in March 2021 => 21.9
|
||||
%global vendor_version_string 21.9
|
||||
%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
|
||||
@ -167,8 +170,8 @@
|
||||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{origin}
|
||||
%global minorver 0
|
||||
%global buildver 9
|
||||
%global rpmrelease 1
|
||||
%global buildver 35
|
||||
%global rpmrelease 0
|
||||
# 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
|
||||
%global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
|
||||
@ -178,6 +181,9 @@
|
||||
%endif
|
||||
%global newjavaver %{majorver}.%{minorver}.%{securityver}
|
||||
|
||||
# Strip up to 6 trailing zeros in newjavaver, as the JDK does, to get the correct version used in filenames
|
||||
%global filever %(svn=%{newjavaver}; for i in 1 2 3 4 5 6 ; do svn=${svn%%.0} ; done; echo ${svn})
|
||||
|
||||
%global javaver %{majorver}
|
||||
|
||||
# Define milestone (EA for pre-releases, GA for releases)
|
||||
@ -281,14 +287,11 @@ alternatives \\
|
||||
--install %{_bindir}/java java %{jrebindir -- %{?1}}/java $PRIORITY --family %{name}.%{_arch} \\
|
||||
--slave %{_jvmdir}/jre jre %{_jvmdir}/%{sdkdir -- %{?1}} \\
|
||||
--slave %{_bindir}/keytool keytool %{jrebindir -- %{?1}}/keytool \\
|
||||
--slave %{_bindir}/rmid rmid %{jrebindir -- %{?1}}/rmid \\
|
||||
--slave %{_bindir}/rmiregistry rmiregistry %{jrebindir -- %{?1}}/rmiregistry \\
|
||||
--slave %{_mandir}/man1/java.1$ext java.1$ext \\
|
||||
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1$ext \\
|
||||
--slave %{_mandir}/man1/keytool.1$ext keytool.1$ext \\
|
||||
%{_mandir}/man1/keytool-%{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
|
||||
|
||||
@ -345,9 +348,6 @@ ext=.gz
|
||||
alternatives \\
|
||||
--install %{_bindir}/javac javac %{sdkbindir -- %{?1}}/javac $PRIORITY --family %{name}.%{_arch} \\
|
||||
--slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdkdir -- %{?1}} \\
|
||||
%ifarch %{aot_arches}
|
||||
--slave %{_bindir}/jaotc jaotc %{sdkbindir -- %{?1}}/jaotc \\
|
||||
%endif
|
||||
--slave %{_bindir}/jlink jlink %{sdkbindir -- %{?1}}/jlink \\
|
||||
--slave %{_bindir}/jmod jmod %{sdkbindir -- %{?1}}/jmod \\
|
||||
%ifarch %{jit_arches}
|
||||
@ -499,7 +499,6 @@ exit 0
|
||||
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/bin
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/java
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/keytool
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmid
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmiregistry
|
||||
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib
|
||||
%ifarch %{jit_arches}
|
||||
@ -544,6 +543,10 @@ exit 0
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsaproc.so
|
||||
%endif
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsctp.so
|
||||
%ifarch %{svml_arches}
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsvml.so
|
||||
%endif
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libsyslookup.so
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libverify.so
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libzip.so
|
||||
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr
|
||||
@ -551,7 +554,6 @@ exit 0
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/profile.jfc
|
||||
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
|
||||
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
|
||||
%{_mandir}/man1/rmid-%{uniquesuffix -- %{?1}}.1*
|
||||
%{_mandir}/man1/rmiregistry-%{uniquesuffix -- %{?1}}.1*
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/server/
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/client/
|
||||
@ -570,7 +572,7 @@ exit 0
|
||||
%dir %{etcjavadir -- %{?1}}/conf/security/policy/limited
|
||||
%dir %{etcjavadir -- %{?1}}/conf/security/policy/unlimited
|
||||
%config(noreplace) %{etcjavadir -- %{?1}}/lib/security/default.policy
|
||||
%config(noreplace) %{etcjavadir -- %{?1}}/lib/security/blacklisted.certs
|
||||
%config(noreplace) %{etcjavadir -- %{?1}}/lib/security/blocked.certs
|
||||
%config(noreplace) %{etcjavadir -- %{?1}}/lib/security/public_suffix_list.dat
|
||||
%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/policy/limited/exempt_local.policy
|
||||
%config(noreplace) %{etcjavadir -- %{?1}}/conf/security/policy/limited/default_local.policy
|
||||
@ -637,9 +639,6 @@ exit 0
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jstat
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jstatd
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/serialver
|
||||
%ifarch %{aot_arches}
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jaotc
|
||||
%endif
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/include
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/ct.sym
|
||||
%if %{with_systemtap}
|
||||
@ -669,9 +668,6 @@ exit 0
|
||||
%{_mandir}/man1/jmod-%{uniquesuffix -- %{?1}}.1.gz
|
||||
%{_mandir}/man1/jshell-%{uniquesuffix -- %{?1}}.1.gz
|
||||
%{_mandir}/man1/jfr-%{uniquesuffix -- %{?1}}.1.gz
|
||||
%ifarch %{aot_arches}
|
||||
%{_mandir}/man1/jaotc-%{uniquesuffix -- %{?1}}.1.gz
|
||||
%endif
|
||||
|
||||
%if %{with_systemtap}
|
||||
%dir %{tapsetroot}
|
||||
@ -683,7 +679,6 @@ exit 0
|
||||
%if %{is_release_build -- %{?1}}
|
||||
%ghost %{_bindir}/javac
|
||||
%ghost %{_jvmdir}/java
|
||||
%ghost %{_bindir}/jaotc
|
||||
%ghost %{_bindir}/jlink
|
||||
%ghost %{_bindir}/jmod
|
||||
%ghost %{_bindir}/jhsdb
|
||||
@ -923,7 +918,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.gz
|
||||
Source0: jdk-jdk%{majorver}-jdk-%{filever}+%{buildver}.tar.gz
|
||||
Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
|
||||
|
||||
# Desktop files. Adapted from IcedTea
|
||||
@ -1287,7 +1282,7 @@ top_dir_abs_path=$(pwd)/%{top_level_dir_name}
|
||||
# default pre-version supplied there (despite
|
||||
# what the file claims), so we pass it manually
|
||||
# to configure
|
||||
VERSION_FILE=${top_dir_abs_path}/make/autoconf/version-numbers
|
||||
VERSION_FILE=${top_dir_abs_path}/make/conf/version-numbers.conf
|
||||
if [ -f ${VERSION_FILE} ] ; then
|
||||
EA_DESIGNATOR=$(grep '^DEFAULT_PROMOTED_VERSION_PRE' ${VERSION_FILE} | cut -d '=' -f 2)
|
||||
else
|
||||
@ -1343,8 +1338,6 @@ if echo $debugbuild | grep -q "debug" ; then
|
||||
maketargets="%{debug_targets}"
|
||||
fi
|
||||
make \
|
||||
JAVAC_FLAGS=-g \
|
||||
LOG=trace \
|
||||
WARNINGS_ARE_ERRORS="-Wno-error" \
|
||||
CFLAGS_WARNINGS_ARE_ERRORS="-Wno-error" \
|
||||
$maketargets || ( pwd; find $top_dir_abs_path -name "hs_err_pid*.log" | xargs cat && false )
|
||||
@ -1530,7 +1523,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-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip
|
||||
fi
|
||||
|
||||
# Install icons and menu entries
|
||||
@ -1739,6 +1732,21 @@ require "copy_jdk_configs.lua"
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Nov 7 2021 noah <hedongbo@huawei.com> - 1:17.0.0.35-0.0.ea.rolling
|
||||
- Update to jdk-17.0.0.0+35
|
||||
- change path to the version-numbers.conf
|
||||
- removed JAVAC_FLAGS=-g from make command, as it breaks the build since JDK-8258407
|
||||
- removed rmid binary from files and from slaves
|
||||
- renamed lib/security/blacklisted.certs to lib/security/blocked.certs
|
||||
- add lib/libsvml.so for intel
|
||||
- add lib/libsyslookup.so to files
|
||||
|
||||
* Tuh Sep 9 2021 noah <hedongbo@huawei.com> - 1:16.0.2.7-0.rolling
|
||||
- Update to jdk-16.0.2+7
|
||||
|
||||
* Thu Jul 8 2021 noah <hedongbo@huawei.com> - 1:16.0.1.9-2.rolling
|
||||
- delete build log and bootstrap_build to reduce build time
|
||||
|
||||
* Wed Jun 2 2021 noah <hedongbo@huawei.com> - 1:16.0.1.9-1.rolling
|
||||
- add LICENSE to openjdk-latest
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user