开源软件构建与测试

_service:tar_scm:openjdk-latest.spec Changed

@@ -179,7 +179,7 @@
 %global top_level_dir_name   %{origin}
 %global minorver        0
 %global buildver        11
-%global rpmrelease      1
+%global rpmrelease      2
 # 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
 %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} )
@@ -898,7 +898,7 @@
 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: %{rpmrelease}.rolling
 
 # 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
@@ -934,8 +934,6 @@
 # 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
 Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
 
 # Desktop files. Adapted from IcedTea
@@ -1334,24 +1332,18 @@
 
 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
-    :
-elif  "$ARCH" = "loongarch64" ; then
-    :
-elif  "$ARCH" = "ppc64le" ; then
+BOOTSTRAP_BOOTJDKPATH=/usr/lib/jvm/java-$(expr %{buildjdkver} - 1)-openjdk
+if  -d "$BOOTJDKPATH" ; then
     :
+elif  -d "$BOOTSTRAP_BOOTJDKPATH" ; then
+    BOOTJDKPATH=$BOOTSTRAP_BOOTJDKPATH
 else
     echo " Failed to set BOOTJDKPATH "
     exit 18
 fi
 
 echo $BOOTJDKPATH
+echo $BOOTSTRAP_BOOTJDKPATH
 
 mkdir -p %{buildoutputdir -- $suffix}
 pushd %{buildoutputdir -- $suffix}
@@ -1802,6 +1794,9 @@
 
 
 %changelog
+* Sat Nov 23 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1:23.0.1.11-2.rolling
+- Adopt suitable buildjdkver to build by itself
+
 * Fri Nov 22 2024 Dingli Zhang <dingli@iscas.ac.cn> - 1:23.0.1.11-1
 - Modify bootjdk for riscv64
 - Backport JDK-8332854

_service Changed

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

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

Changes of Revision 19