From 831bd200b99890399c3ece6d1341d73a076311d6 Mon Sep 17 00:00:00 2001 From: Benshuai5D Date: Mon, 21 Jul 2025 22:01:52 +0800 Subject: [PATCH] sync master to openEuler-25.09 --- Backport-JDK-8348554-Enhance-Linux-kernel-version-ch.patch | 6 +++--- openjdk-21.spec | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Backport-JDK-8348554-Enhance-Linux-kernel-version-ch.patch b/Backport-JDK-8348554-Enhance-Linux-kernel-version-ch.patch index 0e74d63..383b74c 100644 --- a/Backport-JDK-8348554-Enhance-Linux-kernel-version-ch.patch +++ b/Backport-JDK-8348554-Enhance-Linux-kernel-version-ch.patch @@ -56,13 +56,13 @@ index 7cb862d7c3e..22216a568bc 100644 FILE* fh; uint64_t userTicks, niceTicks, systemTicks, idleTicks; diff --git a/src/hotspot/os/linux/os_linux.hpp b/src/hotspot/os/linux/os_linux.hpp -index 029f2aa7a52..f2901480d29 100644 +index 49f2777d1..b8fde8265 100644 --- a/src/hotspot/os/linux/os_linux.hpp +++ b/src/hotspot/os/linux/os_linux.hpp -@@ -109,7 +109,13 @@ class os::Linux { - bool has_steal_ticks; +@@ -107,7 +107,13 @@ class os::Linux { }; + static int active_processor_count(); - static void kernel_version(long* major, long* minor); + static void kernel_version(long* major, long* minor, long* patch); + diff --git a/openjdk-21.spec b/openjdk-21.spec index 28cec8d..c2e74a4 100644 --- a/openjdk-21.spec +++ b/openjdk-21.spec @@ -905,7 +905,7 @@ Name: java-21-%{origin} Version: %{newjavaver}.%{buildver} # This package needs `.rolling` as part of Release so as to not conflict on install with # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as -Release: 1 +Release: 2 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages @@ -1918,6 +1918,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Mon Jul 21 2025 Dingli Zhang - 1:21.0.8.9-2 +- Fix build error for riscv64 + * Thu Jul 17 2025 Benshuai5D - 1:21.0.8.9-1 - huawei-remove-provides-in-kaeprovider-module-info.patch -- Gitee