Merge branch 'master' openjdk-11 into openEuler-20.03-LTS-SP3
This commit is contained in:
DXwangg
commit
1f1fcc5f0e
61086
2000-Add-riscv64-support-based-on-bishengjdk-riscv-branch.patch
Normal file
61086
2000-Add-riscv64-support-based-on-bishengjdk-riscv-branch.patch
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -367,4 +367,4 @@ index 000000000..85b49171c
|
||||
--- /dev/null
|
||||
+++ b/version.txt
|
||||
@@ -0,0 +1 @@
|
||||
+11.0.19.0.13
|
||||
+11.0.20.0.13
|
||||
|
||||
@ -120,14 +120,14 @@ index 122a01901..c131bd493 100644
|
||||
+ File.separator + "security" + File.separator + "cacerts";
|
||||
|
||||
// The numbers of certs now.
|
||||
- private static final int COUNT = 90;
|
||||
+ private static final int COUNT = 87;
|
||||
- private static final int COUNT = 97;
|
||||
+ private static final int COUNT = 94;
|
||||
|
||||
// SHA-256 of cacerts, can be generated with
|
||||
// shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95
|
||||
private static final String CHECKSUM
|
||||
- = "21:8C:35:29:4C:E2:49:D2:83:30:DF:8B:5E:39:F8:8C:D6:C5:2B:59:05:32:74:E5:79:A5:91:9F:3C:57:B9:E3";
|
||||
+ = "D5:5B:7A:BD:8F:4A:DA:19:75:90:28:61:E7:40:6D:A2:54:F5:64:C0:F0:30:29:16:FB:46:9B:57:D5:F7:04:D7";
|
||||
- = "72:C7:B8:9E:54:94:D2:D9:C0:E5:9F:F7:C3:8C:3B:18:D7:42:23:82:51:F2:AD:A1:14:26:E0:4A:F2:5F:AE:80";
|
||||
+ = "38:20:3E:9C:85:F4:5C:F2:4A:F4:1C:FF:DA:AD:DF:A6:1E:B0:E9:8F:D4:C3:B5:AA:F5:54:E2:94:3E:AF:2F:7C";
|
||||
|
||||
// map of cert alias to SHA-256 fingerprint
|
||||
@SuppressWarnings("serial")
|
||||
|
||||
BIN
jdk-updates-jdk11u-jdk-11.0.20-ga.tar.xz
Normal file
BIN
jdk-updates-jdk11u-jdk-11.0.20-ga.tar.xz
Normal file
Binary file not shown.
@ -54,6 +54,7 @@
|
||||
%endif
|
||||
|
||||
%global aarch64 aarch64
|
||||
%global riscv64 riscv64
|
||||
|
||||
# By default, we build a debug build during main build on JIT architectures
|
||||
%if %{with slowdebug}
|
||||
@ -109,12 +110,15 @@
|
||||
%ifarch %{aarch64}
|
||||
%global archinstall aarch64
|
||||
%endif
|
||||
%ifarch %{riscv64}
|
||||
%global archinstall riscv64
|
||||
%endif
|
||||
|
||||
%global with_systemtap 1
|
||||
|
||||
# New Version-String scheme-style defines
|
||||
%global majorver 11
|
||||
%global securityver 19
|
||||
%global securityver 20
|
||||
# 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
|
||||
@ -130,12 +134,12 @@
|
||||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{origin}
|
||||
%global minorver 0
|
||||
%global buildver 7
|
||||
%global buildver 8
|
||||
%global patchver 0
|
||||
|
||||
%global project jdk-updates
|
||||
%global repo jdk11u
|
||||
%global revision jdk-11.0.19-ga
|
||||
%global revision jdk-11.0.20-ga
|
||||
%global full_revision %{project}-%{repo}-%{revision}
|
||||
# priority must be 7 digits in total
|
||||
# setting to 1, so debug ones can have 0
|
||||
@ -284,7 +288,9 @@ ext=.gz
|
||||
alternatives \\
|
||||
--install %{_bindir}/javac javac %{sdkbindir -- %{?1}}/javac $PRIORITY --family %{name}.%{_arch} \\
|
||||
--slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdkdir -- %{?1}} \\
|
||||
%ifarch %{aarch64} x86_64
|
||||
--slave %{_bindir}/jaotc jaotc %{sdkbindir -- %{?1}}/jaotc \\
|
||||
%endif
|
||||
--slave %{_bindir}/jlink jlink %{sdkbindir -- %{?1}}/jlink \\
|
||||
--slave %{_bindir}/jmod jmod %{sdkbindir -- %{?1}}/jmod \\
|
||||
--slave %{_bindir}/jhsdb jhsdb %{sdkbindir -- %{?1}}/jhsdb \\
|
||||
@ -555,7 +561,9 @@ exit 0
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jstatd
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmic
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/serialver
|
||||
%ifarch %{aarch64} x86_64
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/jaotc
|
||||
%endif
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/include
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/ct.sym
|
||||
%if %{with_systemtap}
|
||||
@ -740,7 +748,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release}
|
||||
|
||||
Name: java-%{javaver}-%{origin}
|
||||
Version: %{newjavaver}.%{buildver}
|
||||
Release: 1
|
||||
Release: 2
|
||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
|
||||
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
|
||||
# also included the epoch in their virtual provides. This created a
|
||||
@ -773,7 +781,7 @@ License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv
|
||||
URL: http://openjdk.java.net/
|
||||
|
||||
|
||||
Source0: %{full_revision}.tar.gz
|
||||
Source0: %{full_revision}.tar.xz
|
||||
|
||||
# Use 'icedtea_sync.sh' to update the following
|
||||
# They are based on code contained in the IcedTea project (3.x).
|
||||
@ -876,7 +884,14 @@ Patch89: downgrade-the-symver-of-memcpy-GLIBC_2.14-on-x86.patch
|
||||
Patch90: fix_Internal_and_external_code_inconsistency.patch
|
||||
|
||||
# 11.0.18
|
||||
patch91: 8222289-Overhaul-logic-for-reading-writing-constant-pool-entries.patch
|
||||
Patch91: 8222289-Overhaul-logic-for-reading-writing-constant-pool-entries.patch
|
||||
|
||||
############################################
|
||||
#
|
||||
# riscv64 specific patches
|
||||
#
|
||||
############################################
|
||||
Patch2000: 2000-Add-riscv64-support-based-on-bishengjdk-riscv-branch.patch
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: alsa-lib-devel
|
||||
@ -1107,6 +1122,9 @@ fi
|
||||
pushd %{top_level_dir_name}
|
||||
|
||||
# OpenJDK patches
|
||||
%ifarch riscv64
|
||||
%patch2000 -p1
|
||||
%else
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
@ -1166,6 +1184,7 @@ pushd %{top_level_dir_name}
|
||||
%patch89 -p1
|
||||
%patch90 -p1
|
||||
%patch91 -p1
|
||||
%endif
|
||||
popd # openjdk
|
||||
|
||||
# %patch1000
|
||||
@ -1226,7 +1245,7 @@ export NUM_PROC=${NUM_PROC:-1}
|
||||
[ ${NUM_PROC} -gt %{?_smp_ncpus_max} ] && export NUM_PROC=%{?_smp_ncpus_max}
|
||||
%endif
|
||||
|
||||
%ifarch %{aarch64}
|
||||
%ifarch %{aarch64} riscv64
|
||||
export ARCH_DATA_MODEL=64
|
||||
%endif
|
||||
|
||||
@ -1326,7 +1345,7 @@ export JAVA_HOME=$(pwd)/%{buildoutputdir -- $suffix}/images/%{jdkimage}
|
||||
# Check debug symbols are present and can identify code
|
||||
find "$JAVA_HOME" -iname '*.so' -print0 | while read -d $'\0' lib
|
||||
do
|
||||
if [ -f "$lib" ] ; then
|
||||
if [ ![-f "$lib"] ] ; then
|
||||
echo "Testing $lib for debug symbols"
|
||||
# All these tests rely on RPM failing the build if the exit code of any set
|
||||
# of piped commands is non-zero.
|
||||
@ -1382,7 +1401,7 @@ quit
|
||||
end
|
||||
run -version
|
||||
EOF
|
||||
grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
|
||||
#grep 'JavaCallWrapper::JavaCallWrapper' gdb.out
|
||||
|
||||
# Check src.zip has all sources. See RHBZ#1130490
|
||||
jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe'
|
||||
@ -1669,7 +1688,18 @@ require "copy_jdk_configs.lua"
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon May 08 2023 wanghao <wanghao564@huawei.com> - 1:11.0.19.7-0
|
||||
* Thu Aug 17 2023 misaka00251 <liuxin@iscas.ac.cn> - 1:11.0.20.8-2
|
||||
- Add riscv64 support (based on bishengjdk riscv branch)
|
||||
|
||||
* Wed Aug 2023 noah <hedongbo@huawei.com> - 1:11.0.20.8-1
|
||||
- fix CPUBench kmeans random fails
|
||||
|
||||
* Wed Jul 2023 DXwangg <wangjiawei80@huawei.com> - 1:11.0.20.8-0
|
||||
- update to 11.0.20+8(GA)
|
||||
- modified delete_expired_certificates.patch
|
||||
|
||||
|
||||
* Thu Apr 2023 DXwangg <wangjiawei80@huawei.com> - 1:11.0.19.7-0
|
||||
- update to 11.0.19+7(GA)
|
||||
- deleted 8225648-TESTBUG-java-lang-annotation-loaderLeak-Main.patch
|
||||
- modified Add-KAE-implementation.patch
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user