From 2e675cecc43b4c29f4f5d6b4c9b57074789f984d Mon Sep 17 00:00:00 2001 From: Renbo Date: Thu, 25 Apr 2024 14:34:54 +0800 Subject: [PATCH 1/3] update to java-11-openjdk-11.0.23.0.9-3.src.rpm Signed-off-by: Renbo --- download | 2 +- java-11-openjdk-portable.specfile | 39 ++++++++++++------ java-11-openjdk.spec | 67 ++++++++++++++++--------------- 3 files changed, 63 insertions(+), 45 deletions(-) diff --git a/download b/download index 56f97f3..e3e694b 100644 --- a/download +++ b/download @@ -1,2 +1,2 @@ -492b86b3cb64b98765dbe313fe0ee9ca openjdk-jdk11u-jdk-11.0.22+7.tar.xz +b388826ca99176b3b4692de7226d78ca openjdk-jdk11u-jdk-11.0.23+9.tar.xz 5d441d6217cc75372ca5a0943997cb24 tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz diff --git a/java-11-openjdk-portable.specfile b/java-11-openjdk-portable.specfile index 9871613..fc196d3 100644 --- a/java-11-openjdk-portable.specfile +++ b/java-11-openjdk-portable.specfile @@ -339,7 +339,7 @@ # New Version-String scheme-style defines %global featurever 11 %global interimver 0 -%global updatever 22 +%global updatever 23 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -392,8 +392,8 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 7 -%global rpmrelease 1 +%global buildver 9 +%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 @@ -571,7 +571,7 @@ Source0: openjdk-jdk%{featurever}u-%{vcstag}.tar.xz # Use 'icedtea_sync.sh' to update the following # They are based on code contained in the IcedTea project (6.x). # Systemtap tapsets. Zipped up to keep it small. -Source8: tapsets-icedtea-%%{icedteaver}.tar.xz +Source8: tapsets-icedtea-%{icedteaver}.tar.xz # Desktop files. Adapted from IcedTea # Disabled in portables @@ -726,8 +726,9 @@ BuildRequires: java-%{buildjdkver}-openjdk-devel %ifarch %{zero_arches} BuildRequires: libffi-devel %endif -# 2023c required as of JDK-8305113 -BuildRequires: tzdata-java >= 2023c +# 2024a required as of JDK-8325150 +# Use 2023d until 2024a is in the buildroot +BuildRequires: tzdata-java >= 2023d # cacerts build requirement in portable mode BuildRequires: ca-certificates # Earlier versions have a bug in tree vectorization on PPC @@ -747,17 +748,17 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel %else # Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h -Provides: bundled(freetype) = 2.13.0 +Provides: bundled(freetype) = 2.13.2 # Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h Provides: bundled(giflib) = 5.2.1 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h -Provides: bundled(harfbuzz) = 7.2.0 +Provides: bundled(harfbuzz) = 8.2.2 # Version in src/java.desktop/share/native/liblcms/lcms2.h Provides: bundled(lcms2) = 2.15.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.39 +Provides: bundled(libpng) = 1.6.40 # We link statically against libstdc++ to increase portability BuildRequires: libstdc++-static %endif @@ -1062,9 +1063,6 @@ function buildjdk() { 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-version-build=%{buildver} \ @@ -1648,6 +1646,23 @@ done %{_jvmdir}/%{miscportablearchive}.sha256sum %changelog +* Thu Apr 11 2024 Andrew Hughes - 1:11.0.23.0.9-2 +- Fix 11.0.22 release date in NEWS + +* Wed Apr 10 2024 Anton Bobrov - 1:11.0.23.0.9-1 +- Update to jdk-11.0.23+9 (GA) +- Update release notes to 11.0.23+9 +- Switch to GA mode for release +- Require tzdata 2024a due to upstream inclusion of JDK-8322725 +- Only require tzdata 2023d for now as 2024a is unavailable in buildroot +- Speed up PPC build by removing ppc64le --with-jobs=1 workaround +- ** This tarball is embargoed until 2024-04-16 @ 1pm PT. ** + +* Thu Mar 21 2024 Anton Bobrov - 1:11.0.23.0.1-0.1.ea +- Update to jdk-11.0.23+1 (EA) +- Update release notes to 11.0.23+1 +- Switch to EA mode + * Wed Jan 10 2024 Andrew Hughes - 1:11.0.22.0.7-1 - Update to jdk-11.0.22+7 (GA) - Update release notes to 11.0.22+7 diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index c0b20f8..53cebdf 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 # To rebuild this RPM, you must first rebuild the portable # RPM using the java-11-openjdk-portable.specfile, install # it and then adjust portablerelease and portablesuffix @@ -120,11 +119,11 @@ # Set of architectures which support multiple ABIs %global multilib_arches %{power64} sparc64 x86_64 # Set of architectures for which we build slowdebug builds -%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} s390x loongarch64 +%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} s390x # Set of architectures for which we build fastdebug builds -%global fastdebug_arches x86_64 ppc64le aarch64 loongarch64 +%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 loongarch64 +%global jit_arches %{arm} %{aarch64} %{ix86} %{power64} s390x sparcv9 sparc64 x86_64 # 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 @@ -134,7 +133,7 @@ # 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} loongarch64 +%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} %{arm} # 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 @@ -316,11 +315,6 @@ %global archinstall sparcv9 %global stapinstall %{_target_cpu} %endif -# 64 bit loongarch -%ifarch loongarch64 -%global archinstall loongarch64 -%global stapinstall loongarch64 -%endif # Need to support noarch for srpm build %ifarch noarch %global archinstall %{nil} @@ -336,7 +330,7 @@ # New Version-String scheme-style defines %global featurever 11 %global interimver 0 -%global updatever 22 +%global updatever 23 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -370,7 +364,7 @@ %endif %endif %endif -%global oj_vendor_version (Red_Hat-%{version}-%{portablerelease_vendor}) +%global oj_vendor_version (Red_Hat-%{version}-%{portablerelease}) # Define IcedTea version used for SystemTap tapsets and desktop file %global icedteaver 6.0.0pre00-c848b93a8598 @@ -389,13 +383,12 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 7 +%global buildver 9 # rpmrelease numbering must start at 2 to be later than the 8.6 RPM -%global rpmrelease 2 +%global rpmrelease 3 # Settings used by the portable build -%global portablerelease_vendor 1 -%global portablerelease 1%{anolis_release} -%global portablesuffix an8 +%global portablerelease 2 +%global portablesuffix el8 %global portablebuilddir /builddir/build/BUILD #%%global tagsuffix %%{nil} @@ -1154,8 +1147,9 @@ Provides: jre%{?1} = %{epoch}:%{version}-%{release} Requires: ca-certificates # Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros Requires: javapackages-filesystem -# 2023c required as of JDK-8305113 -Requires: tzdata-java >= 2023c +# 2024a required as of JDK-8325150 +# Use 2023d until 2024a is in the buildroot +Requires: tzdata-java >= 2023d # for support of kernel stream control # libsctp.so.1 is being `dlopen`ed on demand Requires: lksctp-tools%{?_isa} @@ -1278,7 +1272,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{anolis_release}%{?dist} +Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} # Equivalent for the portable build %global prelease %{?eaprefix}%{portablerelease}%{?extraver} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons @@ -1488,8 +1482,9 @@ BuildRequires: java-%{featurever}-openjdk-portable-misc = %{epoch}:%{version}-%{ %ifarch %{zero_arches} BuildRequires: libffi-devel %endif -# 2023c required as of JDK-8305113 -BuildRequires: tzdata-java >= 2023c +# 2024a required as of JDK-8325150 +# Use 2023d until 2024a is in the buildroot +BuildRequires: tzdata-java >= 2023d # Earlier versions have a bug in tree vectorization on PPC BuildRequires: gcc >= 4.8.3-8 @@ -1507,17 +1502,17 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel %else # Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h -Provides: bundled(freetype) = 2.13.0 +Provides: bundled(freetype) = 2.13.2 # Version in src/java.desktop/share/native/libsplashscreen/giflib/gif_lib.h Provides: bundled(giflib) = 5.2.1 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h -Provides: bundled(harfbuzz) = 7.2.0 +Provides: bundled(harfbuzz) = 8.2.2 # Version in src/java.desktop/share/native/liblcms/lcms2.h Provides: bundled(lcms2) = 2.15.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.39 +Provides: bundled(libpng) = 1.6.40 %endif # this is always built, also during debug-only build @@ -2087,7 +2082,6 @@ done # Using line number 1 might cause build problems. See: # https://bugzilla.redhat.com/show_bug.cgi?id=1539664 # https://bugzilla.redhat.com/show_bug.cgi?id=1538767 -%ifnarch loongarch64 gdb -q "$JAVA_HOME/bin/java" < - 1:11.0.22.0.7-2.0.1 -- Update version for dependecy -- Init 11.0.21.0.9 for LoongArch64 (Leslie Zhai) +* Thu Apr 11 2024 Andrew Hughes - 1:11.0.23.0.9-2 +- Fix 11.0.22 release date in NEWS -* Thu Jan 18 2024 Release Engineering - 11.0.22.0.7-2 -- Build for Rocky Linux %{rocky} using our own portable +* Wed Apr 10 2024 Anton Bobrov - 1:11.0.23.0.9-1 +- Update to jdk-11.0.23+9 (GA) +- Update release notes to 11.0.23+9 +- Switch to GA mode for release +- Require tzdata 2024a due to upstream inclusion of JDK-8322725 +- Only require tzdata 2023d for now as 2024a is unavailable in buildroot +- ** This tarball is embargoed until 2024-04-16 @ 1pm PT. ** +- Resolves: RHEL-30917 + +* Thu Mar 28 2024 Anton Bobrov - 1:11.0.23.0.1-0.1.ea +- Update to jdk-11.0.23+1 (EA) +- Update release notes to 11.0.23+1 +- Switch to EA mode * Wed Jan 10 2024 Andrew Hughes - 1:11.0.22.0.7-1 - Update to jdk-11.0.22+7 (GA) -- Gitee From 96e8843a40dbafb3ad220d69e3b7d826945aa46e Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Thu, 21 Sep 2023 14:30:47 +0800 Subject: [PATCH 2/3] Update version for dependecy Signed-off-by: Zhao Hang --- java-11-openjdk.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 53cebdf..8c62e0a 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 # To rebuild this RPM, you must first rebuild the portable # RPM using the java-11-openjdk-portable.specfile, install # it and then adjust portablerelease and portablesuffix @@ -364,7 +365,7 @@ %endif %endif %endif -%global oj_vendor_version (Red_Hat-%{version}-%{portablerelease}) +%global oj_vendor_version (Red_Hat-%{version}-%{portablerelease_vendor}) # Define IcedTea version used for SystemTap tapsets and desktop file %global icedteaver 6.0.0pre00-c848b93a8598 @@ -387,8 +388,9 @@ # rpmrelease numbering must start at 2 to be later than the 8.6 RPM %global rpmrelease 3 # Settings used by the portable build -%global portablerelease 2 -%global portablesuffix el8 +%global portablerelease_vendor 2 +%global portablerelease 2%{anolis_release} +%global portablesuffix an8 %global portablebuilddir /builddir/build/BUILD #%%global tagsuffix %%{nil} @@ -1272,7 +1274,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} +Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{anolis_release}%{?dist} # Equivalent for the portable build %global prelease %{?eaprefix}%{portablerelease}%{?extraver} # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons @@ -2492,6 +2494,9 @@ end %endif %changelog +* Thu Apr 25 2024 Zhao Hang - 1:11.0.23.0.9-2.0.1 +- Update version for dependecy + * Thu Apr 11 2024 Andrew Hughes - 1:11.0.23.0.9-2 - Fix 11.0.22 release date in NEWS -- Gitee From cdccf814383f4ed775eb083921d4017c5b258fce Mon Sep 17 00:00:00 2001 From: Leslie Zhai Date: Fri, 3 Nov 2023 15:18:52 +0800 Subject: [PATCH 3/3] [a8] Init 11.0.21.0.9 for LoongArch64 --- java-11-openjdk.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 8c62e0a..440835c 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -120,11 +120,11 @@ # Set of architectures which support multiple ABIs %global multilib_arches %{power64} sparc64 x86_64 # Set of architectures for which we build slowdebug builds -%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} s390x +%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} s390x loongarch64 # Set of architectures for which we build fastdebug builds -%global fastdebug_arches x86_64 ppc64le aarch64 +%global fastdebug_arches x86_64 ppc64le aarch64 loongarch64 # 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 loongarch64 # 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 @@ -134,7 +134,7 @@ # 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} loongarch64 # 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 @@ -316,6 +316,11 @@ %global archinstall sparcv9 %global stapinstall %{_target_cpu} %endif +# 64 bit loongarch +%ifarch loongarch64 +%global archinstall loongarch64 +%global stapinstall loongarch64 +%endif # Need to support noarch for srpm build %ifarch noarch %global archinstall %{nil} @@ -2084,6 +2089,7 @@ done # Using line number 1 might cause build problems. See: # https://bugzilla.redhat.com/show_bug.cgi?id=1539664 # https://bugzilla.redhat.com/show_bug.cgi?id=1538767 +%ifnarch loongarch64 gdb -q "$JAVA_HOME/bin/java" < - 1:11.0.23.0.9-2.0.1 - Update version for dependecy +- Init 11.0.21.0.9 for LoongArch64 (Leslie Zhai) * Thu Apr 11 2024 Andrew Hughes - 1:11.0.23.0.9-2 - Fix 11.0.22 release date in NEWS -- Gitee