From 733c6d4b8d77d1286c7f7edaafa3508a1d9d779b Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Tue, 23 Sep 2025 14:22:44 +0100 Subject: [PATCH] Sync the copy of the portable specfile with the latest update Related: RHEL-100678 --- java-25-openjdk-portable.specfile | 67 ++++++++++++++++++++++++------- java-25-openjdk.spec | 1 + 2 files changed, 54 insertions(+), 14 deletions(-) diff --git a/java-25-openjdk-portable.specfile b/java-25-openjdk-portable.specfile index fd3249a..c6f5262 100644 --- a/java-25-openjdk-portable.specfile +++ b/java-25-openjdk-portable.specfile @@ -1,5 +1,5 @@ # debug_package %%{nil} is portable-jdks specific -%define debug_package %{nil} +%define debug_package %{nil} # RPM conditionals so as to be able to dynamically produce # slowdebug/release builds. See: @@ -327,10 +327,10 @@ %endif # New Version-String scheme-style defines -%global featurever 21 +%global featurever 22 %global fakefeaturever 25 %global interimver 0 -%global updatever 8 +%global updatever 2 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -346,7 +346,12 @@ %global lts_designator_zip "" %endif # JDK to use for bootstrapping -%global bootjdk /usr/lib/jvm/java-%{featurever}-openjdk +%global bootjdkpkg java-%{fakefeaturever}-openjdk +%ifarch %{fastdebug_arches} +%global bootdebugpkg fastdebug +%endif +%global bootjdkzip %{_jvmdir}/%{bootjdkpkg}-*.portable%{?bootdebugpkg:.%{bootdebugpkg}}.jdk.%{_arch}.tar.xz +%global bootjdk %{_builddir}/%{bootjdkpkg}.boot # 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 @@ -396,7 +401,7 @@ %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 9 -%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 @@ -628,7 +633,7 @@ Source18: TestTranslations.java # ############################################ # Crypto policy and FIPS support patches -# Patch is generated from the fips-21u tree at https://github.com/rh-openjdk/jdk/tree/fips-21u +# Patch is generated from the fips-25u tree at https://github.com/rh-openjdk/jdk/tree/fips-25u # as follows: git diff %%{vcstag} src make test > fips-21u-$(git show -s --format=%h HEAD).patch # Diff is limited to src and make subdirectories to exclude .github changes # Fixes currently included: @@ -663,7 +668,7 @@ Source18: TestTranslations.java # test/jdk/sun/security/pkcs11/fips/VerifyMissingAttributes.java: fixed jtreg main class # RH1940064: Enable XML Signature provider in FIPS mode # RH2173781: Avoid calling C_GetInfo() too early, before cryptoki is initialized [now part of JDK-8301553 upstream] -Patch1001: fips-%{featurever}u-%{fipsver}.patch +# Disabled until 25: Patch1001: fips-%{featurever}u-%{fipsver}.patch ############################################# # @@ -733,7 +738,7 @@ BuildRequires: zip BuildRequires: tar BuildRequires: unzip BuildRequires: javapackages-filesystem -BuildRequires: java-%{featurever}-%{origin}%{?pkgos:-%{pkgos}}-devel +BuildRequires: %{bootjdkpkg}-portable-devel%{?bootdebugpkg:-%{bootdebugpkg}} # Zero-assembler build requirement %ifarch %{zero_arches} BuildRequires: libffi-devel @@ -921,10 +926,11 @@ The %{origin_nice} %{featurever} miscellany. %prep +# Using the echo macro breaks rpmdev-bumpspec, as it parses the first line of stdout :-( echo "Preparing %{oj_vendor_version}" echo "System is RHEL=%{?rhel}%{!?rhel:0}, CentOS=%{?centos}%{!?centos:0}, EPEL=%{?epel}%{!?epel:0}, Fedora=%{?fedora}%{!?fedora:0}" +echo "Build JDK version is %{buildjdkver}, bootstrap JDK package is %{bootjdkpkg}" -# Using the echo macro breaks rpmdev-bumpspec, as it parses the first line of stdout :-( %if 0%{?stapinstall:1} echo "CPU: %{_target_cpu}, arch install directory: %{archinstall}, SystemTap install directory: %{stapinstall}" %else @@ -955,8 +961,8 @@ if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 -a %{includ fi %if %{with fresh_libjvm} && ! %{build_hotspot_first} -echo "WARNING: The build of a fresh libjvm has been disabled due to a JDK version mismatch" -echo "Build JDK version is %{buildjdkver}, feature JDK version is %{featurever}" +%{warn: The build of a fresh libjvm has been disabled due to a JDK version mismatch} +%{warn: Build JDK version is %{buildjdkver}, feature JDK version is %{featurever}} %endif export XZ_OPT="-T0" @@ -991,7 +997,8 @@ sh %{SOURCE12} %{top_level_dir_name} # rpmbuild. pushd %{top_level_dir_name} # Add crypto policy and FIPS support -%patch -P1001 -p1 +# Disabled until 25 +#%patch -P1001 -p1 popd # openjdk @@ -1054,6 +1061,16 @@ done %endif %endif +# Extract build JDK +pushd %{_jvmdir} +sha256sum --check %{bootjdkzip}.sha256sum +popd +tar -xJf %{bootjdkzip} +mv java-%{fakefeaturever}-openjdk-%{featurever}* %{bootjdk} +# Print release information +echo "Installed boot JDK:" +cat %{bootjdk}/release + %build # How many CPU's do we have? export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :) @@ -1203,7 +1220,6 @@ function buildjdk() { --with-boot-jdk=${buildjdk} \ --with-debug-level=${debuglevel} \ --with-native-debug-symbols="${debug_symbols}" \ - --disable-sysconf-nss \ --enable-unlimited-crypto \ --with-zlib=%{link_type} \ --with-freetype=%{link_type} \ @@ -1627,7 +1643,7 @@ done # end of release / debug cycle loop # We test debug first as it will give better diagnostics on a crash for suffix in %{build_loop} ; do -# portable builds have static_libs embedded, thus top_dir_abs_main_build_path is same as top_dir_abs_staticlibs_build_path +# portable builds have static_libs embedded, thus top_dir_abs_main_build_path is same as top_dir_abs_staticlibs_build_path top_dir_abs_main_build_path=$(pwd)/%{installoutputdir -- ${suffix}} %if %{include_staticlibs} top_dir_abs_staticlibs_build_path=${top_dir_abs_main_build_path} @@ -1941,8 +1957,31 @@ done %endif %changelog +* Mon Sep 22 2025 Andrew Hughes - 1:22.0.2.0.9-2 +- Build using ourselves rather than the system JDK as java-25-openjdk is unavailable on older systems +- Switch buildjdkver back to featurever temporarily for this rebuild +- Introduce bootjdkpkg to handle architectures not in fastdebug_arches (i.e. s390x) +- Related: RHELBU-3203 + +* Sat Sep 20 2025 Andrew Hughes - 1:22.0.2.0.9-1 +- Update to jdk-22.0.2+9 (GA) +- Update release notes with features of JDK 22 +- Remove 21u FIPS patch and disable use until we are ready for the 25 version +- Update README file for java-25-openjdk +- Use fakefeaturever for the boot JDK package name +- Calculate buildjdkver as the previous release to featurever +- Introduce bootjdkpkg to share package name between the bootjdk path and the build requirement +- Print the buildjdkver and bootjdkpkg values +- Use the warning macro for the notification of disabling the fresh libjvm build +- Temporarily use java-21-openjdk package to bootstrap until java-25-openjdk is available +- Remove obsolete --disable-sysconf-nss option from old FIPS patch +- Adjust CLDR expectations in TestTranslations.java after JDK-8317979 started using tzdata values +- Adjust TestTranslations.java to expect the same short name throughout for fr_FR and de_DE (bug?) +- Related: RHELBU-3203 + * Tue Aug 19 2025 Andrew Hughes - 1:21.0.8.0.9-1 - Create java-25-openjdk-portable package based on java-21-openjdk-portable +- Introduce fakefeaturever to pretend we are java-25-openjdk ahead of time - Related: RHELBU-3203 * Thu Jul 10 2025 Andrew Hughes - 1:21.0.8.0.9-1 diff --git a/java-25-openjdk.spec b/java-25-openjdk.spec index ad137ce..48d972c 100644 --- a/java-25-openjdk.spec +++ b/java-25-openjdk.spec @@ -2480,6 +2480,7 @@ exit 0 - Remove 21u FIPS patch and disable use until we are ready for the 25 version - Adjust CLDR expectations in TestTranslations.java after JDK-8317979 started using tzdata values - Adjust TestTranslations.java to expect the same short name throughout for fr_FR and de_DE (bug?) +- Sync the copy of the portable specfile with the latest update - Related: RHEL-100678 * Mon Aug 25 2025 Andrew Hughes - 1:21.0.8.0.9-1