From f6207c7157967491324334c1b6812715fce80fd1 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Fri, 11 Jul 2025 19:45:20 +0100 Subject: [PATCH] Sync the copy of the portable specfile with the latest update Related: RHEL-101798 --- java-21-openjdk-portable.specfile | 93 +++++++++++++++++-------------- java-21-openjdk.spec | 1 + 2 files changed, 51 insertions(+), 43 deletions(-) diff --git a/java-21-openjdk-portable.specfile b/java-21-openjdk-portable.specfile index da503f7..017b164 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 @@ -325,7 +329,7 @@ # New Version-String scheme-style defines %global featurever 21 %global interimver 0 -%global updatever 7 +%global updatever 8 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -341,7 +345,7 @@ %global lts_designator_zip "" %endif # JDK to use for bootstrapping -%global bootjdk /usr/lib/jvm/java-%{featurever}-openjdk +%global bootjdk /usr/lib/jvm/java-%{buildjdkver}-openjdk # Define whether to use the bootstrap JDK directly or with a fresh libjvm.so # This will only work where the bootstrap JDK is the same major version # as the JDK being built @@ -389,8 +393,8 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 6 -%global rpmrelease 2 +%global buildver 1 +%global rpmrelease 1 #%%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 @@ -409,7 +413,7 @@ # Release will be (where N is usually a number starting at 1): # - 0.N%%{?extraver}%%{?dist} for EA releases, # - N%%{?extraver}{?dist} for GA releases -%global is_ga 1 +%global is_ga 0 %if %{is_ga} %global build_type GA %global ea_designator "" @@ -540,7 +544,7 @@ %if 0%{?centos} == 0 ExclusiveArch: %{devkit_arches} %else -ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 +ExclusiveArch: %{aarch64} %{ppc64le} riscv64 s390x x86_64 %endif Name: java-%{javaver}-%{origin}-portable%{?pkgos:-%{pkgos}} @@ -673,9 +677,7 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch # ############################################# -# JDK-8351500: G1: NUMA migrations cause crashes in region allocation -# Upstream in 21.0.8+1 -Patch2001: jdk8351500-numa_migration_crashes.patch +# Currently empty ############################################# # @@ -729,7 +731,7 @@ BuildRequires: zip BuildRequires: tar BuildRequires: unzip BuildRequires: javapackages-filesystem -BuildRequires: java-%{featurever}-%{origin}%{?pkgos:-%{pkgos}}-devel +BuildRequires: java-%{buildjdkver}-%{origin}%{?pkgos:-%{pkgos}}-devel # Zero-assembler build requirement %ifarch %{zero_arches} BuildRequires: libffi-devel @@ -758,17 +760,17 @@ BuildRequires: libpng-devel BuildRequires: zlib-devel %else # Version in src/java.desktop/share/legal/freetype.md -Provides: bundled(freetype) = 2.13.2 +Provides: bundled(freetype) = 2.13.3 # Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h Provides: bundled(giflib) = 5.2.2 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h -Provides: bundled(harfbuzz) = 8.2.2 +Provides: bundled(harfbuzz) = 10.4.0 # Version in src/java.desktop/share/native/liblcms/lcms2.h -Provides: bundled(lcms2) = 2.16.0 +Provides: bundled(lcms2) = 2.17.0 # Version in src/java.desktop/share/native/libjavajpeg/jpeglib.h Provides: bundled(libjpeg) = 6b # Version in src/java.desktop/share/native/libsplashscreen/libpng/png.h -Provides: bundled(libpng) = 1.6.43 +Provides: bundled(libpng) = 1.6.47 # Version in src/java.base/share/native/libzip/zlib/zlib.h Provides: bundled(zlib) = 1.3.1 # We link statically against libstdc++ to increase portability @@ -988,8 +990,6 @@ sh %{SOURCE12} %{top_level_dir_name} pushd %{top_level_dir_name} # Add crypto policy and FIPS support %patch -P1001 -p1 -# Add early JDK-8351500 -%patch -P2001 -p1 popd # openjdk @@ -1939,6 +1939,24 @@ done %endif %changelog +* Tue Jul 08 2025 Andrew Hughes - 1:21.0.8.0.1-0.1.ea +- Update to jdk-21.0.8+1 (EA) +- Update release notes to 21.0.8+1 +- Bump freetype version to 2.13.3 following JDK-8348596 +- Bump harfbuzz version to 10.4.0 following JDK-8348597 +- Bump lcms2 version to 2.17.0 following JDK-8348110 +- Bump libpng version to 1.6.47 following JDK-8348598 +- Switch to EA mode +- Drop JDK-8351500 local patch which is now available in 21.0.8+1 upstream + +* 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 @@ -2020,7 +2038,7 @@ done - Update release notes to 21.0.4+5 - Move unstripped, misc and doc tarball handling into normal build / no suffix blocks - Limit Java only tests to one architecture using jdk_test_arch -- Drop unneeded tzdata-java build dependency following f854bb3955fb57bba4e83d09813e9cfd0e81079e +- Drop unneeded tzdata-java build dependency following 3e3cf8fa2df7bac2f6a60a0ddd596ec39228a3e1 - Resolves: OPENJDK-3133 - Resolves: OPENJDK-3237 - Resolves: OPENJDK-3182 @@ -2039,7 +2057,6 @@ done - Update to jdk-21.0.3+9 (GA) - Update release notes to 21.0.3+9 - Switch to GA mode. -- Update buildjdkver to match the featurever - ** This tarball is embargoed until 2024-04-16 @ 1pm PT. ** * Thu Apr 04 2024 Andrew Hughes - 1:21.0.3.0.7-0.1.ea @@ -2134,10 +2151,6 @@ done - Update release notes to 21.0.2+13 - Bump libpng version to 1.6.40 following JDK-8316030 - Bump HarfBuzz version to 8.2.2 following JDK-8313643 -- pandoc is only available on RHEL/CentOS 8 -- Check for CentOS being defined to determine use of devkit -- Set buildjdkver to 20 until OpenJDK 21 is available in the buildroot -- Use featurever for JDK build dependencies * Mon Mar 11 2024 Andrew Hughes - 1:21.0.1.0.12-2 - Use a devkit to build on architectures where we have one (s390x, aarch64, ppc64le, x86_64) @@ -2147,7 +2160,6 @@ done - Use system gdb for both builds as devkit version fails (needs devkit libraries, then JDK segfaults with them) - Filter out annobin plugin when using the devkit - Drop static libstdc++ build dependency on devkit builds as it should come from the devkit -- Disable devkit build on CentOS where it is unavailable - Introduce tar_opts to avoid repetition of lengthy tar creation options * Thu Feb 08 2024 Thomas Fitzsimmons - 1:21.0.1.0.12-2 @@ -2169,7 +2181,7 @@ done * Fri Oct 27 2023 Andrew Hughes - 1:21.0.0.0.35-4 - Rebuild jmods using the stripped binaries in release builds - Make sure the unstripped JDK is customised by the installjdk function -- Resolves: OPENJDK-3224 +- Resolves: OPENJDK-1974 * Thu Oct 26 2023 Andrew Hughes - 1:21.0.0.0.35-3 - Re-enable SystemTap support and perform only substitutions possible without final NVR available @@ -2181,7 +2193,6 @@ done * Thu Aug 24 2023 Andrew Hughes - 1:21.0.0.0.35-2 - Update documentation (README.md, add missing JEP to release notes) - Replace alt-java patch with a binary separate from the JDK -- Adapt alt-java test to new binary where there is always a set_speculation function - Drop stale patches that are of little use any more: - * nss.cfg has been disabled since early PKCS11 work and long superseded by FIPS work - * No accessibility subpackage to warrant RH1648242 patch any more @@ -2205,31 +2216,27 @@ done - Replace smoke test files used in the staticlibs test, as fdlibm was removed by JDK-8303798 - Related: rhbz#2192749 -* Wed Aug 16 2023 Andrew Hughes - 1:20.0.2.0.9-1 +* Wed Aug 16 2023 Andrew Hughes - 1:20.0.0.0.36-1 - Update to jdk-20.0.2+9 - Update release notes to 20.0.2+9 - Update system crypto policy & FIPS patch from new fips-20u tree - Update generate_tarball.sh ICEDTEA_VERSION - Update CLDR reference data following update to 42 (Rocky Mountain-Normalzeit => Rocky-Mountain-Normalzeit) +- Related: rhbz#2192749 -* Wed Aug 16 2023 Jiri Vanek - 1:20.0.2.0.9-1 +* Wed Aug 16 2023 Jiri Vanek - 1:20.0.0.0.36-1 - Dropped JDK-8295447, JDK-8296239 & JDK-8299439 patches now upstream - Adapted rh1750419-redhat_alt_java.patch +- Related: rhbz#2192749 -* Tue Aug 15 2023 Andrew Hughes - 1:19.0.2.0.7-2 -- Bump rpmrelease to rebuild for CentOS 9 - -* Tue Aug 15 2023 Andrew Hughes - 1:19.0.2.0.7-1 +* Tue Aug 15 2023 Andrew Hughes - 1:19.0.1.0.10-1 - Update to jdk-19.0.2 release - Update release notes to 19.0.2 - Rebase FIPS patches from fips-19u branch - Remove references to sample directory removed by JDK-8284999 - Add local patch JDK-8295447 (javac NPE) which was accepted into 19u upstream but not in the GA tag - Add local patches for JDK-8296239 & JDK-8299439 (Croatia Euro update) which are present in 8u, 11u & 17u releases -- Switch buildjdkver to java-21-openjdk - -* Thu Aug 10 2023 Andrew Hughes - 1:18.0.2.0.9-2 -- Bump rpmrelease to rebuild for CentOS 9 +- Related: rhbz#2192749 * Thu Aug 10 2023 Andrew Hughes - 1:18.0.2.0.9-1 - Update to jdk-18.0.2 release @@ -2239,14 +2246,14 @@ done - Rebase RH1648249 nss.cfg patch so it applies after the FIPS patch - Automatically turn off building a fresh HotSpot first, if the bootstrap JDK is not the same major version as that being built - Drop tzdata patches added for 17.0.7 which will eventually appear in the upstream tarball when we reach OpenJDK 21 +- Switch bootjdkver to java-21-openjdk - Disable tzdata tests until we are on the latest JDK and things are back in sync +- Related: rhbz#2192749 * Thu Aug 10 2023 Petra Alice Mikova - 1:18.0.0.0.37-1 - Update to ea version of jdk18 - Adjust rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch - -* Mon May 15 2023 Andrew Hughes - 1:17.0.7.0.7-3 -- Bump rpmrelease to rebuild for CentOS 9 +- Related: rhbz#2192749 * Mon May 15 2023 Andrew Hughes - 1:17.0.7.0.7-2 - Create java-21-openjdk-portable package based on java-17-openjdk-portable diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index 5178d17..c89cf9e 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -2572,6 +2572,7 @@ cjc.mainProgram(args) - Bump libpng version to 1.6.47 following JDK-8348598 - Switch to EA mode - Drop JDK-8351500 local patch which is now available in 21.0.8+1 upstream +- Sync the copy of the portable specfile with the latest update - Related: RHEL-101798 * Thu May 08 2025 Andrew Hughes - 1:21.0.7.0.6-2