diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..f087b429e2f81a9f37b28a8308e2210f84df6c9b --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.tar.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..c92252770dc3836c04e4d9d659f8691f0d8ee5a2 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/openjdk-latest \ No newline at end of file diff --git a/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.1_11.tar.gz b/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.1_11.tar.gz index 97497f21877a27197087695d2e198951f79c5d28..81a2a039cb650e9c56ab99d3b9438dda65c7796e 100644 Binary files a/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.1_11.tar.gz and b/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.1_11.tar.gz differ diff --git a/OpenJDK23U-jdk_riscv64_linux_hotspot_23.0.1_11.tar.gz b/OpenJDK23U-jdk_riscv64_linux_hotspot_23.0.1_11.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..49f34ac56cfc35723d6ce1fbda251637bdbb9633 --- /dev/null +++ b/OpenJDK23U-jdk_riscv64_linux_hotspot_23.0.1_11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80d7bab9f9614bdf934c6bc441031bd1fead3aea85f16770123bd8a6bcdc52b6 +size 210270830 diff --git a/OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz b/OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz index 18b1622cde2f556d6916c2fa9429ab40975542bc..8b66c54339f1f996541230e06688e90cec984d39 100644 Binary files a/OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz and b/OpenJDK23U-jdk_x64_linux_hotspot_23.0.1_11.tar.gz differ diff --git a/jdk-updates-jdk23u-jdk-23.0.1+11.tar.gz b/jdk-updates-jdk23u-jdk-23.0.1+11.tar.gz index 117daae75c872e112ff72ec503ddbc53dd39c4ba..5f4a14a31ed42bf5508774d3eed782772d1be7b3 100644 Binary files a/jdk-updates-jdk23u-jdk-23.0.1+11.tar.gz and b/jdk-updates-jdk23u-jdk-23.0.1+11.tar.gz differ diff --git a/openjdk-latest.spec b/openjdk-latest.spec index 40aa8559ce4042e951abf4167f89286456933bc5..e58a47a39ce4677e39da5d27639ed922f8285b1e 100644 --- a/openjdk-latest.spec +++ b/openjdk-latest.spec @@ -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 @@ Name: java-latest-%{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.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 @@ -936,6 +936,7 @@ URL: http://openjdk.java.net/ 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: OpenJDK23U-jdk_riscv64_linux_hotspot_23.0.1_11.tar.gz Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz # Desktop files. Adapted from IcedTea @@ -1341,7 +1342,8 @@ elif [ "$ARCH" = "aarch64" ]; then tar -xf %{SOURCE1} BOOTJDKPATH=$PWD/jdk-23.0.1+11 elif [ "$ARCH" = "riscv64" ]; then - : + tar -xf %{SOURCE3} + BOOTJDKPATH=$PWD/jdk-23.0.1+11 elif [ "$ARCH" = "loongarch64" ]; then : elif [ "$ARCH" = "ppc64le" ]; then @@ -1802,6 +1804,11 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Sat Nov 23 2024 Dingli Zhang - 1:23.0.1.11-2.rolling +- Add lfs config +- Add bootjdk for riscv64 +- Modify release and rpmrelease in spec + * Fri Nov 22 2024 Dingli Zhang - 1:23.0.1.11-1 - Modify bootjdk for riscv64 - Backport JDK-8332854