开源软件构建与测试

Changes of Revision 9

_service:tar_scm:openjdk-latest.spec Changed

@@ -155,14 +155,14 @@
 # New Version-String scheme-style defines
 # If you bump majorver, you must bump also vendor_version_string
 %global majorver 23
-# Used via new version scheme. JDK 23 was
-# GA'ed in September 2024 => 24.9
+# Used via new version scheme. JDK 19 was
+# GA'ed in March 2022 => 22.3
 %global vendor_version_string BiSheng
 %global securityver 1
 # buildjdkver is usually same as %%{majorver},
 # but in time of bootstrap of next jdk, it is majorver-1,
 # and this it is better to change it here, on single place
-%global buildjdkver 22
+%global buildjdkver 23
 # We don't add any LTS designator for STS packages (Fedora and EPEL).
 # We need to explicitly exclude EPEL as it would have the %%{rhel} macro defined.
 %if 0%{?rhel} && !0%{?epel}
@@ -600,11 +600,11 @@
 # these are config templates, thus not config-noreplace
 %config  %{etcjavadir -- %{?1}}/conf/management/jmxremote.password.template
 %config  %{etcjavadir -- %{?1}}/conf/sdp/sdp.conf.template
+%config  %{etcjavadir -- %{?1}}/conf/jaxp-strict.properties.template
 %config(noreplace) %{etcjavadir -- %{?1}}/conf/management/management.properties
 %config(noreplace) %{etcjavadir -- %{?1}}/conf/net.properties
 %config(noreplace) %{etcjavadir -- %{?1}}/conf/sound.properties
 %config(noreplace) %{etcjavadir -- %{?1}}/conf/jaxp.properties
-%config(noreplace) %{etcjavadir -- %{?1}}/conf/jaxp-strict.properties.template
 %{_jvmdir}/%{sdkdir -- %{?1}}/conf
 %{_jvmdir}/%{sdkdir -- %{?1}}/lib/security
 %if %is_system_jdk
@@ -927,13 +927,16 @@
 # 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
+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-MD
 URL:      http://openjdk.java.net/
 
 
 # to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh
 # update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
 Source0: jdk-updates-jdk%{majorver}u-jdk-%{filever}+%{buildver}.tar.gz
+Source1: OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.1_11.tar.gz
+Source2: OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz
+Source3: https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.3_9.tar.gz
 Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
 
 # Desktop files. Adapted from IcedTea
@@ -1328,6 +1331,23 @@
 
 ARCH=$(uname -m)
 BOOTJDKPATH=/usr/lib/jvm/java-%{buildjdkver}-openjdk
+if  "$ARCH" = "x86_64" ; then
+    tar -xf %{SOURCE2}
+    BOOTJDKPATH=$PWD/jdk-23.0.1+11
+elif  "$ARCH" = "aarch64" ; then
+    tar -xf %{SOURCE1}
+    BOOTJDKPATH=$PWD/jdk-23.0.1+11
+elif  "$ARCH" = "riscv64" ; then
+    tar -xf %{SOURCE3}
+    BOOTJDKPATH=$PWD/jdk-21.0.3+9
+elif  "$ARCH" = "loongarch64" ; then
+    :
+elif  "$ARCH" = "ppc64le" ; then
+    :
+else
+    echo " Failed to set BOOTJDKPATH "
+    exit 18
+fi
 
 echo $BOOTJDKPATH
 
@@ -1428,7 +1448,7 @@
 # Check debug symbols are present and can identify code
 find "$JAVA_HOME" -iname '*.so' -print0 | while read -d $'\0' lib
 do
-  if  -f "$lib"  ; then
+  if  !-f "$lib"  ; then
     echo "Testing $lib for debug symbols"
     # All these tests rely on RPM failing the build if the exit code of any set
     # of piped commands is non-zero.
@@ -1652,9 +1672,10 @@
   end
 end
 -- run content of included file with fake args
+arg = nil; -- it is better to null the arg up, no meter if they exists or not, and use cjc as module in unified way, instead of relaying on "main" method during require "copy_jdk_configs.lua"
 cjc = require "copy_jdk_configs.lua"
-arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
-cjc.mainProgram(arg)
+args = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
+cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect this 'main', so it should run under all circumstances, except fatal error
 
 %post
 %{post_script %{nil}}
@@ -1779,10 +1800,9 @@
 
 
 %changelog
-* Mon Nov 11 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1:23.0.1.11-0.rolling
-- Update to jdk23.0.1+11
-- Remove redundant patches to fix ci check
-- Fix typo in changelog
+* Tue Nov 19 2024 neu-mobi <liuyulong35@huawei.com> - 1:23.0.1.11-0
+- update to jdk23.0.1+11
+- remove some redundant patches & fix changelog
 
 * Tue Aug 6 2024 kuenking111 <wangkun49@huawei.com> - 1:22.0.2.9-rolling
 - update to jdk22.0.2+9

_service:tar_scm:downgrade-the-glibc-symver-of-memcpy.patch Changed

@@ -5,40 +5,40 @@
 
 Signed-off-by: Sun Jianye <sunjianye@huawei.com>
 ---
- make/common/NativeCompilation.gmk                    |  9 +++++++++
+ make/common/native/Link.gmk                          |  9 +++++++++
  make/hotspot/lib/CompileJvm.gmk                      |  8 ++++++++
  src/hotspot/share/runtime/memcpy.cpp                 | 20 ++++++++++++++++++++
  .../linux/native/applauncher/LinuxPackage.c          |  3 +++
  4 files changed, 40 insertions(+)
  create mode 100644 src/hotspot/share/runtime/memcpy.cpp
 
-diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
+diff --git a/make/common/native/Link.gmk b/make/common/native/Link.gmk
 index 1e2b170..4f22e2d 100644
---- a/make/common/NativeCompilation.gmk
-+++ b/make/common/NativeCompilation.gmk
-@@ -1102,6 +1102,15 @@ define SetupNativeCompilationBody
-       endif
-     endif
- 
-+    # if ldflags contain --wrap=memcpy, add memcpy.o to OBJS
-+    ifneq ($$(findstring wrap=memcpy, $$($1_LDFLAGS)$$($1_EXTRA_LDFLAGS)),)
-+      ifeq ($$(findstring memcpy$(OBJ_SUFFIX), $$($1_ALL_OBJS)),)
-+        $$($1_BUILD_INFO):
-+	    $(ECHO) 'Adding $(SUPPORT_OUTPUTDIR)/memcpy/memcpy$(OBJ_SUFFIX) to $1_ALL_OBJS'
-+        $1_ALL_OBJS += $(SUPPORT_OUTPUTDIR)/memcpy/memcpy$(OBJ_SUFFIX)
-+      endif
+--- a/make/common/native/Link.gmk
++++ b/make/common/native/Link.gmk
+@@ -131,6 +131,15 @@ define SetupNativeCompilationBody
+     $1_CODESIGN_OPTS := -
+   endif
+
++  # if ldflags contain --wrap=memcpy, add memcpy.o to OBJS
++  ifneq ($$(findstring wrap=memcpy, $$($1_LDFLAGS)$$($1_EXTRA_LDFLAGS)),)
++    ifeq ($$(findstring memcpy$(OBJ_SUFFIX), $$($1_ALL_OBJS)),)
++      $$($1_BUILD_INFO):
++          $(ECHO) 'Adding $(SUPPORT_OUTPUTDIR)/memcpy/memcpy$(OBJ_SUFFIX) to $1_ALL_OBJS'
++      $1_ALL_OBJS += $(SUPPORT_OUTPUTDIR)/memcpy/memcpy$(OBJ_SUFFIX)
 +    endif
++  endif
 +
-     $1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) \
-         $$($1_LIBS) $$($1_EXTRA_LIBS) $$($1_MT) \
-         $$($1_CREATE_DEBUGINFO_CMDS) $$($1_MANIFEST_VERSION) \
+   $1_VARDEPS := $$($1_LD) $$($1_SYSROOT_LDFLAGS) $$($1_LDFLAGS) \
+       $$($1_EXTRA_LDFLAGS) $$($1_LIBS) $$($1_EXTRA_LIBS) \
+       $$($1_DEBUGINFO_FILES) $$($1_STRIPFLAGS)
 diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
 index 65edd04..d5b689e 100644
 --- a/make/hotspot/lib/CompileJvm.gmk
 +++ b/make/hotspot/lib/CompileJvm.gmk
-@@ -204,6 +204,14 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
-     STATIC_LIB_EXCLUDE_OBJS := $(LIBJVM_STATIC_EXCLUDE_OBJS), \
- ))
+@@ -254,6 +254,14 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBJVM, \
+   $(BUILD_LIBJVM_TARGET): $(WIN_EXPORT_FILE)
+ endif
  
 +MEMCPY_OBJECT_FILE := $(JVM_OUTPUTDIR)/objs/memcpy$(OBJ_SUFFIX)
 +

_service Changed

_service:tar_scm:OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.3_9.tar.gz Added

_service:tar_scm:OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.1_11.tar.gz Added

_service:tar_scm:OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz Added