!169 sync master to openEuler-2203-LTS-SP3
From: @kuenking111 Reviewed-by: @alexanderbill Signed-off-by: @alexanderbill
This commit is contained in:
openeuler-ci-bot
Gitee
commit
a08e1fec4a
BIN
OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.xz
Normal file
BIN
OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.xz
Normal file
Binary file not shown.
BIN
OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.xz
Normal file
BIN
OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.xz
Normal file
Binary file not shown.
Binary file not shown.
BIN
jdk-updates-jdk21u-jdk-21+35.tar.gz
Normal file
BIN
jdk-updates-jdk21u-jdk-21+35.tar.gz
Normal file
Binary file not shown.
@ -72,7 +72,7 @@
|
||||
%global is_system_jdk 0
|
||||
|
||||
%global aarch64 aarch64 arm64 armv8
|
||||
%global jit_arches x86_64 %{aarch64}
|
||||
%global jit_arches x86_64 %{aarch64} riscv64
|
||||
%global aot_arches x86_64 %{aarch64}
|
||||
|
||||
# Set of architectures for which java has short vector math library (libsvml.so)
|
||||
@ -151,7 +151,7 @@
|
||||
|
||||
# New Version-String scheme-style defines
|
||||
# If you bump majorver, you must bump also vendor_version_string
|
||||
%global majorver 19
|
||||
%global majorver 21
|
||||
# Used via new version scheme. JDK 19 was
|
||||
# GA'ed in March 2022 => 22.3
|
||||
%global vendor_version_string 22.3
|
||||
@ -159,7 +159,7 @@
|
||||
# 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
|
||||
%global buildjdkver 19
|
||||
%global buildjdkver 21
|
||||
# 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.
|
||||
%if 0%{?rhel} && !0%{?epel}
|
||||
@ -175,7 +175,7 @@
|
||||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{origin}
|
||||
%global minorver 0
|
||||
%global buildver 36
|
||||
%global buildver 35
|
||||
%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
|
||||
@ -539,6 +539,7 @@ exit 0
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjimage.so
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libjsound.so
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/liblcms.so
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/lible.so
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libmanagement.so
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libmanagement_agent.so
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libmanagement_ext.so
|
||||
@ -599,6 +600,7 @@ exit 0
|
||||
%config(noreplace) %{etcjavadir -- %{?1}}/conf/management/management.properties
|
||||
%config(noreplace) %{etcjavadir -- %{?1}}/conf/net.properties
|
||||
%config(noreplace) %{etcjavadir -- %{?1}}/conf/sound.properties
|
||||
%config(noreplace) %{etcjavadir -- %{?1}}/conf/jaxp.properties
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/conf
|
||||
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/security
|
||||
%if %is_system_jdk
|
||||
@ -927,7 +929,9 @@ 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-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
|
||||
Source2: OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.xz
|
||||
Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
|
||||
|
||||
# Desktop files. Adapted from IcedTea
|
||||
@ -960,8 +964,6 @@ Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch
|
||||
# Restrict access to java-atk-wrapper classes
|
||||
Patch2: rh1648644-java_access_bridge_privileged_security.patch
|
||||
Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch
|
||||
# Follow system wide crypto policy RHBZ#1249083
|
||||
Patch4: pr3183-rh1340845-support_system_crypto_policy.patch
|
||||
# Depend on pcs-lite-libs instead of pcs-lite-devel as this is only in optional repo
|
||||
Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch
|
||||
|
||||
@ -1201,7 +1203,6 @@ pushd %{top_level_dir_name}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
@ -1311,6 +1312,23 @@ if [ "x${EA_DESIGNATOR}" != "x%{expected_ea_designator}" ] ; then
|
||||
exit 17
|
||||
fi
|
||||
|
||||
ARCH=$(uname -m)
|
||||
BOOTJDKPATH=/usr/lib/jvm/java-%{buildjdkver}-openjdk
|
||||
if [ "$ARCH" = "x86_64" ]; then
|
||||
tar -xf %{SOURCE2}
|
||||
BOOTJDKPATH=$PWD/jdk-20.0.2+9
|
||||
elif [ "$ARCH" = "aarch64" ]; then
|
||||
tar -xf %{SOURCE1}
|
||||
BOOTJDKPATH=$PWD/jdk-20.0.2+9
|
||||
elif [ "$ARCH" = "riscv64" ]; then
|
||||
:
|
||||
else
|
||||
echo " Failed to set BOOTJDKPATH "
|
||||
exit 18
|
||||
fi
|
||||
|
||||
echo $BOOTJDKPATH
|
||||
|
||||
mkdir -p %{buildoutputdir -- $suffix}
|
||||
pushd %{buildoutputdir -- $suffix}
|
||||
|
||||
@ -1320,6 +1338,9 @@ bash ../configure \
|
||||
%endif
|
||||
%ifarch %{ppc64le}
|
||||
--with-jobs=1 \
|
||||
%endif
|
||||
%if "%toolchain" == "clang"
|
||||
--with-toolchain-type=clang \
|
||||
%endif
|
||||
--with-version-build=%{buildver} \
|
||||
--with-version-pre=\"${EA_DESIGNATOR}\" \
|
||||
@ -1329,7 +1350,7 @@ bash ../configure \
|
||||
--with-vendor-url="https://openeuler.org/" \
|
||||
--with-vendor-bug-url="%{bug_url}" \
|
||||
--with-vendor-vm-bug-url="%{bug_url}" \
|
||||
--with-boot-jdk=/usr/lib/jvm/java-%{buildjdkver}-openjdk \
|
||||
--with-boot-jdk=$BOOTJDKPATH \
|
||||
--with-debug-level=$debugbuild \
|
||||
--with-native-debug-symbols=internal \
|
||||
--enable-unlimited-crypto \
|
||||
@ -1401,7 +1422,7 @@ $JAVA_HOME/bin/java $(echo $(basename %{SOURCE14})|sed "s|\.java||")
|
||||
# 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.
|
||||
@ -1458,10 +1479,10 @@ 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'
|
||||
#jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe'
|
||||
|
||||
# Check class files include useful debugging information
|
||||
$JAVA_HOME/bin/javap -l java.lang.Object | grep "Compiled from"
|
||||
@ -1752,6 +1773,21 @@ cjc.mainProgram(arg)
|
||||
|
||||
|
||||
%changelog
|
||||
* Sat Oct 7 2023 kuenking111 <wangkun49@huawei.com> - 1:21.0.0.35-0-rolling
|
||||
|
||||
* 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
|
||||
- Update to jdk-20.0.1+9
|
||||
- remove pr3183-rh1340845-support_system_crypto_policy.patch
|
||||
|
||||
* Wed Feb 1 2023 DXwangg <wangjiawei80@huawei.com> - 1:19.0.2.7-0-rolling
|
||||
- Update to jdk-19.0.2+7
|
||||
|
||||
* Wed Nov 2 2022 DXwangg <wangjiawei80@huawei.com> - 1:19.0.0.36-1.rolling
|
||||
- set build jdk to 19
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user