From 9b04a3d0ed20aadb104a0d349759d911f973b6de Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Tue, 30 Jul 2024 10:32:00 +0800 Subject: [PATCH 1/4] update to java-11-openjdk-11.0.24.0.8-3.src.rpm Signed-off-by: Zhao Hang --- download | 2 +- java-11-openjdk-portable.specfile | 47 ++++++++++--- java-11-openjdk.spec | 106 +++++++++++++++--------------- 3 files changed, 92 insertions(+), 63 deletions(-) diff --git a/download b/download index e3e694b..99e625e 100644 --- a/download +++ b/download @@ -1,2 +1,2 @@ -b388826ca99176b3b4692de7226d78ca openjdk-jdk11u-jdk-11.0.23+9.tar.xz +48a739775deb0df711a3687acc0c84cc openjdk-jdk11u-jdk-11.0.24+8.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 fc196d3..386d352 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 23 +%global updatever 24 %global patchver 0 # buildjdkver is usually same as %%{featurever}, # but in time of bootstrap of next jdk, it is featurever-1, @@ -392,7 +392,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{vcstag} %global top_level_dir_name_backup %{top_level_dir_name}-backup -%global buildver 9 +%global buildver 8 %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 @@ -746,6 +746,7 @@ BuildRequires: harfbuzz-devel BuildRequires: lcms2-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel +BuildRequires: zlib-devel %else # Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h Provides: bundled(freetype) = 2.13.2 @@ -754,11 +755,13 @@ Provides: bundled(giflib) = 5.2.1 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h Provides: bundled(harfbuzz) = 8.2.2 # Version in src/java.desktop/share/native/liblcms/lcms2.h -Provides: bundled(lcms2) = 2.15.0 +Provides: bundled(lcms2) = 2.16.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.40 +# Version in src/java.base/share/native/libzip/zlib/zlib.h +Provides: bundled(zlib) = 1.3.1 # We link statically against libstdc++ to increase portability BuildRequires: libstdc++-static %endif @@ -948,18 +951,18 @@ sh %{SOURCE12} %{top_level_dir_name} # Patch the JDK pushd %{top_level_dir_name} -%patch1 -p1 -%patch3 -p1 +%patch -P1 -p1 +%patch -P3 -p1 # Add crypto policy and FIPS support -%patch1001 -p1 +%patch -P1001 -p1 # nss.cfg PKCS11 support; must come last as it also alters java.security -%patch1000 -p1 +%patch -P1000 -p1 # PKCS11 SHA3 backport -%patch2002 -p1 +%patch -P2002 -p1 # alt-java -%patch600 -p1 +%patch -P600 -p1 # RSA default -%patch1003 -p1 +%patch -P1003 -p1 popd # openjdk @@ -1646,6 +1649,30 @@ done %{_jvmdir}/%{miscportablearchive}.sha256sum %changelog +* Wed Jul 10 2024 Andrew Hughes - 1:11.0.24.0.8-2 +- Adjusted DTLS & RPATH NEWS entries to match OpenJDK 17 & 21 release notes + +* Wed Jul 10 2024 Anton Bobrov - 1:11.0.24.0.8-1 +- Update to jdk-11.0.24+8 (GA) +- Update release notes to 11.0.24+8 +- Switch to GA mode for release +- ** This tarball is embargoed until 2024-07-16 @ 1pm PT. ** + +* Mon Jun 24 2024 Anton Bobrov - 1:11.0.24.0.6-0.2.ea +- Add zlib build required or bundled version (1.3.1), depending on system_libs setting +- Related: OPENJDK-3066 + +* Thu Jun 06 2024 Anton Bobrov - 1:11.0.24.0.6-0.1.ea +- Update to jdk-11.0.24+6 (EA) +- Update release notes to 11.0.24+6 +- Switch to EA mode +- Update LCMS to 2.16 (JDK-8321489) +- Improve VCS exclusion in generate_source_tarball.sh script +- Bring outdated patch macros in the spec file up to date + +* Thu Apr 18 2024 Andrew Hughes - 1:11.0.23.0.9-3 +- Sync release notes with upstream version: https://bit.ly/openjdk11023 + * Thu Apr 11 2024 Andrew Hughes - 1:11.0.23.0.9-2 - Fix 11.0.22 release date in NEWS diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 440835c..8a90fef 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 23 +%global updatever 24 %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 9 +%global buildver 8 # 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_vendor 2 -%global portablerelease 2%{anolis_release} -%global portablesuffix an8 +%global portablerelease 2 +%global portablesuffix el8 %global portablebuilddir /builddir/build/BUILD #%%global tagsuffix %%{nil} @@ -1197,7 +1190,7 @@ Provides: java-headless%{?1} = %{epoch}:%{version}-%{release} %define java_devel_rpo() %{expand: # Requires base package -Requires: %{name}%{?1}%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}%{?1}%{?_isa} = %{epoch}:%{version}-%{release} OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} # Post requires alternatives to install tool alternatives Requires(post): %{alternatives_requires} @@ -1218,14 +1211,14 @@ Provides: java-sdk%{?1} = %{epoch}:%{version}-%{release} } %define java_static_libs_rpo() %{expand: -Requires: %{name}-devel%{?1}%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-devel%{?1}%{?_isa} = %{epoch}:%{version}-%{release} OrderWithRequires: %{name}-headless%{?1}%{?_isa} = %{epoch}:%{version}-%{release} } %define java_jmods_rpo() %{expand: # Requires devel package # as jmods are bytecode, they should be OK without any _isa -Requires: %{name}-devel%{?1} = %{epoch}:%{version}-%{release} +Requires: %{name}-devel%{?1} = %{epoch}:%{version}-%{release} OrderWithRequires: %{name}-headless%{?1} = %{epoch}:%{version}-%{release} Provides: java-%{javaver}-jmods%{?1} = %{epoch}:%{version}-%{release} @@ -1277,9 +1270,9 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release} # Prevent brp-java-repack-jars from being run %global __jar_repack 0 -Name: java-%{javaver}-%{origin} +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 @@ -1292,10 +1285,10 @@ Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{anolis_release}%{?dist} # JDK package >= 1.6.0 to 1, and packages referring to JDK virtual # provides >= 1.6.0 must specify the epoch, "java >= 1:1.6.0". -Epoch: 1 +Epoch: 1 Summary: %{origin_nice} %{featurever} Runtime Environment %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif # HotSpot code is licensed under GPLv2 @@ -1312,8 +1305,8 @@ Group: Development/Languages # The test code includes copies of NSS under the Mozilla Public License v2.0 # The PCSClite headers are under a BSD with advertising license # The elliptic curve cryptography (ECC) source code is licensed under the LGPLv2.1 or any later version -License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA -URL: http://openjdk.java.net/ +License: ASL 1.1 and ASL 2.0 and BSD and BSD with advertising and GPL+ and GPLv2 and GPLv2 with exceptions and IJG and LGPLv2+ and MIT and MPLv2.0 and Public Domain and W3C and zlib and ISC and FTL and RSA +URL: http://openjdk.java.net/ # to regenerate source0 (jdk) run update_package.sh @@ -1373,7 +1366,7 @@ Source20: java-%{featurever}-openjdk-portable.specfile ############################################ # Ignore AWTError when assistive technologies are loaded -Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch +Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch # NSS via SunPKCS11 Provider (disabled due to memory leak). Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch # RH1750419: enable build of speculative store bypass hardened alt-java (CVE-2018-3639) @@ -1420,7 +1413,7 @@ Patch1001: fips-11u-%{fipsver}.patch # be reviewed & pushed to the current development # tree of OpenJDK. ############################################# -Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch +Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch ############################################# # @@ -1507,6 +1500,7 @@ BuildRequires: harfbuzz-devel BuildRequires: lcms2-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel +BuildRequires: zlib-devel %else # Version in src/java.desktop/share/native/libfreetype/include/freetype/freetype.h Provides: bundled(freetype) = 2.13.2 @@ -1515,11 +1509,13 @@ Provides: bundled(giflib) = 5.2.1 # Version in src/java.desktop/share/native/libharfbuzz/hb-version.h Provides: bundled(harfbuzz) = 8.2.2 # Version in src/java.desktop/share/native/liblcms/lcms2.h -Provides: bundled(lcms2) = 2.15.0 +Provides: bundled(lcms2) = 2.16.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.40 +# Version in src/java.base/share/native/libzip/zlib/zlib.h +Provides: bundled(zlib) = 1.3.1 %endif # this is always built, also during debug-only build @@ -1533,7 +1529,7 @@ The %{origin_nice} %{featurever} runtime environment. %package slowdebug Summary: %{origin_nice} %{featurever} Runtime Environment %{debug_on} %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_rpo -- %{debug_suffix_unquoted}} @@ -1546,7 +1542,7 @@ The %{origin_nice} %{featurever} runtime environment. %package fastdebug Summary: %{origin_nice} %{featurever} Runtime Environment %{fastdebug_on} %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_rpo -- %{fastdebug_suffix_unquoted}} @@ -1559,7 +1555,7 @@ The %{origin_nice} %{featurever} runtime environment. %package headless Summary: %{origin_nice} %{featurever} Headless Runtime Environment %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_headless_rpo %{nil}} @@ -1571,7 +1567,7 @@ The %{origin_nice} %{featurever} runtime environment without audio and video sup %if %{include_debug_build} %package headless-slowdebug Summary: %{origin_nice} %{featurever} Runtime Environment %{debug_on} -Group: Development/Languages +Group: Development/Languages %{java_headless_rpo -- %{debug_suffix_unquoted}} @@ -1583,7 +1579,7 @@ The %{origin_nice} %{featurever} runtime environment without audio and video sup %if %{include_fastdebug_build} %package headless-fastdebug Summary: %{origin_nice} %{featurever} Runtime Environment %{fastdebug_on} -Group: Development/Languages +Group: Development/Languages %{java_headless_rpo -- %{fastdebug_suffix_unquoted}} @@ -1596,7 +1592,7 @@ The %{origin_nice} %{featurever} runtime environment without audio and video sup %package devel Summary: %{origin_nice} %{featurever} Development Environment %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_devel_rpo %{nil}} @@ -1609,7 +1605,7 @@ The %{origin_nice} %{featurever} development tools. %package devel-slowdebug Summary: %{origin_nice} %{featurever} Development Environment %{debug_on} %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_devel_rpo -- %{debug_suffix_unquoted}} @@ -1622,7 +1618,7 @@ The %{origin_nice} %{featurever} development tools. %if %{include_fastdebug_build} %package devel-fastdebug Summary: %{origin_nice} %{featurever} Development Environment %{fastdebug_on} -Group: Development/Tools +Group: Development/Tools %{java_devel_rpo -- %{fastdebug_suffix_unquoted}} @@ -1672,7 +1668,7 @@ The %{origin_nice} %{featurever} libraries for static linking. %package jmods Summary: JMods for %{origin_nice} %{featurever} %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_jmods_rpo %{nil}} @@ -1685,7 +1681,7 @@ The JMods for %{origin_nice} %{featurever}. %package jmods-slowdebug Summary: JMods for %{origin_nice} %{featurever} %{debug_on} %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_jmods_rpo -- %{debug_suffix_unquoted}} @@ -1698,7 +1694,7 @@ The JMods for %{origin_nice} %{featurever}. %if %{include_fastdebug_build} %package jmods-fastdebug Summary: JMods for %{origin_nice} %{featurever} %{fastdebug_on} -Group: Development/Tools +Group: Development/Tools %{java_jmods_rpo -- %{fastdebug_suffix_unquoted}} @@ -1711,7 +1707,7 @@ The JMods for %{origin_nice} %{featurever}. %package demo Summary: %{origin_nice} %{featurever} Demos %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_demo_rpo %{nil}} @@ -1724,7 +1720,7 @@ The %{origin_nice} %{featurever} demos. %package demo-slowdebug Summary: %{origin_nice} %{featurever} Demos %{debug_on} %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_demo_rpo -- %{debug_suffix_unquoted}} @@ -1737,7 +1733,7 @@ The %{origin_nice} %{featurever} demos. %if %{include_fastdebug_build} %package demo-fastdebug Summary: %{origin_nice} %{featurever} Demos %{fastdebug_on} -Group: Development/Languages +Group: Development/Languages %{java_demo_rpo -- %{fastdebug_suffix_unquoted}} @@ -1750,7 +1746,7 @@ The %{origin_nice} %{featurever} demos. %package src Summary: %{origin_nice} %{featurever} Source Bundle %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_src_rpo %{nil}} @@ -1764,7 +1760,7 @@ class library source code for use by IDE indexers and debuggers. %package src-slowdebug Summary: %{origin_nice} %{featurever} Source Bundle %{for_debug} %if 0%{?rhel} <= 8 -Group: Development/Languages +Group: Development/Languages %endif %{java_src_rpo -- %{debug_suffix_unquoted}} @@ -1777,7 +1773,7 @@ The %{compatiblename}-src-slowdebug sub-package contains the complete %{origin_n %if %{include_fastdebug_build} %package src-fastdebug Summary: %{origin_nice} %{featurever} Source Bundle %{for_fastdebug} -Group: Development/Languages +Group: Development/Languages %{java_src_rpo -- %{fastdebug_suffix_unquoted}} @@ -1790,7 +1786,7 @@ The %{compatiblename}-src-fastdebug sub-package contains the complete %{origin_n %package javadoc Summary: %{origin_nice} %{featurever} API documentation %if 0%{?rhel} <= 8 -Group: Documentation +Group: Documentation %endif Requires: javapackages-filesystem Obsoletes: javadoc-debug @@ -1803,7 +1799,7 @@ The %{origin_nice} %{featurever} API documentation. %package javadoc-zip Summary: %{origin_nice} %{featurever} API documentation compressed in a single archive %if 0%{?rhel} <= 8 -Group: Documentation +Group: Documentation %endif Requires: javapackages-filesystem Obsoletes: javadoc-zip-debug @@ -2089,7 +2085,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.23.0.9-2.0.1 -- Update version for dependecy -- Init 11.0.21.0.9 for LoongArch64 (Leslie Zhai) +* Wed Jul 10 2024 Andrew Hughes - 1:11.0.24.0.8-2 +- Adjusted DTLS & RPATH NEWS entries to match OpenJDK 17 & 21 release notes + +* Wed Jul 10 2024 Anton Bobrov - 1:11.0.24.0.8-1 +- Update to jdk-11.0.24+8 (GA) +- Update release notes to 11.0.24+8 +- Switch to GA mode for release +- Fix Provides to reflect up to date component versions +- Add zlib build required or bundled version (1.3.1), depending on system_libs setting +- Resolves: RHEL-45209 +- ** This tarball is embargoed until 2024-07-16 @ 1pm PT. ** * Thu Apr 11 2024 Andrew Hughes - 1:11.0.23.0.9-2 - Fix 11.0.22 release date in NEWS -- Gitee From 9aa264775846a2e581f905836b8624a60d30f45c Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Thu, 21 Sep 2023 14:30:47 +0800 Subject: [PATCH 2/4] 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 8a90fef..d9fcb2b 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 @@ -2495,6 +2497,9 @@ end %endif %changelog +* Tue Jul 30 2024 Zhao Hang - 1:11.0.24.0.8-2.0.1 +- Update version for dependecy + * Wed Jul 10 2024 Andrew Hughes - 1:11.0.24.0.8-2 - Adjusted DTLS & RPATH NEWS entries to match OpenJDK 17 & 21 release notes -- Gitee From 9bafb761cfd86e1800faa53ac02a75d915af73cc Mon Sep 17 00:00:00 2001 From: Leslie Zhai Date: Fri, 3 Nov 2023 15:18:52 +0800 Subject: [PATCH 3/4] [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 d9fcb2b..36a76f0 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} @@ -2087,6 +2092,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.24.0.8-2.0.1 - Update version for dependecy +- Init 11.0.21.0.9 for LoongArch64 (Leslie Zhai) * Wed Jul 10 2024 Andrew Hughes - 1:11.0.24.0.8-2 - Adjusted DTLS & RPATH NEWS entries to match OpenJDK 17 & 21 release notes -- Gitee From 39701e19932de19888f2b179fe8af56dad7b79e8 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Thu, 21 Sep 2023 14:30:47 +0800 Subject: [PATCH 4/4] Update version for dependecy Signed-off-by: Zhao Hang --- java-11-openjdk.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 36a76f0..bfcf6d6 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 # 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 @@ -2504,8 +2504,10 @@ end %endif %changelog -* Tue Jul 30 2024 Zhao Hang - 1:11.0.24.0.8-2.0.1 +* Mon Aug 19 2024 Zhao Hang - 1:11.0.24.0.8-2.0.2 - Update version for dependecy + +* Tue Jul 30 2024 Zhao Hang - 1:11.0.24.0.8-2.0.1 - Init 11.0.21.0.9 for LoongArch64 (Leslie Zhai) * Wed Jul 10 2024 Andrew Hughes - 1:11.0.24.0.8-2 -- Gitee