From 93e5b053f55784dc50a2869e4e52ba9c413070fe Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Mon, 30 Oct 2023 08:29:47 +0000 Subject: [PATCH] Switch to using portable binaries built on RHEL 7 Sync the copy of the portable specfile with the RHEL 7 version Related: RHEL-12996 --- java-21-openjdk-portable.specfile | 159 +++++++++++++++--------------- java-21-openjdk.spec | 29 ++++-- 2 files changed, 96 insertions(+), 92 deletions(-) diff --git a/java-21-openjdk-portable.specfile b/java-21-openjdk-portable.specfile index 95a320a..045e803 100644 --- a/java-21-openjdk-portable.specfile +++ b/java-21-openjdk-portable.specfile @@ -1,6 +1,3 @@ -# portable jdk 21 specific bug, _jvmdir being missing -%define _jvmdir /usr/lib/jvm - # debug_package %%{nil} is portable-jdks specific %define debug_package %{nil} @@ -31,6 +28,10 @@ # Build with system libraries %bcond_with system_libs +# This is RHEL 7 specific as it doesn't seem to have the +# __brp_strip_static_archive macro. +%define __os_install_post %{nil} + # Workaround for stripping of debug symbols from static libraries %if %{with staticlibs} %define __brp_strip_static_archive %{nil} @@ -54,10 +55,6 @@ # See: https://bugzilla.redhat.com/show_bug.cgi?id=1520879 %global _find_debuginfo_opts -g -# Disable LTO as this causes build failures at the moment. -# See RHBZ#1861401 -%define _lto_cflags %{nil} - # note: parametrized macros are order-sensitive (unlike not-parametrized) even with normal macros # also necessary when passing it as parameter to other macros. If not macro, then it is considered a switch # see the difference between global and define: @@ -144,7 +141,7 @@ %global zgc_arches x86_64 # 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) +# Set of architectures for which java has short vector math library (libsvml.so) %global svml_arches x86_64 # Set of architectures where we verify backtraces with gdb # s390x fails on RHEL 7 so we exclude it there @@ -232,6 +229,13 @@ # Target to use to just build HotSpot %global hotspot_target hotspot +# DTS toolset to use to provide gcc & binutils +%global dtsversion 10 + +# Disable LTO as this causes build failures at the moment. +# See RHBZ#1861401 +%define _lto_cflags %{nil} + # Filter out flags from the optflags macro that cause problems with the OpenJDK build # We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2 # We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs) @@ -490,9 +494,6 @@ %global alternatives_requires %{_sbindir}/alternatives %endif -# x86 is not supported by OpenJDK 17 -ExcludeArch: %{ix86} - # Portables have no repo (requires/provides), but these are awesome for orientation in spec # Also scriptlets are happily missing and files are handled old fashion # not-duplicated requires/provides/obsoletes for normal/debug packages @@ -516,12 +517,12 @@ ExcludeArch: %{ix86} # Prevent brp-java-repack-jars from being run %global __jar_repack 0 +# Define the architectures on which we build +ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 +# Define the OS this package is built on +%global pkgos rhel7 -# portables have grown out of its component, moving back to java-x-vendor -# this expression, when declared as global, filled component with java-x-vendor portable -%define component %(echo %{name} | sed "s;-portable;;g") - -Name: java-%{javaver}-%{origin}-portable +Name: java-%{javaver}-%{origin}-portable%{?pkgos:-%{pkgos}} Version: %{newjavaver}.%{buildver} Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons @@ -535,6 +536,11 @@ Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} # provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0". Epoch: 1 + +# portables have grown out of its component, moving back to java-x-vendor +# this expression, when declared as global, filled component with java-x-vendor portable +%define component %(echo %{name} | sed "s;-portable%{?pkgos:-%{pkgos}};;g") + Summary: %{origin_nice} %{featurever} Runtime Environment portable edition # Groups are only used up to RHEL 8 and on Fedora versions prior to F30 %if (0%{?rhel} > 0 && 0%{?rhel} <= 8) || (0%{?fedora} >= 0 && 0%{?fedora} < 30) @@ -676,6 +682,8 @@ BuildRequires: desktop-file-utils BuildRequires: elfutils-devel BuildRequires: file BuildRequires: fontconfig-devel +BuildRequires: devtoolset-%{dtsversion}-gcc +BuildRequires: devtoolset-%{dtsversion}-gcc-c++ BuildRequires: gcc-c++ BuildRequires: gdb BuildRequires: libxslt @@ -697,16 +705,12 @@ BuildRequires: zip # to pack portable tarballs BuildRequires: tar BuildRequires: unzip -# Not needed for portables -# BuildRequires: javapackages-filesystem -BuildRequires: java-%{buildjdkver}-openjdk-devel +BuildRequires: javapackages-tools +BuildRequires: java-%{buildjdkver}-%{origin}%{?pkgos:-%{pkgos}}-devel # Zero-assembler build requirement %ifarch %{zero_arches} BuildRequires: libffi-devel %endif -# Full documentation build requirements -BuildRequires: graphviz -BuildRequires: pandoc # 2023c required as of JDK-8305113 BuildRequires: tzdata-java >= 2023c # cacerts build requirement in portable mode @@ -886,10 +890,10 @@ The %{origin_nice} %{featurever} miscellany. echo "Preparing %{oj_vendor_version}" # 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}" +%if 0%{?_build_cpu:1} + echo "CPU: %{_target_cpu}, arch install directory: %{archinstall}, SystemTap install directory: %{_build_cpu}" %else - %{error:Unrecognised architecture %{_target_cpu}} + %{error:Unrecognised architecture %{_build_cpu}} %endif if [ %{include_normal_build} -eq 0 -o %{include_normal_build} -eq 1 ] ; then @@ -987,6 +991,7 @@ done # Portables do not have desktop integration %build + # How many CPU's do we have? export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :) export NUM_PROC=${NUM_PROC:-1} @@ -1060,22 +1065,22 @@ function buildjdk() { # rather than ${link_opt} as the system versions # are always used in a system_libs build, even # for the static library build - bash ${top_dir_abs_src_path}/configure \ + scl enable devtoolset-%{dtsversion} "bash ${top_dir_abs_src_path}/configure \ %ifarch %{zero_arches} --with-jvm-variants=zero \ %endif %ifarch %{ppc64le} --with-jobs=1 \ %endif - --with-cacerts-file=$(readlink -f %{_sysconfdir}/pki/java/cacerts) \ + --with-cacerts-file=`readlink -f %{_sysconfdir}/pki/java/cacerts` \ --with-version-build=%{buildver} \ - --with-version-pre="%{ea_designator}" \ - --with-version-opt="%{lts_designator}" \ - --with-vendor-version-string="%{oj_vendor_version}" \ - --with-vendor-name="%{oj_vendor}" \ - --with-vendor-url="%{oj_vendor_url}" \ - --with-vendor-bug-url="%{oj_vendor_bug_url}" \ - --with-vendor-vm-bug-url="%{oj_vendor_bug_url}" \ + --with-version-pre=\"%{ea_designator}\" \ + --with-version-opt=\"%{lts_designator}\" \ + --with-vendor-version-string=\"%{oj_vendor_version}\" \ + --with-vendor-name=\"%{oj_vendor}\" \ + --with-vendor-url=\"%{oj_vendor_url}\" \ + --with-vendor-bug-url=\"%{oj_vendor_bug_url}\" \ + --with-vendor-vm-bug-url=\"%{oj_vendor_bug_url}\" \ --with-boot-jdk=${buildjdk} \ --with-debug-level=${debuglevel} \ --with-native-debug-symbols="${debug_symbols}" \ @@ -1089,21 +1094,20 @@ function buildjdk() { --with-lcms=${link_opt} \ --with-harfbuzz=${link_opt} \ --with-stdc++lib=${libc_link_opt} \ - --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \ - --with-extra-cflags="$EXTRA_CFLAGS" \ - --with-extra-ldflags="%{ourldflags}" \ - --with-num-cores="$NUM_PROC" \ - --with-source-date="${SOURCE_DATE_EPOCH}" \ + --with-extra-cxxflags=\"$EXTRA_CPP_FLAGS\" \ + --with-extra-cflags=\"$EXTRA_CFLAGS\" \ + --with-extra-ldflags=\"%{ourldflags}\" \ + --with-num-cores=\"$NUM_PROC\" \ + --with-source-date=\"${SOURCE_DATE_EPOCH}\" \ --disable-javac-server \ %ifarch %{zgc_arches} --with-jvm-features=zgc \ %endif - --disable-warnings-as-errors + --disable-warnings-as-errors" cat spec.gmk - make LOG=trace $maketargets || \ - ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name \"hs_err_pid*.log\" | xargs cat && false ) - + scl enable devtoolset-%{dtsversion} "make LOG=trace $maketargets || \ + ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name \"hs_err_pid*.log\" | xargs cat && false )" popd } @@ -1122,9 +1126,9 @@ function stripjdk() { for file in $(find ${jdkimagepath} ${jreimagepath} ${supportdir} -type f) ; do if file ${file} | grep -q 'ELF'; then noextfile=${file/.so/}; - objcopy --only-keep-debug ${file} ${noextfile}.debuginfo; - objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file}; - strip -g ${file}; + scl enable devtoolset-%{dtsversion} "objcopy --only-keep-debug ${file} ${noextfile}.debuginfo"; + scl enable devtoolset-%{dtsversion} "objcopy --add-gnu-debuglink=${noextfile}.debuginfo ${file}"; + scl enable devtoolset-%{dtsversion} "strip -g ${file}"; fi done @@ -1684,7 +1688,7 @@ done %{_jvmdir}/%{miscportablearchive}.sha256sum %changelog -* Fri Oct 27 2023 Andrew Hughes - 1:21.0.1.0.12-1 +* Sun Oct 29 2023 Andrew Hughes - 1:21.0.1.0.12-1 - Update to jdk-21.0.1.0+12 (GA) - Update release notes to 21.0.1.0+12 - Update openjdk_news script to specify subdirectory last @@ -1694,32 +1698,17 @@ done - Update bug URL for RHEL to point to the Red Hat customer portal - Fix upstream release URL for OpenJDK source - Update buildjdkver to match the featurever - -* 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 - -* 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 -- Depend on graphviz & pandoc for full documentation support - Fix typo which stops the EA designator being included in the build - Include tapsets in the miscellaneous tarball - Drop unused globals for tapset installation +- Rebuild jmods using the stripped binaries in release builds +- Make sure the unstripped JDK is customised by the installjdk function -* 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 -- 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 -- * No use of system libjpeg turbo to warrant RH649512 patch any more -- Replace RH1684077 pcsc-lite-libs patch with better JDK-8009550 fix being upstreamed -- Related: rhbz#2192749 - -* Mon Aug 21 2023 Andrew Hughes - 1:21.0.0.0.35-1 +* Sat Oct 28 2023 Andrew Hughes - 1:21.0.0.0.35-1 - Update to jdk-21.0.0+35 - Update release notes to 21.0.0+35 +- Update documentation (README.md) - Update system crypto policy & FIPS patch from new fips-21u tree - Update generate_tarball.sh to sync with upstream vanilla script inc. no more ECC removal - Drop fakefeaturever now it is no longer needed @@ -1727,13 +1716,20 @@ done - Change top_level_dir_name to use the VCS tag, matching new upstream release style tarball - Use upstream release URL for OpenJDK source - Re-enable tzdata tests now we are on the latest JDK and things are back in sync -- Related: rhbz#2192749 +- Fix trailing '.' in tarball name +- Use rpmrelease in vendor version to avoid inclusion of dist tag +- Replace alt-java patch with a binary separate from the JDK +- 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 +- * No use of system libjpeg turbo to warrant RH649512 patch any more +- Replace RH1684077 pcsc-lite-libs patch with better JDK-8009550 fix being upstreamed -* Mon Aug 21 2023 Petra Alice Mikova - 1:21.0.0.0.35-1 +* Sat Oct 28 2023 Petra Alice Mikova - 1:21.0.0.0.35-1 - 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 +* Fri Oct 27 2023 Andrew Hughes - 1:20.0.2.0.9-1.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 @@ -1741,12 +1737,12 @@ done - 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 +* Fri Oct 27 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.1.0.10-1 +* Fri Oct 27 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 @@ -1755,7 +1751,7 @@ done - Add local patches for JDK-8296239 & JDK-8299439 (Croatia Euro update) which are present in 8u, 11u & 17u releases - Related: rhbz#2192749 -* Thu Aug 10 2023 Andrew Hughes - 1:18.0.2.0.9-1 +* Tue Oct 24 2023 Andrew Hughes - 1:18.0.2.0.9-1 - Update to jdk-18.0.2 release - Update release notes to actually reflect OpenJDK 18 - Support JVM variant zero following JDK-8273494 no longer installing Zero's libjvm.so in the server directory @@ -1765,18 +1761,25 @@ done - 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 +- Drop bootstrap JDKs and use the java-21-openjdk-rhel7 build - Related: rhbz#2192749 -* Thu Aug 10 2023 Petra Alice Mikova - 1:18.0.0.0.37-1 +* Tue Oct 24 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 + +* Tue Aug 22 2023 Andrew Hughes - 1:17.0.7.0.7-2 +- Define architectures we build on to avoid those without DTS 10 (e.g. s390) + +* Tue Aug 22 2023 Andrew Hughes - 1:17.0.7.0.7-2 +- Switch to DTS 10 - 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 - Related: rhbz#2192749 -* Tue Apr 25 2023 Andrew Hughes - 1:17.0.7.0.7-2 +* Thu Apr 13 2023 Andrew Hughes - 1:17.0.7.0.7-1 - Update to jdk-17.0.7.0+7 - Update release notes to 17.0.7.0+7 - Require tzdata 2023c due to local inclusion of JDK-8274864 & JDK-8305113 @@ -1789,20 +1792,12 @@ done - * 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 -- Fix trailing '.' in tarball name -- Use rpmrelease in vendor version to avoid inclusion of dist tag - ** This tarball is embargoed until 2023-04-18 @ 1pm PT. ** - Resolves: rhbz#2185182 - Resolves: rhbz#2134669 - Resolves: rhbz#1940064 - Resolves: rhbz#2173781 -* Thu Apr 20 2023 Andrew Hughes - 1:17.0.6.0.10-7 -- Sync with existing RHEL 8 build, in order to start building portables on RHEL 8 -- Restore system bootstrap JDK (RHEL 8 has java-17-openjdk) -- Remove use of devtoolset (RHEL 8 native compilers should be sufficient) -- Explicitly exclude x86, as on RHEL RPMs - * Tue Feb 21 2023 Andrew Hughes - 1:17.0.6.0.10-6 - Add docs, icons and samples to the portable output - Make sure generated checksums work and don't include full path diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index 370e379..a07816e 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -351,10 +351,10 @@ %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 12 -%global rpmrelease 1 +%global rpmrelease 2 # Settings used by the portable build %global portablerelease 1 -%global portablesuffix el8 +%global portablesuffix el7_9 %global portablebuilddir /builddir/build/BUILD # 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 @@ -1262,6 +1262,10 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} # Prevent brp-java-repack-jars from being run %global __jar_repack 0 +# Define the OS the portable JDK is built on +%global pkgos rhel7 +# Define the root name of the portable packages +%global pkgnameroot java-%{featurever}-%{origin}-portable%{?pkgos:-%{pkgos}} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} @@ -1448,19 +1452,19 @@ BuildRequires: xorg-x11-proto-devel BuildRequires: zip BuildRequires: javapackages-filesystem %if %{include_normal_build} -BuildRequires: java-%{featurever}-openjdk-portable-unstripped = %{epoch}:%{version}-%{prelease}.%{portablesuffix} -BuildRequires: java-%{featurever}-openjdk-portable-static-libs = %{epoch}:%{version}-%{prelease}.%{portablesuffix} +BuildRequires: %{pkgnameroot}-unstripped = %{epoch}:%{version}-%{prelease}.%{portablesuffix} +BuildRequires: %{pkgnameroot}-static-libs = %{epoch}:%{version}-%{prelease}.%{portablesuffix} %endif %if %{include_fastdebug_build} -BuildRequires: java-%{featurever}-openjdk-portable-devel-fastdebug = %{epoch}:%{version}-%{prelease}.%{portablesuffix} -BuildRequires: java-%{featurever}-openjdk-portable-static-libs-fastdebug = %{epoch}:%{version}-%{prelease}.%{portablesuffix} +BuildRequires: %{pkgnameroot}-devel-fastdebug = %{epoch}:%{version}-%{prelease}.%{portablesuffix} +BuildRequires: %{pkgnameroot}-static-libs-fastdebug = %{epoch}:%{version}-%{prelease}.%{portablesuffix} %endif %if %{include_debug_build} -BuildRequires: java-%{featurever}-openjdk-portable-devel-slowdebug = %{epoch}:%{version}-%{prelease}.%{portablesuffix} -BuildRequires: java-%{featurever}-openjdk-portable-static-libs-slowdebug = %{epoch}:%{version}-%{prelease}.%{portablesuffix} +BuildRequires: %{pkgnameroot}-devel-slowdebug = %{epoch}:%{version}-%{prelease}.%{portablesuffix} +BuildRequires: %{pkgnameroot}-static-libs-slowdebug = %{epoch}:%{version}-%{prelease}.%{portablesuffix} %endif -BuildRequires: java-%{featurever}-openjdk-portable-docs = %{epoch}:%{version}-%{prelease}.%{portablesuffix} -BuildRequires: java-%{featurever}-openjdk-portable-misc = %{epoch}:%{version}-%{prelease}.%{portablesuffix} +BuildRequires: %{pkgnameroot}-docs = %{epoch}:%{version}-%{prelease}.%{portablesuffix} +BuildRequires: %{pkgnameroot}-misc = %{epoch}:%{version}-%{prelease}.%{portablesuffix} # Zero-assembler build requirement %ifarch %{zero_arches} BuildRequires: libffi-devel @@ -2477,6 +2481,11 @@ require "copy_jdk_configs.lua" %endif %changelog +* Mon Oct 30 2023 Andrew Hughes - 1:21.0.1.0.12-2 +- Switch to using portable binaries built on RHEL 7 +- Sync the copy of the portable specfile with the RHEL 7 version +- Related: RHEL-12996 + * Fri Oct 27 2023 Andrew Hughes - 1:21.0.1.0.12-1 - Update to jdk-21.0.1.0+12 (GA) - Update release notes to 21.0.1.0+12