From f4cdbe867358da94248fcce2fbe3fb3605d2eb43 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Wed, 23 Mar 2022 18:24:26 +0000 Subject: [PATCH 1/5] Automatically turn off building a fresh HotSpot first, if the bootstrap JDK is not the same major version as that being built --- java-latest-openjdk.spec | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index 942ba6f..8532907 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -22,7 +22,7 @@ # Enable static library builds by default. %bcond_without staticlibs # Build a fresh libjvm.so for use in a copy of the bootstrap JDK -%bcond_with fresh_libjvm +%bcond_without fresh_libjvm # Workaround for stripping of debug symbols from static libraries %if %{with staticlibs} @@ -32,13 +32,6 @@ %global include_staticlibs 0 %endif -# Define whether to use the bootstrap JDK directly or with a fresh libjvm.so -%if %{with fresh_libjvm} -%global build_hotspot_first 1 -%else -%global build_hotspot_first 0 -%endif - # The -g flag says to use strip -g instead of full strip on DSOs or EXEs. # This fixes detailed NMT and other tools which need minimal debug info. # See: https://bugzilla.redhat.com/show_bug.cgi?id=1520879 @@ -217,9 +210,6 @@ # Target to use to just build HotSpot %global hotspot_target hotspot -# JDK to use for bootstrapping -%global bootjdk /usr/lib/jvm/java-%{buildjdkver}-openjdk - # VM variant being built %ifarch %{zero_arches} %global vm_variant zero @@ -330,6 +320,16 @@ %global lts_designator "" %global lts_designator_zip "" %endif +# JDK to use for bootstrapping +%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 +%if %{with fresh_libjvm} && %{buildjdkver} == %{featurever} +%global build_hotspot_first 1 +%else +%global build_hotspot_first 0 +%endif # Define IcedTea version used for SystemTap tapsets and desktop file %global icedteaver 6.0.0pre00-c848b93a8598 @@ -342,7 +342,7 @@ %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 37 -%global rpmrelease 2 +%global rpmrelease 3 # 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 # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions @@ -1730,6 +1730,12 @@ if [ %{include_debug_build} -eq 0 -a %{include_normal_build} -eq 0 -a %{includ echo "You have disabled all builds (normal,fastdebug,slowdebug). That is a no go." exit 14 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}" +%endif + %setup -q -c -n %{uniquesuffix ""} -T -a 0 # https://bugzilla.redhat.com/show_bug.cgi?id=1189084 prioritylength=`expr length %{priority}` @@ -2527,6 +2533,9 @@ cjc.mainProgram(args) %endif %changelog +* Wed Mar 23 2022 Andrew Hughes - 1:18.0.0.0.37-3.rolling +- Automatically turn off building a fresh HotSpot first, if the bootstrap JDK is not the same major version as that being built + * Mon Mar 21 2022 Jiri Vanek - 1:18.0.0.0.37-2.rolling - replaced tabs by sets of spaces to make rpmlint happy - set build jdk to 18 From fb85c81739d0211104fca77b3322bbc7f3e7ef47 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 5 Apr 2022 16:04:27 +0200 Subject: [PATCH 2/5] removed hardcoded /usr/lib/jvm by %{_jvmdir} to make rpmlint happy --- java-latest-openjdk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index 8532907..4b15001 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -321,7 +321,7 @@ %global lts_designator_zip "" %endif # JDK to use for bootstrapping -%global bootjdk /usr/lib/jvm/java-%{buildjdkver}-openjdk +%global bootjdk %{_jvmdir}/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 @@ -342,7 +342,7 @@ %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 37 -%global rpmrelease 3 +%global rpmrelease 4 # 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 # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions From 4c04ead0c38449b1fbdbaf7b8d78d52ebe297344 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Sun, 10 Apr 2022 22:23:34 +0100 Subject: [PATCH 3/5] Add missing ChangeLog entry for previous commit --- java-latest-openjdk.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index 4b15001..a61d929 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -2533,6 +2533,9 @@ cjc.mainProgram(args) %endif %changelog +* Wed Apr 06 2022 Jiri Vanek - 1:18.0.0.0.37-4.rolling +- Remove hardcoded /usr/lib/jvm by %{_jvmdir} to make rpmlint happy + * Wed Mar 23 2022 Andrew Hughes - 1:18.0.0.0.37-3.rolling - Automatically turn off building a fresh HotSpot first, if the bootstrap JDK is not the same major version as that being built From 40e63ef0cc2f5b06482f9cc9af226f3a71aad019 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 27 Apr 2022 18:36:10 +0200 Subject: [PATCH 4/5] updated to CPU jdk-18.0.1 sources --- .gitignore | 1 + generate_source_tarball.sh | 4 ++-- java-latest-openjdk.spec | 11 +++++++---- sources | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 1d080d8..6aa39e8 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /openjdk-jdk-jdk-18+27.tar.xz /openjdk-jdk18-jdk-18+27.tar.xz /openjdk-jdk18-jdk-18+37.tar.xz +/openjdk-jdk18u-jdk-18.0.1+0.tar.xz diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh index 94d2fa9..fadbf69 100755 --- a/generate_source_tarball.sh +++ b/generate_source_tarball.sh @@ -8,8 +8,8 @@ # # In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg: # PROJECT_NAME=openjdk -# REPO_NAME=jdk18 -# VERSION=jdk-18+37 +# REPO_NAME=jdk18u +# VERSION=jdk-18.0.1-ga # or to eg prepare systemtap: # icedtea7's jstack and other tapsets # VERSION=6327cf1cea9e diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index a61d929..3c7f6f4 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -301,7 +301,7 @@ # New Version-String scheme-style defines %global featurever 18 %global interimver 0 -%global updatever 0 +%global updatever 1 %global patchver 0 # If you bump featurever, you must also bump vendor_version_string # Used via new version scheme. JDK 17 was @@ -341,8 +341,8 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 37 -%global rpmrelease 4 +%global buildver 0 +%global rpmrelease 1 # 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 # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions @@ -1268,7 +1268,7 @@ URL: http://openjdk.java.net/ # to regenerate source0 (jdk) run update_package.sh # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives -Source0: openjdk-jdk%{featurever}-jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}.tar.xz +Source0: openjdk-jdk%{featurever}u-jdk-%{filever}+%{buildver}%{?tagsuffix:-%{tagsuffix}}.tar.xz # Use 'icedtea_sync.sh' to update the following # They are based on code contained in the IcedTea project (6.x). @@ -2533,6 +2533,9 @@ cjc.mainProgram(args) %endif %changelog +* Wed Apr 27 2022 Jiri Vanek - 1:18.0.1.0.0-1.rolling. +- updated to CPU jdk-18.0.1 sources + * Wed Apr 06 2022 Jiri Vanek - 1:18.0.0.0.37-4.rolling - Remove hardcoded /usr/lib/jvm by %{_jvmdir} to make rpmlint happy diff --git a/sources b/sources index 5c094ae..d8dd163 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30 -SHA512 (openjdk-jdk18-jdk-18+37.tar.xz) = bd029f42e1a46a3a885622f4b92b739ae5b90566baaa7b1e57d0eb01473b6be1ec03eb72e02c1e4bdeb780b8ab3fd342b764cb93e93ce4e5f879209490d45645 +SHA512 (openjdk-jdk18u-jdk-18.0.1+0.tar.xz) = 633ad239bbefff4365a05cd6f12387759cbb51f2e0441a88e1d57d79f78d4874d51574e5225ad2fa21894356b1fc02c703f4272d6861d20d2adc81421c9d605b From fcc7371149f44ae03372ff795d7d9167e3fa4b9c Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 28 Apr 2022 11:59:03 +0200 Subject: [PATCH 5/5] updated to CPU jdk-18.0.1+10 sources --- .gitignore | 1 + generate_source_tarball.sh | 2 +- java-latest-openjdk.spec | 6 +++--- sources | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6aa39e8..5e412df 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /openjdk-jdk18-jdk-18+27.tar.xz /openjdk-jdk18-jdk-18+37.tar.xz /openjdk-jdk18u-jdk-18.0.1+0.tar.xz +/openjdk-jdk18u-jdk-18.0.1+10.tar.xz diff --git a/generate_source_tarball.sh b/generate_source_tarball.sh index fadbf69..515d472 100755 --- a/generate_source_tarball.sh +++ b/generate_source_tarball.sh @@ -9,7 +9,7 @@ # In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg: # PROJECT_NAME=openjdk # REPO_NAME=jdk18u -# VERSION=jdk-18.0.1-ga +# VERSION=jdk-18.0.1+10 # or to eg prepare systemtap: # icedtea7's jstack and other tapsets # VERSION=6327cf1cea9e diff --git a/java-latest-openjdk.spec b/java-latest-openjdk.spec index 3c7f6f4..a97cf96 100644 --- a/java-latest-openjdk.spec +++ b/java-latest-openjdk.spec @@ -341,7 +341,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 0 +%global buildver 10 %global rpmrelease 1 # 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 @@ -2533,8 +2533,8 @@ cjc.mainProgram(args) %endif %changelog -* Wed Apr 27 2022 Jiri Vanek - 1:18.0.1.0.0-1.rolling. -- updated to CPU jdk-18.0.1 sources +* Wed Apr 27 2022 Jiri Vanek - 1:18.0.1.0.10-1.rolling. +- updated to CPU jdk-18.0.1+10 sources * Wed Apr 06 2022 Jiri Vanek - 1:18.0.0.0.37-4.rolling - Remove hardcoded /usr/lib/jvm by %{_jvmdir} to make rpmlint happy diff --git a/sources b/sources index d8dd163..94b9ab3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30 -SHA512 (openjdk-jdk18u-jdk-18.0.1+0.tar.xz) = 633ad239bbefff4365a05cd6f12387759cbb51f2e0441a88e1d57d79f78d4874d51574e5225ad2fa21894356b1fc02c703f4272d6861d20d2adc81421c9d605b +SHA512 (openjdk-jdk18u-jdk-18.0.1+10.tar.xz) = 9d4cc24675019f0078540874f0feb884c1f6513886272f2c1f86384c4a882f1b8d7fa6c653ae5f493757203c91b445e0da6559082ba5ef2f53eab27b43e6bea1