diff --git a/jdk-updates-jdk19u-jdk-19.0.2+7.tar.gz b/OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.xz similarity index 64% rename from jdk-updates-jdk19u-jdk-19.0.2+7.tar.gz rename to OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.xz index be4f14152a2b295099b0d59765226a34f8a2df06..896dce1cf72940b0bf4ffe2abe329216d335eedc 100644 Binary files a/jdk-updates-jdk19u-jdk-19.0.2+7.tar.gz and b/OpenJDK20U-jdk_aarch64_linux_hotspot_20.0.2_9.tar.xz differ diff --git a/OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.xz b/OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..ffd60eaaa73c14b209fee3386efedef6c45001be Binary files /dev/null and b/OpenJDK20U-jdk_x64_linux_hotspot_20.0.2_9.tar.xz differ diff --git a/jdk-updates-jdk20u-jdk-20.0.2+9.tar.gz b/jdk-updates-jdk20u-jdk-20.0.2+9.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..741c9d1956f8dcc21ad0cb707fd02614489d2de4 Binary files /dev/null and b/jdk-updates-jdk20u-jdk-20.0.2+9.tar.gz differ diff --git a/openjdk-latest.spec b/openjdk-latest.spec index 33c213ac090e6337ade95f5cef6e6c97dc48d9d6..79021e2832bd5e005ed7fe8069e42a566198483d 100644 --- a/openjdk-latest.spec +++ b/openjdk-latest.spec @@ -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 20 # 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 20 # 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,8 +175,8 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 7 -%global rpmrelease 0 +%global buildver 9 +%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 %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) @@ -928,6 +928,8 @@ 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-%{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 +962,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 +1201,6 @@ pushd %{top_level_dir_name} %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 @@ -1311,6 +1310,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} @@ -1329,7 +1345,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 +1417,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,7 +1474,7 @@ 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' @@ -1752,6 +1768,16 @@ cjc.mainProgram(arg) %changelog +* Mon Aug 07 2023 misaka00251 - 1:20.0.2.9-1-rolling +- Add riscv64 to jit_arches + +* Thu Aug 3 2023 wanghao - 1:20.0.2.9-0-rolling +- Update to jdk-20.0.2+9 + +* Thu May 4 2023 wanghao - 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 - 1:19.0.2.7-0-rolling - Update to jdk-19.0.2+7