From f8384c61105b14d9074c495a9f627de5f956a927 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Mon, 22 Jan 2024 15:07:25 +0800 Subject: [PATCH 1/3] update to java-11-openjdk-11.0.22.0.7-2.src.rpm Signed-off-by: Zhao Hang --- dist | 2 +- download | 2 +- java-11-openjdk-portable.specfile | 36 +++---- java-11-openjdk.spec | 115 +++++++++------------- jdk8312489-max_sig_default_increase.patch | 50 ---------- 5 files changed, 69 insertions(+), 136 deletions(-) delete mode 100644 jdk8312489-max_sig_default_increase.patch diff --git a/dist b/dist index 5aa45c5..9c0e36e 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8_8 +an8 diff --git a/download b/download index 258313e..56f97f3 100644 --- a/download +++ b/download @@ -1,2 +1,2 @@ -49f8d97c51b5bf38fd420cf7a163fd91 openjdk-jdk11u-jdk-11.0.21+9.tar.xz +492b86b3cb64b98765dbe313fe0ee9ca openjdk-jdk11u-jdk-11.0.22+7.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 91f1806..9871613 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 21 +%global updatever 22 %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 7 %global rpmrelease 1 #%%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 @@ -673,25 +673,13 @@ Patch2002: jdk8242332-rh2108712-sha3-sunpkcs11.patch ############################################# # -# Patches appearing in 11.0.21 -# -# This section includes patches which are present -# in the listed OpenJDK 11u release and should be -# able to be removed once that release is out -# and used by this RPM. -############################################# - -############################################# -# -# Patches appearing in 11.0.22 +# Patches appearing in 11.0.23 # # This section includes patches which are present # in the listed OpenJDK 8u release and should be # able to be removed once that release is out # and used by this RPM. ############################################# -# JDK-8312489, OJ2095: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar -Patch2000: jdk8312489-max_sig_default_increase.patch ############################################# # @@ -965,8 +953,6 @@ pushd %{top_level_dir_name} %patch1001 -p1 # nss.cfg PKCS11 support; must come last as it also alters java.security %patch1000 -p1 -# JDK-8312489 backport, coming in 11.0.22 -%patch2000 -p1 # PKCS11 SHA3 backport %patch2002 -p1 # alt-java @@ -1662,6 +1648,22 @@ done %{_jvmdir}/%{miscportablearchive}.sha256sum %changelog +* 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 +- Switch to GA mode for release +- ** This tarball is embargoed until 2024-01-16 @ 1pm PT. ** + +* Mon Jan 08 2024 Andrew Hughes - 1:11.0.22.0.6-0.1.ea +- Update to jdk-11.0.22+6 (EA) +- Update release notes to 11.0.22+6 + +* Thu Jan 04 2024 Andrew Hughes - 1:11.0.22.0.1-0.1.ea +- Update to jdk-11.0.22+1 (EA) +- Update release notes to 11.0.22+1 +- Switch to EA mode +- Drop local copy of JDK-8312489 which is now included upstream + * Wed Oct 11 2023 Andrew Hughes - 1:11.0.21.0.9-1 - Update to jdk-11.0.21+9 (GA) - Update release notes to 11.0.21+9 diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 6159d7b..358ad72 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -1,4 +1,3 @@ -%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 @@ -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 21 +%global updatever 22 %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 7 # rpmrelease numbering must start at 2 to be later than the 8.6 RPM %global rpmrelease 2 # Settings used by the portable build -%global portablerelease_vendor 1 -%global portablerelease 1%{anolis_release} -%global portablesuffix an8 +%global portablerelease 1 +%global portablesuffix el8 %global portablebuilddir /builddir/build/BUILD #%%global tagsuffix %%{nil} @@ -1196,7 +1189,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} @@ -1217,14 +1210,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} @@ -1276,9 +1269,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 @@ -1291,10 +1284,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 @@ -1311,8 +1304,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 @@ -1372,7 +1365,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) @@ -1419,7 +1412,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 ############################################# # @@ -1434,25 +1427,13 @@ Patch2002: jdk8242332-rh2108712-sha3-sunpkcs11.patch ############################################# # -# Patches appearing in 11.0.21 -# -# This section includes patches which are present -# in the listed OpenJDK 11u release and should be -# able to be removed once that release is out -# and used by this RPM. -############################################# - -############################################# -# -# Patches appearing in 11.0.22 +# Patches appearing in 11.0.23 # # This section includes patches which are present # in the listed OpenJDK 8u release and should be # able to be removed once that release is out # and used by this RPM. ############################################# -# JDK-8312489, OJ2095: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar -Patch2000: jdk8312489-max_sig_default_increase.patch BuildRequires: autoconf BuildRequires: automake @@ -1543,7 +1524,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}} @@ -1556,7 +1537,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}} @@ -1569,7 +1550,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}} @@ -1581,7 +1562,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}} @@ -1593,7 +1574,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}} @@ -1606,7 +1587,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}} @@ -1619,7 +1600,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}} @@ -1632,7 +1613,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}} @@ -1682,7 +1663,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}} @@ -1695,7 +1676,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}} @@ -1708,7 +1689,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}} @@ -1721,7 +1702,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}} @@ -1734,7 +1715,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}} @@ -1747,7 +1728,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}} @@ -1760,7 +1741,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}} @@ -1774,7 +1755,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}} @@ -1787,7 +1768,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}} @@ -1800,7 +1781,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 @@ -1813,7 +1794,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 @@ -1881,8 +1862,6 @@ pushd %{top_level_dir_name} %patch1001 -p1 # nss.cfg PKCS11 support; must come last as it also alters java.security %patch1000 -p1 -# JDK-8312489 backport, coming in 11.0.22 -%patch2000 -p1 # PKCS11 SHA3 backport %patch2002 -p1 # alt-java @@ -2101,7 +2080,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.21.0.9-2.0.2 -- Init 11.0.21.0.9 for LoongArch64 +* Thu Jan 18 2024 Release Engineering - 11.0.22.0.7-2 +- Build for Rocky Linux %{rocky} using our own portable -* Fri Nov 03 2023 Zhao Hang - 1:11.0.21.0.9-2.0.2 -- Update version for dependecy +* Wed Jan 10 2024 Andrew Hughes - 1:11.0.22.0.7-1 +- Update to jdk-11.0.22+7 (GA) +- Sync the copy of the portable specfile with the latest update +- Drop local copy of JDK-8312489 which is now included upstream +- ** This tarball is embargoed until 2024-01-16 @ 1pm PT. ** +- Resolves: RHEL-20981 * Fri Oct 13 2023 Andrew Hughes - 1:11.0.21.0.9-2 - Update to jdk-11.0.21+9 (GA) diff --git a/jdk8312489-max_sig_default_increase.patch b/jdk8312489-max_sig_default_increase.patch deleted file mode 100644 index e0c4eeb..0000000 --- a/jdk8312489-max_sig_default_increase.patch +++ /dev/null @@ -1,50 +0,0 @@ -commit 50074a04e62f91faa080b831d9ce343396ead252 -Author: Andrew John Hughes -Date: Tue Sep 5 20:48:42 2023 +0000 - - 8312489: Increase jdk.jar.maxSignatureFileSize default which is too low for JARs such as WhiteSource/Mend unified agent jar - - Backport-of: e47a84f23dd2608c6f5748093eefe301fb5bf750 - -diff --git a/src/java.base/share/classes/java/util/jar/JarFile.java b/src/java.base/share/classes/java/util/jar/JarFile.java -index cb7e308e0d..cce897c0d3 100644 ---- a/src/java.base/share/classes/java/util/jar/JarFile.java -+++ b/src/java.base/share/classes/java/util/jar/JarFile.java -@@ -809,7 +809,9 @@ class JarFile extends ZipFile { - throw new IOException("Unsupported size: " + uncompressedSize + - " for JarEntry " + ze.getName() + - ". Allowed max size: " + -- SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes"); -+ SignatureFileVerifier.MAX_SIG_FILE_SIZE + " bytes. " + -+ "You can use the jdk.jar.maxSignatureFileSize " + -+ "system property to increase the default value."); - } - int len = (int)uncompressedSize; - int bytesRead; -diff --git a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java -index cb477fc134..a766b8249f 100644 ---- a/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java -+++ b/src/java.base/share/classes/sun/security/util/SignatureFileVerifier.java -@@ -852,16 +852,16 @@ public class SignatureFileVerifier { - * the maximum allowed number of bytes for the signature-related files - * in a JAR file. - */ -- Integer tmp = GetIntegerAction.privilegedGetProperty( -- "jdk.jar.maxSignatureFileSize", 8000000); -+ int tmp = GetIntegerAction.privilegedGetProperty( -+ "jdk.jar.maxSignatureFileSize", 16000000); - if (tmp < 0 || tmp > MAX_ARRAY_SIZE) { - if (debug != null) { -- debug.println("Default signature file size 8000000 bytes " + -- "is used as the specified size for the " + -- "jdk.jar.maxSignatureFileSize system property " + -+ debug.println("The default signature file size of 16000000 bytes " + -+ "will be used for the jdk.jar.maxSignatureFileSize " + -+ "system property since the specified value " + - "is out of range: " + tmp); - } -- tmp = 8000000; -+ tmp = 16000000; - } - return tmp; - } -- Gitee From 16a80cbfc13128d4ec79158cacbbf584b528c541 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 358ad72..baa3167 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 2 # Settings used by the portable build -%global portablerelease 1 -%global portablesuffix el8 +%global portablerelease_vendor 1 +%global portablerelease 1%{anolis_release} +%global portablesuffix an8 %global portablebuilddir /builddir/build/BUILD #%%global tagsuffix %%{nil} @@ -1271,7 +1273,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 @@ -2490,6 +2492,9 @@ end %endif %changelog +* Mon Jan 22 2024 Zhao Hang - 1:11.0.22.0.7-2.0.1 +- Update version for dependecy + * Thu Jan 18 2024 Release Engineering - 11.0.22.0.7-2 - Build for Rocky Linux %{rocky} using our own portable -- Gitee From 0837df0dda08d05a3c3f871f1091445ce36167cc 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 baa3167..c0b20f8 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} @@ -2082,6 +2087,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.22.0.7-2.0.1 - Update version for dependecy +- Init 11.0.21.0.9 for LoongArch64 (Leslie Zhai) * Thu Jan 18 2024 Release Engineering - 11.0.22.0.7-2 - Build for Rocky Linux %{rocky} using our own portable -- Gitee