From 98760548fe896f9e281e272d957c0e604351da15 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Tue, 20 Feb 2024 14:03:58 +0800 Subject: [PATCH 1/3] update to java-1.8.0-openjdk-1.8.0.402.b06-2.src.rpm Signed-off-by: Zhao Hang --- dist | 2 +- download | 2 +- java-1.8.0-openjdk-portable.specfile | 19 +++- java-1.8.0-openjdk.spec | 112 +++++++++++----------- jdk8312489-max_sig_default_increase.patch | 48 ---------- 5 files changed, 70 insertions(+), 113 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 61f22e6..5b93789 100644 --- a/download +++ b/download @@ -1,2 +1,2 @@ -1bb1ed11a60383d732e5750dab700193 openjdk-shenandoah-jdk8u-shenandoah-jdk8u392-b08.tar.xz +ab6fd994c04017781a7917d22e5387d2 openjdk-shenandoah-jdk8u-shenandoah-jdk8u402-b06.tar.xz 870d829d8e1c38e251cc7498032a768a tapsets-icedtea-3.15.0.tar.xz diff --git a/java-1.8.0-openjdk-portable.specfile b/java-1.8.0-openjdk-portable.specfile index eaa8267..1231da3 100644 --- a/java-1.8.0-openjdk-portable.specfile +++ b/java-1.8.0-openjdk-portable.specfile @@ -267,7 +267,7 @@ # Define version of OpenJDK 8 used %global project openjdk %global repo shenandoah-jdk8u -%global openjdk_revision jdk8u392-b08 +%global openjdk_revision jdk8u402-b06 %global shenandoah_revision shenandoah-%{openjdk_revision} # Define IcedTea version used for SystemTap tapsets and desktop file %global icedteaver 3.15.0 @@ -597,8 +597,6 @@ Patch204: jdk8042159-allow_using_system_installed_lcms2-jdk.patch Patch581: jdk8257794-remove_broken_assert.patch # JDK-8186464, RH1433262: ZipFile cannot read some InfoZip ZIP64 zip files Patch12: jdk8186464-rh1433262-zip64_failure.patch -# 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 ############################################# # @@ -869,8 +867,6 @@ pushd %{top_level_dir_name} %patch1000 -p1 # system cacerts support %patch539 -p1 -# JDK-8312489 backport, proposed for 8u402: https://github.com/openjdk/jdk8u-dev/pull/381 -%patch2000 -p1 popd # RPM-only fixes @@ -1500,6 +1496,19 @@ done %{_jvmdir}/%{miscportablearchive}.sha256sum %changelog +* Thu Jan 11 2024 Andrew Hughes - 1:1.8.0.402.b06-0.1.ea +- Update to shenandoah-jdk8u402-b06 (GA) +- Update release notes for shenandoah-8u402-b06. +- Drop local copy of JDK-8312489 which is now included upstream +- Switch to GA mode. +- ** This tarball is embargoed until 2024-01-16 @ 1pm PT. ** + +* Tue Dec 05 2023 Andrew Hughes - 1:1.8.0.402.b01-0.1.ea +- Update to shenandoah-jdk8u402-b01 (EA) +- Update release notes for shenandoah-8u402-b01. +- Switch to EA mode. +- Sync NEWS with vanilla branch version. + * Wed Oct 11 2023 Andrew Hughes - 1:1.8.0.392.b08-1 - Update to shenandoah-jdk8u392-b08 (GA) - Update release notes for shenandoah-8u392-b08. diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index e1d3b21..ff5cdd9 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-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-1.8.0-openjdk-portable.specfile, install # it and then adjust portablerelease and portablesuffix @@ -109,11 +108,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} loongarch64 +%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} # 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 %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 loongarch64 +%global jit_arches %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 # Set of architectures which use the Zero assembler port (!jit_arches) %global zero_arches %{arm} ppc s390 s390x # Set of architectures which run a full bootstrap cycle @@ -121,11 +120,11 @@ # Set of architectures which support SystemTap tapsets %global systemtap_arches %{jit_arches} # Set of architectures which support the serviceability agent -%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} loongarch64 +%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} # Set of architectures which support class data sharing # See https://bugzilla.redhat.com/show_bug.cgi?id=513605 # MetaspaceShared::generate_vtable_methods is not implemented for the PPC JIT -%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} loongarch64 +%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} # Set of architectures which support Java Flight Recorder (JFR) %global jfr_arches %{jit_arches} # Set of architectures for which alt-java has SSB mitigation @@ -133,7 +132,7 @@ # Set of architectures where we verify backtraces with gdb %global gdb_arches %{jit_arches} %{zero_arches} # Set of architectures for which we have a portable build -%global portable_build_arches %{aarch64} %{ix86} %{power64} s390x x86_64 loongarch64 +%global portable_build_arches %{aarch64} %{ix86} %{power64} s390x x86_64 # By default, we build a debug build during main build on JIT architectures %if %{with slowdebug} @@ -270,10 +269,6 @@ %global archinstall aarch64 %global stapinstall arm64 %endif -%ifarch loongarch64 -%global archinstall loongarch64 -%global stapinstall loongarch64 -%endif # 32 bit sparc, optimized for v9 %ifarch sparcv9 %global archinstall sparc @@ -302,7 +297,7 @@ # Define version of OpenJDK 8 used %global project openjdk %global repo shenandoah-jdk8u -%global openjdk_revision jdk8u392-b08 +%global openjdk_revision jdk8u402-b06 %global shenandoah_revision shenandoah-%{openjdk_revision} # Define IcedTea version used for SystemTap tapsets and desktop files %global icedteaver 3.15.0 @@ -348,10 +343,10 @@ %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) -%global rpmrelease 4 +%global rpmrelease 2 # Settings used by the portable build -%global portablerelease 1%{anolis_release} -%global portablesuffix an8 +%global portablerelease 1 +%global portablesuffix el%{rhel} %global portablebuilddir /builddir/build/BUILD # Define milestone (EA for pre-releases, GA ("fcs") for releases) @@ -1141,8 +1136,8 @@ Provides: java-%{javaver}%{?1} = %{epoch}:%{version}-%{release} %if %is_system_jdk Provides: java-%{origin}%{?1} = %{epoch}:%{version}-%{release} Provides: jre-%{origin}%{?1} = %{epoch}:%{version}-%{release} -Provides: java%{?1} = %{epoch}:%{version}-%{release} -Provides: jre%{?1} = %{epoch}:%{version}-%{release} +Provides: java%{?1} = %{epoch}:%{javaver} +Provides: jre%{?1} = %{epoch}:%{javaver} %endif } @@ -1190,8 +1185,8 @@ Provides: java-%{javaver}-headless%{?1} = %{epoch}:%{version}-%{release} %if %is_system_jdk Provides: java-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release} Provides: jre-%{origin}-headless%{?1} = %{epoch}:%{version}-%{release} -Provides: jre-headless%{?1} = %{epoch}:%{version}-%{release} -Provides: java-headless%{?1} = %{epoch}:%{version}-%{release} +Provides: jre-headless%{?1} = %{epoch}:%{javaver} +Provides: java-headless%{?1} = %{epoch}:%{javaver} %endif # https://bugzilla.redhat.com/show_bug.cgi?id=1312019 @@ -1201,7 +1196,7 @@ Provides: /usr/bin/jjs %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} @@ -1220,8 +1215,8 @@ Provides: java-%{javaver}-%{origin}-devel%{?1} = %{epoch}:%{version}-%{release} %if %is_system_jdk Provides: java-devel-%{origin}%{?1} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{origin}%{?1} = %{epoch}:%{version}-%{release} -Provides: java-devel%{?1} = %{epoch}:%{version}-%{release} -Provides: java-sdk%{?1} = %{epoch}:%{version}-%{release} +Provides: java-devel%{?1} = %{epoch}:%{javaver} +Provides: java-sdk%{?1} = %{epoch}:%{javaver} %endif } @@ -1279,9 +1274,9 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas # Prevent brp-java-repack-jars from being run %global __jar_repack 0 -Name: java-%{javaver}-%{origin} +Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{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 @@ -1294,9 +1289,9 @@ 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} %{majorver} Runtime Environment -Group: Development/Languages +Group: Development/Languages # HotSpot code is licensed under GPLv2 # JDK library code is licensed under GPLv2 with the Classpath exception @@ -1308,8 +1303,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 -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 +URL: http://openjdk.java.net/ # Shenandoah HotSpot # aarch64-port/jdk8u-shenandoah contains an integration forest of @@ -1382,9 +1377,9 @@ Source20: java-1.%{majorver}.0-openjdk-portable.specfile # Accessibility patches # 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 # Restrict access to java-atk-wrapper classes -Patch3: rh1648644-java_access_bridge_privileged_security.patch +Patch3: rh1648644-java_access_bridge_privileged_security.patch # Turn on AssumeMP by default on RHEL systems Patch534: rh1648246-always_instruct_vm_to_assume_multiple_processors_are_available.patch # RH1648249: Add PKCS11 provider to java.security @@ -1484,8 +1479,6 @@ Patch203: jdk8042159-allow_using_system_installed_lcms2-root.patch Patch204: jdk8042159-allow_using_system_installed_lcms2-jdk.patch # JDK-8257794: Zero: assert(istate->_stack_limit == istate->_thread->last_Java_sp() + 1) failed: wrong on Linux/x86_32 Patch581: jdk8257794-remove_broken_assert.patch -# 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 ############################################# # @@ -1613,7 +1606,7 @@ The %{origin_nice} %{majorver} runtime environment. %if %{include_debug_build} %package slowdebug Summary: %{origin_nice} %{majorver} Runtime Environment %{debug_on} -Group: Development/Languages +Group: Development/Languages %{java_rpo -- %{debug_suffix_unquoted}} %description slowdebug @@ -1624,7 +1617,7 @@ The %{origin_nice} %{majorver} runtime environment. %if %{include_fastdebug_build} %package fastdebug Summary: %{origin_nice} %{majorver} Runtime Environment %{fastdebug_on} -Group: Development/Languages +Group: Development/Languages %{java_rpo -- %{fastdebug_suffix_unquoted}} %description fastdebug @@ -1635,7 +1628,7 @@ The %{origin_nice} %{majorver} runtime environment. %if %{include_normal_build} %package headless Summary: %{origin_nice} %{majorver} Headless Runtime Environment -Group: Development/Languages +Group: Development/Languages %{java_headless_rpo %{nil}} @@ -1646,7 +1639,7 @@ The %{origin_nice} %{majorver} runtime environment without audio and video suppo %if %{include_debug_build} %package headless-slowdebug Summary: %{origin_nice} %{majorver} Runtime Environment %{debug_on} -Group: Development/Languages +Group: Development/Languages %{java_headless_rpo -- %{debug_suffix_unquoted}} @@ -1658,7 +1651,7 @@ The %{origin_nice} %{majorver} runtime environment without audio and video suppo %if %{include_fastdebug_build} %package headless-fastdebug Summary: %{origin_nice} %{majorver} Runtime Environment %{fastdebug_on} -Group: Development/Languages +Group: Development/Languages %{java_headless_rpo -- %{fastdebug_suffix_unquoted}} @@ -1670,7 +1663,7 @@ The %{origin_nice} %{majorver} runtime environment without audio and video suppo %if %{include_normal_build} %package devel Summary: %{origin_nice} %{majorver} Development Environment -Group: Development/Tools +Group: Development/Tools %{java_devel_rpo %{nil}} @@ -1681,7 +1674,7 @@ The %{origin_nice} %{majorver} development tools. %if %{include_debug_build} %package devel-slowdebug Summary: %{origin_nice} %{majorver} Development Environment %{debug_on} -Group: Development/Tools +Group: Development/Tools %{java_devel_rpo -- %{debug_suffix_unquoted}} @@ -1693,7 +1686,7 @@ The %{origin_nice} %{majorver} development tools. %if %{include_fastdebug_build} %package devel-fastdebug Summary: %{origin_nice} %{majorver} Development Environment %{fastdebug_on} -Group: Development/Tools +Group: Development/Tools %{java_devel_rpo -- %{fastdebug_suffix_unquoted}} @@ -1705,7 +1698,7 @@ The %{origin_nice} %{majorver} development tools. %if %{include_normal_build} %package demo Summary: %{origin_nice} %{majorver} Demos -Group: Development/Languages +Group: Development/Languages %{java_demo_rpo %{nil}} @@ -1716,7 +1709,7 @@ The %{origin_nice} %{majorver} demos. %if %{include_debug_build} %package demo-slowdebug Summary: %{origin_nice} %{majorver} Demos %{debug_on} -Group: Development/Languages +Group: Development/Languages %{java_demo_rpo -- %{debug_suffix_unquoted}} @@ -1728,7 +1721,7 @@ The %{origin_nice} %{majorver} demos. %if %{include_fastdebug_build} %package demo-fastdebug Summary: %{origin_nice} %{majorver} Demos %{fastdebug_on} -Group: Development/Languages +Group: Development/Languages %{java_demo_rpo -- %{fastdebug_suffix_unquoted}} @@ -1740,7 +1733,7 @@ The %{origin_nice} %{majorver} demos. %if %{include_normal_build} %package src Summary: %{origin_nice} %{majorver} Source Bundle -Group: Development/Languages +Group: Development/Languages %{java_src_rpo %{nil}} @@ -1752,7 +1745,7 @@ class library source code for use by IDE indexers and debuggers. %if %{include_debug_build} %package src-slowdebug Summary: %{origin_nice} %{majorver} Source Bundle %{for_debug} -Group: Development/Languages +Group: Development/Languages %{java_src_rpo -- %{debug_suffix_unquoted}} @@ -1764,7 +1757,7 @@ The %{compatiblename}-src-slowdebug sub-package contains the complete %{origin_n %if %{include_fastdebug_build} %package src-fastdebug Summary: %{origin_nice} %{majorver} Source Bundle %{for_fastdebug} -Group: Development/Languages +Group: Development/Languages %{java_src_rpo -- %{fastdebug_suffix_unquoted}} @@ -1776,7 +1769,7 @@ The %{compatiblename}-src-fastdebug sub-package contains the complete %{origin_n %if %{include_normal_build} %package javadoc Summary: %{origin_nice} %{majorver} API documentation -Group: Documentation +Group: Documentation Requires: javapackages-filesystem Obsoletes: javadoc-slowdebug < 1:1.8.0.212.b04-4 BuildArch: noarch @@ -1789,7 +1782,7 @@ The %{origin_nice} %{majorver} API documentation. %package javadoc-zip Summary: %{origin_nice} %{majorver} API documentation compressed in a single archive -Group: Documentation +Group: Documentation Requires: javapackages-filesystem Obsoletes: javadoc-zip-slowdebug < 1:1.8.0.212.b04-4 BuildArch: noarch @@ -1885,10 +1878,8 @@ ln -s %{top_level_dir_name} openjdk # # the configure macro will do this too, but it also passes a few flags not # supported by openjdk configure script -%ifnarch loongarch64 cp %{SOURCE100} %{top_level_dir_name}/common/autoconf/build-aux/ cp %{SOURCE101} %{top_level_dir_name}/common/autoconf/build-aux/ -%endif # OpenJDK patches @@ -1905,7 +1896,6 @@ sh %{SOURCE12} %patch204 %endif -%ifnarch loongarch64 %patch1 %patch3 %patch5 @@ -1929,7 +1919,6 @@ sh %{SOURCE12} %patch574 %patch112 %patch581 -%endif pushd %{top_level_dir_name} # Add crypto policy and FIPS support @@ -1938,8 +1927,6 @@ pushd %{top_level_dir_name} %patch1000 -p1 # system cacerts support %patch539 -p1 -# JDK-8312489 backport, proposed for 8u402: https://github.com/openjdk/jdk8u-dev/pull/381 -%patch2000 -p1 popd # RPM-only fixes @@ -2645,11 +2632,20 @@ cjc.mainProgram(args) %endif %changelog -* Fri Nov 03 2023 Leslie Zhai - 1:1.8.0.392.b08-4.0.2 -- Init LoongArch64 +* Wed Jan 17 2024 Release Engineering - 1.8.0.402.b06-2 +- Build for Rocky Linux %{rocky} using our own portable -* Fri Nov 03 2023 Hong Wei Qin - 1:1.8.0.392.b08-4.0.2 -- Update portable pkg dist +* Thu Jan 11 2024 Andrew Hughes - 1:1.8.0.402.b06-0.2.ea +- Update to shenandoah-jdk8u402-b06 (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-21477 +- Resolves: RHEL-20975 + +* Sat Dec 16 2023 Andrew Hughes - 1:1.8.0.392.b08-5 +- Restore %%{epoch}:%%{javaver} versioning to jre, java, jre-headless, java-headless, java-devel & java-sdk +- Resolves: RHEL-19636 * Mon Oct 16 2023 Andrew Hughes - 1:1.8.0.392.b08-4 - Revert jcmd move as jcmd will not operate without tools.jar diff --git a/jdk8312489-max_sig_default_increase.patch b/jdk8312489-max_sig_default_increase.patch deleted file mode 100644 index adf9e09..0000000 --- a/jdk8312489-max_sig_default_increase.patch +++ /dev/null @@ -1,48 +0,0 @@ -commit c38a36f124a7eb28920cc367cb01b67d973a55c0 -Author: Andrew John Hughes -Date: Wed Oct 11 01:42:03 2023 +0100 - - Backport e47a84f23dd2608c6f5748093eefe301fb5bf750 - -diff --git a/jdk/src/share/classes/java/util/jar/JarFile.java b/jdk/src/share/classes/java/util/jar/JarFile.java -index a26dcc4a1c7..ac2e1c9d6a8 100644 ---- a/jdk/src/share/classes/java/util/jar/JarFile.java -+++ b/jdk/src/share/classes/java/util/jar/JarFile.java -@@ -436,7 +436,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; - byte[] b = IOUtils.readAllBytes(is); -diff --git a/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java b/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java -index c335e964f63..afdfa406b92 100644 ---- a/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java -+++ b/jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java -@@ -855,16 +855,16 @@ public class SignatureFileVerifier { - * the maximum allowed number of bytes for the signature-related files - * in a JAR file. - */ -- Integer tmp = AccessController.doPrivileged(new GetIntegerAction( -- "jdk.jar.maxSignatureFileSize", 8000000)); -+ int tmp = AccessController.doPrivileged(new GetIntegerAction( -+ "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 0bd15d4d1a81ffe218e21f89a286043a6d8f65e2 Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Sat, 1 Jul 2023 20:10:54 +0800 Subject: [PATCH 2/3] Update dist for portable pkg Signed-off-by: Jacob Wang --- java-1.8.0-openjdk.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index ff5cdd9..ed21700 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-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-1.8.0-openjdk-portable.specfile, install # it and then adjust portablerelease and portablesuffix @@ -345,8 +346,8 @@ %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) %global rpmrelease 2 # Settings used by the portable build -%global portablerelease 1 -%global portablesuffix el%{rhel} +%global portablerelease 1%{anolis_release} +%global portablesuffix an8 %global portablebuilddir /builddir/build/BUILD # Define milestone (EA for pre-releases, GA ("fcs") for releases) @@ -1276,7 +1277,7 @@ Provides: java-%{javaver}-%{origin}-accessibility = %{epoch}:%{version}-%{releas Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{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 @@ -2632,6 +2633,9 @@ cjc.mainProgram(args) %endif %changelog +* Thu Feb 22 2024 Hong Wei Qin - 1:1.8.0.402.b06-2.0.1 +- Update portable pkg dist + * Wed Jan 17 2024 Release Engineering - 1.8.0.402.b06-2 - Build for Rocky Linux %{rocky} using our own portable -- Gitee From a705b58e942b801e20c78c46e3cb45eea74e672b Mon Sep 17 00:00:00 2001 From: zhaixiang Date: Thu, 22 Feb 2024 16:33:21 +0800 Subject: [PATCH 3/3] Add loongarch64 base support --- java-1.8.0-openjdk.spec | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index ed21700..1a45455 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -109,11 +109,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} +%global debug_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64} 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 %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 +%global jit_arches %{aarch64} %{ix86} %{power64} sparcv9 sparc64 x86_64 loongarch64 # Set of architectures which use the Zero assembler port (!jit_arches) %global zero_arches %{arm} ppc s390 s390x # Set of architectures which run a full bootstrap cycle @@ -121,11 +121,11 @@ # Set of architectures which support SystemTap tapsets %global systemtap_arches %{jit_arches} # Set of architectures which support the serviceability agent -%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} +%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} loongarch64 # Set of architectures which support class data sharing # See https://bugzilla.redhat.com/show_bug.cgi?id=513605 # MetaspaceShared::generate_vtable_methods is not implemented for the PPC JIT -%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} +%global share_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} loongarch64 # Set of architectures which support Java Flight Recorder (JFR) %global jfr_arches %{jit_arches} # Set of architectures for which alt-java has SSB mitigation @@ -133,7 +133,7 @@ # Set of architectures where we verify backtraces with gdb %global gdb_arches %{jit_arches} %{zero_arches} # Set of architectures for which we have a portable build -%global portable_build_arches %{aarch64} %{ix86} %{power64} s390x x86_64 +%global portable_build_arches %{aarch64} %{ix86} %{power64} s390x x86_64 loongarch64 # By default, we build a debug build during main build on JIT architectures %if %{with slowdebug} @@ -270,6 +270,10 @@ %global archinstall aarch64 %global stapinstall arm64 %endif +%ifarch loongarch64 +%global archinstall loongarch64 +%global stapinstall loongarch64 +%endif # 32 bit sparc, optimized for v9 %ifarch sparcv9 %global archinstall sparc @@ -1879,8 +1883,10 @@ ln -s %{top_level_dir_name} openjdk # # the configure macro will do this too, but it also passes a few flags not # supported by openjdk configure script +%ifnarch loongarch64 cp %{SOURCE100} %{top_level_dir_name}/common/autoconf/build-aux/ cp %{SOURCE101} %{top_level_dir_name}/common/autoconf/build-aux/ +%endif # OpenJDK patches @@ -1897,6 +1903,7 @@ sh %{SOURCE12} %patch204 %endif +%ifnarch loongarch64 %patch1 %patch3 %patch5 @@ -1920,6 +1927,7 @@ sh %{SOURCE12} %patch574 %patch112 %patch581 +%endif pushd %{top_level_dir_name} # Add crypto policy and FIPS support @@ -2635,6 +2643,7 @@ cjc.mainProgram(args) %changelog * Thu Feb 22 2024 Hong Wei Qin - 1:1.8.0.402.b06-2.0.1 - Update portable pkg dist +- Add loongarch64 base support (zhaixiang@loongson.cn) * Wed Jan 17 2024 Release Engineering - 1.8.0.402.b06-2 - Build for Rocky Linux %{rocky} using our own portable -- Gitee