From d114cc441de0d47476665aa07b389a569a219fa0 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Thu, 8 May 2025 23:59:47 +0100 Subject: [PATCH] Sync the copy of the portable specfile with the latest update - Related: RHEL-90309 --- java-21-openjdk-portable.specfile | 49 +++++++++++++++++++++---------- java-21-openjdk.spec | 1 + 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/java-21-openjdk-portable.specfile b/java-21-openjdk-portable.specfile index 6b5bc4b..da503f7 100644 --- a/java-21-openjdk-portable.specfile +++ b/java-21-openjdk-portable.specfile @@ -341,7 +341,7 @@ %global lts_designator_zip "" %endif # JDK to use for bootstrapping -%global bootjdk /usr/lib/jvm/java-%{buildjdkver}-openjdk +%global bootjdk /usr/lib/jvm/java-%{featurever}-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 @@ -390,7 +390,7 @@ %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 6 -%global rpmrelease 1 +%global rpmrelease 2 #%%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 @@ -673,7 +673,9 @@ Patch1001: fips-%{featurever}u-%{fipsver}.patch # ############################################# -# Currently empty +# JDK-8351500: G1: NUMA migrations cause crashes in region allocation +# Upstream in 21.0.8+1 +Patch2001: jdk8351500-numa_migration_crashes.patch ############################################# # @@ -727,7 +729,7 @@ BuildRequires: zip BuildRequires: tar BuildRequires: unzip BuildRequires: javapackages-filesystem -BuildRequires: java-%{buildjdkver}-%{origin}%{?pkgos:-%{pkgos}}-devel +BuildRequires: java-%{featurever}-%{origin}%{?pkgos:-%{pkgos}}-devel # Zero-assembler build requirement %ifarch %{zero_arches} BuildRequires: libffi-devel @@ -986,6 +988,8 @@ 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 @@ -1935,6 +1939,10 @@ done %endif %changelog +* 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 + * Fri Apr 11 2025 Andrew Hughes - 1:21.0.7.0.6-1 - Update to jdk-21.0.7+6 (GA) - Update release notes to 21.0.7+6 @@ -2012,7 +2020,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 3e3cf8fa2df7bac2f6a60a0ddd596ec39228a3e1 +- Drop unneeded tzdata-java build dependency following f854bb3955fb57bba4e83d09813e9cfd0e81079e - Resolves: OPENJDK-3133 - Resolves: OPENJDK-3237 - Resolves: OPENJDK-3182 @@ -2031,6 +2039,7 @@ 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 @@ -2125,6 +2134,10 @@ 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) @@ -2134,6 +2147,7 @@ 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 @@ -2155,7 +2169,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-1974 +- Resolves: OPENJDK-3224 * 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 @@ -2167,6 +2181,7 @@ 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 @@ -2190,27 +2205,31 @@ 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.0.0.36-1 +* Wed Aug 16 2023 Andrew Hughes - 1:20.0.2.0.9-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.0.0.36-1 +* Wed Aug 16 2023 Jiri Vanek - 1:20.0.2.0.9-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.1.0.10-1 +* 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 - 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 -- Related: rhbz#2192749 +- 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 * Thu Aug 10 2023 Andrew Hughes - 1:18.0.2.0.9-1 - Update to jdk-18.0.2 release @@ -2220,14 +2239,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 -- Related: rhbz#2192749 + +* Mon May 15 2023 Andrew Hughes - 1:17.0.7.0.7-3 +- Bump rpmrelease to rebuild for CentOS 9 * 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 0b01591..8717c86 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -2569,6 +2569,7 @@ cjc.mainProgram(args) %changelog * 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 +- Sync the copy of the portable specfile with the latest update - Resolves: RHEL-90309 * Fri Apr 11 2025 Andrew Hughes - 1:21.0.7.0.6-1