From 023c9cf4a5d0216286d820de54babf81311c4442 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Thu, 10 Jul 2025 00:34:57 +0100 Subject: [PATCH] Bump portablerelease to match riscv64 patched version - Sync the copy of the portable specfile with the latest update - Related: RHEL-92631 --- java-21-openjdk-portable.specfile | 28 ++++++++++++++++++++-------- java-21-openjdk.spec | 9 +++++++-- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/java-21-openjdk-portable.specfile b/java-21-openjdk-portable.specfile index da503f7..c0f448e 100644 --- a/java-21-openjdk-portable.specfile +++ b/java-21-openjdk-portable.specfile @@ -126,7 +126,7 @@ # Set of architectures for which we build fastdebug builds %global fastdebug_arches x86_64 ppc64le aarch64 # Set of architectures with a Just-In-Time (JIT) compiler -%global jit_arches %{arm} %{aarch64} %{ix86} %{power64} s390x sparcv9 sparc64 x86_64 +%global jit_arches %{arm} %{aarch64} %{ix86} %{power64} s390x sparcv9 sparc64 x86_64 riscv64 # Set of architectures which use the Zero assembler port (!jit_arches) %global zero_arches ppc s390 # Set of architectures which run a full bootstrap cycle @@ -136,15 +136,15 @@ # Set of architectures with a Ahead-Of-Time (AOT) compiler %global aot_arches x86_64 %{aarch64} # Set of architectures which support the serviceability agent -%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm} +%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm} riscv64 # Set of architectures which support class data sharing # As of JDK-8005165 in OpenJDK 10, class sharing is not arch-specific # However, it does segfault on the Zero assembler port, so currently JIT only %global share_arches %{jit_arches} # Set of architectures for which we build the Shenandoah garbage collector -%global shenandoah_arches x86_64 %{aarch64} +%global shenandoah_arches x86_64 %{aarch64} riscv64 # Set of architectures for which we build the Z garbage collector -%global zgc_arches x86_64 +%global zgc_arches x86_64 riscv64 # Set of architectures for which alt-java has SSB mitigation %global ssbd_arches x86_64 # Set of architectures for which java has short vector math library (libjsvml.so) @@ -161,7 +161,7 @@ # Set of architectures for which we have a devkit # Only used on RHEL %if 0%{?centos} == 0 -%global devkit_arches %{aarch64} %{ppc64le} s390x x86_64 +%global devkit_arches %{aarch64} %{ppc64le} riscv64 s390x x86_64 %endif # By default, we build a slowdebug build during main build on JIT architectures @@ -300,6 +300,10 @@ %global archinstall aarch64 %global stapinstall arm64 %endif +%ifarch riscv64 +%global archinstall riscv64 +%global stapinstall %{_target_cpu} +%endif # 32 bit sparc, optimized for v9 %ifarch sparcv9 %global archinstall sparc @@ -390,7 +394,7 @@ %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 6 -%global rpmrelease 2 +%global rpmrelease 3 #%%global tagsuffix %%{nil} # 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 @@ -540,7 +544,7 @@ %if 0%{?centos} == 0 ExclusiveArch: %{devkit_arches} %else -ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 +ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 riscv64 %endif Name: java-%{javaver}-%{origin}-portable%{?pkgos:-%{pkgos}} @@ -1062,7 +1066,7 @@ export NUM_PROC=${NUM_PROC:-1} %endif export XZ_OPT="-T0" -%ifarch s390x sparc64 alpha %{power64} %{aarch64} +%ifarch s390x sparc64 alpha %{power64} %{aarch64} riscv64 export ARCH_DATA_MODEL=64 %endif %ifarch alpha @@ -1939,6 +1943,14 @@ done %endif %changelog +* Fri Jul 04 2025 Andrew Hughes - 1:21.0.7.0.6-3 +- Move riscv64 addition to ExclusiveArch to devkit_arches on RHEL +- Related: OPENJDK-3850 + +* Tue May 20 2025 Kashyap Chamarthy - 1:21.0.7.0.6-3 +- Enable riscv64 arch; thanks: Songsong Zhang +- Resolves: OPENJDK-3850 + * Thu May 08 2025 Andrew Hughes - 1:21.0.7.0.6-2 - Add local version of JDK-8351500 for early interim release before 21.0.8 - Resolves: OPENJDK-3679 diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index ff467c7..eb5ff66 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -372,7 +372,7 @@ %global buildver 6 %global rpmrelease 3 # Settings used by the portable build -%global portablerelease 2 +%global portablerelease 3 # Portable suffix differs between RHEL and CentOS %if 0%{?centos} == 0 %global portablesuffix %{?pkgos:el7_9}%{!?pkgos:el8} @@ -2471,7 +2471,12 @@ exit 0 %endif %changelog -* Mon May 20 2025 Kashyap Chamarthy - 1:21.0.7.0.6-3 +* Wed Jul 09 2025 Andrew Hughes - 1:21.0.7.0.6-3 +- Bump portablerelease to match riscv64 patched version +- Sync the copy of the portable specfile with the latest update +- Related: RHEL-92631 + +* Tue May 20 2025 Kashyap Chamarthy - 1:21.0.7.0.6-3 - Enable riscv64 arch; thank you, Songsong Zhang - Resolves: RHEL-92631