I7WSSE: Sync master to openEuler-23.09

This commit is contained in:
DXwangg 2023-08-29 14:47:40 +08:00
parent ee64629261
commit 0bd0479fe5
2 changed files with 13 additions and 5 deletions

View File

@ -72,7 +72,7 @@
%global is_system_jdk 0 %global is_system_jdk 0
%global aarch64 aarch64 arm64 armv8 %global aarch64 aarch64 arm64 armv8
%global jit_arches x86_64 %{aarch64} %global jit_arches x86_64 %{aarch64} riscv64
%global aot_arches x86_64 %{aarch64} %global aot_arches x86_64 %{aarch64}
# Set of architectures for which java has short vector math library (libsvml.so) # Set of architectures for which java has short vector math library (libsvml.so)
@ -155,11 +155,11 @@
# Used via new version scheme. JDK 19 was # Used via new version scheme. JDK 19 was
# GA'ed in March 2022 => 22.3 # GA'ed in March 2022 => 22.3
%global vendor_version_string 22.3 %global vendor_version_string 22.3
%global securityver 1 %global securityver 2
# buildjdkver is usually same as %%{majorver}, # buildjdkver is usually same as %%{majorver},
# but in time of bootstrap of next jdk, it is majorver-1, # but in time of bootstrap of next jdk, it is majorver-1,
# and this it is better to change it here, on single place # and this it is better to change it here, on single place
%global buildjdkver 19 %global buildjdkver 20
# We don't add any LTS designator for STS packages (Fedora and EPEL). # We don't add any LTS designator for STS packages (Fedora and EPEL).
# We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined. # We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
%if 0%{?rhel} && !0%{?epel} %if 0%{?rhel} && !0%{?epel}
@ -176,7 +176,7 @@
%global top_level_dir_name %{origin} %global top_level_dir_name %{origin}
%global minorver 0 %global minorver 0
%global buildver 9 %global buildver 9
%global rpmrelease 0 %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 # 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
%global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
@ -927,7 +927,7 @@ URL: http://openjdk.java.net/
# to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh # 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 # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
Source0: jdk-jdk%{majorver}-jdk-%{filever}+%{buildver}.tar.gz Source0: jdk-updates-jdk%{majorver}u-jdk-%{filever}+%{buildver}.tar.gz
Source1: OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.xz Source1: OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.xz
Source2: OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.xz Source2: OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.xz
Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
@ -1318,6 +1318,8 @@ if [ "$ARCH" = "x86_64" ]; then
elif [ "$ARCH" = "aarch64" ]; then elif [ "$ARCH" = "aarch64" ]; then
tar -xf %{SOURCE1} tar -xf %{SOURCE1}
BOOTJDKPATH=$PWD/jdk-20.0.2+9 BOOTJDKPATH=$PWD/jdk-20.0.2+9
elif [ "$ARCH" = "riscv64" ]; then
:
else else
echo " Failed to set BOOTJDKPATH " echo " Failed to set BOOTJDKPATH "
exit 18 exit 18
@ -1766,6 +1768,12 @@ cjc.mainProgram(arg)
%changelog %changelog
* Mon Aug 07 2023 misaka00251 <liuxin@iscas.ac.cn> - 1:20.0.2.9-1-rolling
- Add riscv64 to jit_arches
* Thu Aug 3 2023 wanghao <wanghao564@huawei.com> - 1:20.0.2.9-0-rolling
- Update to jdk-20.0.2+9
* Thu May 4 2023 wanghao <wanghao564@huawei.com> - 1:20.0.1.9-0-rolling * Thu May 4 2023 wanghao <wanghao564@huawei.com> - 1:20.0.1.9-0-rolling
- Update to jdk-20.0.1+9 - Update to jdk-20.0.1+9
- remove pr3183-rh1340845-support_system_crypto_policy.patch - remove pr3183-rh1340845-support_system_crypto_policy.patch