update to jdk21.0.4+7

README.md

@@ -1,37 +0,0 @@
-# openjdk-21
-
-#### 介绍
-openEuler Community builds of OpenJDK 21
-
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 使用说明
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 参与贡献
-
-1.  Fork 本仓库
-2.  新建 Feat_xxx 分支
-3.  提交代码
-4.  新建 Pull Request
-
-
-#### 特技
-
-1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
-2.  Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
-3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
-4.  [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目
-5.  Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
-6.  Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

openjdk-21.spec

@@ -72,7 +72,7 @@
 %global is_system_jdk 0
 
 %global aarch64         aarch64 arm64 armv8
-%global jit_arches      x86_64 %{aarch64} loongarch64 riscv64
+%global jit_arches      x86_64 %{aarch64} loongarch64 riscv64 ppc64le
 %global aot_arches      x86_64 %{aarch64}
 
 # Set of architectures for which java has short vector math library (libsvml.so)
@@ -81,7 +81,7 @@
 # By default, we build a debug build during main build on JIT architectures
 %if %{with slowdebug}
 %ifarch %{jit_arches}
-%global include_debug_build 1
+%global include_debug_build 0
 %else
 %global include_debug_build 0
 %endif
@@ -158,7 +158,7 @@
 # Used via new version scheme. JDK 19 was
 # GA'ed in March 2022 => 22.3
 %global vendor_version_string BiSheng
-%global securityver 3
+%global securityver 4
 # 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
@@ -178,7 +178,7 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global minorver        0
-%global buildver        9
+%global buildver        7
 %global rpmrelease      1
 # 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
 %if %is_system_jdk
@@ -897,7 +897,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: 0
 
 # 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
@@ -1018,11 +1018,7 @@ BuildRequires: pkgconfig
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: zip
 BuildRequires: javapackages-filesystem
-%ifarch loongarch64
 BuildRequires: java-21-openjdk-devel
-%else
-BuildRequires: java-latest-openjdk-devel
-%endif
 # Zero-assembler build requirement
 %ifnarch %{jit_arches}
 BuildRequires: libffi-devel
@@ -1344,6 +1340,8 @@ elif [ "$ARCH" = "riscv64" ]; then
     :
 elif [ "$ARCH" = "loongarch64" ]; then
     :
+elif [ "$ARCH" = "ppc64le" ]; then
+    :
 else
     echo " Failed to set BOOTJDKPATH "
     exit 18
@@ -1667,9 +1665,10 @@ else
   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}"}
+args = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
-cjc.mainProgram(arg)
+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}}
@@ -1794,6 +1793,21 @@ cjc.mainProgram(arg)
 
 
 %changelog
+* Thu Jul 18 2024 Autistic_boyya <wangzhongyi7@huawei.com> -1:21.0.4.7-rolling
+- update to jdk21.0.4-ga
+
+* Tue Jul 16 2024 zhaosaisai <zhaosaisai@kylinos.cn> - 1:21.0.3.9-5
+- change to depend on the specific version
+
+* Tue Jul 16 2024 songliyang <songliyang@kylinos.cn> - 1:21.0.3.9-4
+- null the arg to solve openjdk-headless install error
+
+* Tue Jun 25 2024 peng.zou <peng.zou@shingroup.cn> - 1:21.0.3.9-3
+- init support of ppc64le
+
+* Thu Jun 20 2024 aoqi <aoqi@loongson.cn> - 1:21.0.3.9-2
+- update LoongArch64 port to jdk21.0.3
+
 * Thu Apr 25 2024 kuenking111 <wangkun49@huawei.com> - 1:21.0.3.9-1
 - add add-downgrade-the-glibc-symbol-of-fcntl.patch