jdk-21 Oct CPU installers (#757)

* jdk-21 Oct PSU installers Signed-off-by: Sophia Guo <[email protected]> * Check jdk21 instead of 20 Signed-off-by: Sophia Guo <[email protected]> * Update apline pkgname Signed-off-by: Sophia Guo <[email protected]> --------- Signed-off-by: Sophia Guo <[email protected]>
adoptium · Oct 26, 2023 · b7844e2 · b7844e2
1 parent 6f1cc00
commit b7844e2
Show file tree

Hide file tree

Showing 14 changed files with 110 additions and 43 deletions.
diff --git a/linux/jdk/alpine/src/main/packaging/temurin/21/APKBUILD b/linux/jdk/alpine/src/main/packaging/temurin/21/APKBUILD
@@ -1,11 +1,9 @@
 # Maintainer: Eclipse Adoptium Package Maintainers <[email protected]>
 pkgname=temurin-21
-pkgver=21.0.0_p35
+pkgver=21.0.1_p12
 # replace _p1 with _1
-# _pkgver=${pkgver/_p/_}
-_pkgver=21_35 # remove this line and uncomment the above line when the next version is released
-# _pkgverplus=${pkgver/_p/+}
-_pkgverplus=21+35 # remove this line and uncomment the above line when the next version is released
+_pkgver=${pkgver/_p/_}
+_pkgverplus=${pkgver/_p/+}
 _pkgvername=${_pkgverplus/+/%2B}
 pkgrel=0
 pkgdesc="Eclipse Temurin 21"
@@ -99,10 +97,10 @@ _jdk() {
 
 case "$CARCH" in
 	x86_64)
-		_arch_sum="4fd74f93f0b1a94d8471e0ed801fe9d938f7471f6efe8791880c85e7716c943f"
+		_arch_sum="422f23f5109056cacb9227247bebf8532e2dc3c9d505e71637ba610569d6b3ff"
 		;;
 	aarch64)
-		_arch_sum="3f8e5b0447d2dd711f12edda611ed1cf9aab4ca53c8fe32fca8fb1e6fee41c12"
+		_arch_sum="77006c0a753808c2a6662007906eb6eb230f2fb6eb9d201a39cc46113e68f82c"
 		;;
 esac
 

diff --git a/linux/jdk/debian/src/main/packaging/temurin/21/debian/changelog b/linux/jdk/debian/src/main/packaging/temurin/21/debian/changelog
@@ -1,3 +1,9 @@
+temurin-21-jdk (21.0.1.0.0+12) STABLE; urgency=medium
+
+  * Eclipse Temurin 21.0.1.0.0+12 release.
+
+ -- Eclipse Adoptium Package Maintainers <[email protected]>  Tue, 24 Oct 2023 11:59:00 +0000
+
 temurin-21-jdk (21.0.0.0.0+35) STABLE; urgency=medium
 
   * Eclipse Temurin 21.0.0.0.0+35 release.

diff --git a/linux/jdk/debian/src/main/packaging/temurin/21/debian/rules b/linux/jdk/debian/src/main/packaging/temurin/21/debian/rules
@@ -3,10 +3,12 @@
 pkg_name = temurin-21-jdk
 priority = 2111
 jvm_tools = jar jarsigner java javac javadoc javap jcmd jconsole jdb jdeprscan jdeps jfr jhsdb jimage jinfo jlink jmap jmod jpackage jps jrunscript jshell jstack jstat jstatd jwebserver keytool rmiregistry serialver jexec jspawnhelper
-amd64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21%2B35/OpenJDK21U-jdk_x64_linux_hotspot_21_35.tar.gz
-amd64_checksum = 82f64c53acaa045370d6762ebd7441b74e6fda14b464d54d1ff8ca941ec069e6
-arm64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21%2B35/OpenJDK21U-jdk_aarch64_linux_hotspot_21_35.tar.gz
-arm64_checksum = 33e440c237438aa2e3866d84ead8d4e00dc0992d98d9fd0ee2fe48192f2dbc4b
+amd64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_x64_linux_hotspot_21.0.1_12.tar.gz
+amd64_checksum = 1a6fa8abda4c5caed915cfbeeb176e7fbd12eb6b222f26e290ee45808b529aa1
+arm64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.1_12.tar.gz
+arm64_checksum = e184dc29a6712c1f78754ab36fb48866583665fa345324f1a79e569c064f95e9
+ppc64el_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.1_12.tar.gz
+ppc64el_checksum = 9574828ef3d735a25404ced82e09bf20e1614f7d6403956002de9cfbfcb8638f
 
 d = debian/$(pkg_name)
 jvm_home = usr/lib/jvm

diff --git a/linux/jdk/redhat/src/main/packaging/build.sh b/linux/jdk/redhat/src/main/packaging/build.sh
@@ -31,8 +31,8 @@ echo "DEBUG: building RH arch ${buildArch} with jdk version ${buildVersion}"
 # Build specified target or build all
 if [ "${buildArch}" != "all" ]; then
 	targets=${buildArch}
-elif [ "${buildVersion}" = "20" ]; then
-        targets="x86_64 aarch64 armv7hl"
+elif [ "${buildVersion}" = "21" ]; then
+        targets="x86_64 ppc64le aarch64"
 else
 	targets="x86_64 ppc64le aarch64 armv7hl s390x"
 fi

diff --git a/linux/jdk/redhat/src/main/packaging/temurin/21/temurin-21-jdk.spec b/linux/jdk/redhat/src/main/packaging/temurin/21/temurin-21-jdk.spec
@@ -1,10 +1,10 @@
-%global upstream_version 21+35
+%global upstream_version 21.0.1+12
 # Only [A-Za-z0-9.] allowed in version:
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version
 # also not very intuitive:
 #  $ rpmdev-vercmp 21.0.0.0.0___21.0.0.0.0+1
 #  21.0.0.0.0___1 == 21.0.0.0.0+35
-%global spec_version 21.0.0.0.0.35
+%global spec_version 21.0.1.0.0.12
 %global spec_release 1
 %global priority 1161
 
@@ -19,12 +19,21 @@
 
 %ifarch x86_64
 %global vers_arch x64
+%global vers_arch2 ppc64le
 %global vers_arch3 aarch64
 %global src_num 0
 %global sha_src_num 1
 %endif
+%ifarch ppc64le
+%global vers_arch x64
+%global vers_arch2 ppc64le
+%global vers_arch3 aarch64
+%global src_num 2
+%global sha_src_num 3
+%endif
 %ifarch aarch64
 %global vers_arch x64
+%global vers_arch2 ppc64le
 %global vers_arch3 aarch64
 %global src_num 4
 %global sha_src_num 5
@@ -49,7 +58,7 @@ Packager:    Eclipse Adoptium Package Maintainers <[email protected]>
 AutoReqProv: no
 Prefix: /usr/lib/jvm/%{name}
 
-ExclusiveArch: x86_64 aarch64
+ExclusiveArch: x86_64 ppc64le aarch64
 
 BuildRequires:  tar
 BuildRequires:  wget
@@ -90,6 +99,9 @@ Provides: java-sdk-%{java_provides}
 # First architecture (x86_64)
 Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
 Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
+# Second architecture (ppc64le)
+Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
+Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
 # Third architecture (aarch64)
 Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
 Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
@@ -214,5 +226,7 @@ fi
 /usr/lib/tmpfiles.d/%{name}.conf
 
 %changelog
+* Tue Oct 24 2023 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.1.0.0.12-1
+- Eclipse Temurin 21.0.1+12 release.
 * Wed Sep 20 2023 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.0.0.0.35-1
 - Eclipse Temurin 21.0.0+35 release 1.
diff --git a/linux/jdk/suse/src/main/packaging/build.sh b/linux/jdk/suse/src/main/packaging/build.sh
@@ -8,8 +8,8 @@ echo "DEBUG: building Suse arch ${buildArch} with version ${buildVersion}"
 # Build specified target or build all
 if [ "${buildArch}" != "all" ]; then
 	targets=${buildArch}
-elif [ "${buildVersion}" = "20" ]; then
-        targets="x86_64 aarch64 armv7hl"
+elif [ "${buildVersion}" = "21" ]; then
+        targets="x86_64 aarch64 ppc64le"
 else
 	targets="x86_64 ppc64le aarch64 armv7hl s390x"
 fi

diff --git a/linux/jdk/suse/src/main/packaging/temurin/21/temurin-21-jdk.spec b/linux/jdk/suse/src/main/packaging/temurin/21/temurin-21-jdk.spec
@@ -1,10 +1,10 @@
-%global upstream_version 21+35
+%global upstream_version 21.0.1+12
 # Only [A-Za-z0-9.] allowed in version:
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version
 # also not very intuitive:
 #  $ rpmdev-vercmp 21.0.0.0.0___21.0.0.0.0+1
 #  21.0.0.0.0___1 == 21.0.0.0.0+35
-%global spec_version 21.0.0.0.0.35
+%global spec_version 21.0.1.0.0.12
 %global spec_release 1
 %global priority 1161
 
@@ -18,12 +18,21 @@
 
 %ifarch x86_64
 %global vers_arch x64
+%global vers_arch2 ppc64le
 %global vers_arch3 aarch64
 %global src_num 0
 %global sha_src_num 1
 %endif
+%ifarch ppc64le
+%global vers_arch x64
+%global vers_arch2 ppc64le
+%global vers_arch3 aarch64
+%global src_num 2
+%global sha_src_num 3
+%endif
 %ifarch aarch64
 %global vers_arch x64
+%global vers_arch2 ppc64le
 %global vers_arch3 aarch64
 %global src_num 4
 %global sha_src_num 5
@@ -48,7 +57,7 @@ Packager:    Eclipse Adoptium Package Maintainers <[email protected]>
 AutoReqProv: no
 Prefix: %{_libdir}/jvm/%{name}
 
-ExclusiveArch: x86_64 aarch64
+ExclusiveArch: x86_64 ppc64le aarch64
 
 BuildRequires:  tar
 BuildRequires:  wget
@@ -89,6 +98,9 @@ Provides: java-sdk-%{java_provides}
 # First architecture (x86_64)
 Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
 Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
+# Second architecture (ppc64le)
+Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
+Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
 # Third architecture (aarch64)
 Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
 Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
@@ -203,5 +215,7 @@ fi
 %{prefix}
 
 %changelog
+* Tue Oct 24 2023 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.1.0.0.12-1
+- Eclipse Temurin 21.0.1+12 release.
 * Wed Sep 20 2023 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.0.0.0.35-1
 - Eclipse Temurin 21.0.0+35 release 0.
diff --git a/linux/jre/alpine/src/main/packaging/temurin/21/APKBUILD b/linux/jre/alpine/src/main/packaging/temurin/21/APKBUILD
@@ -1,11 +1,9 @@
 # Maintainer: Eclipse Adoptium Package Maintainers <[email protected]>
 pkgname=temurin-21
-pkgver=21.0.0_p35
+pkgver=21.0.1_p12
 # replace _p1 with _1
-# _pkgver=${pkgver/_p/_}
-_pkgver=21_35 # remove this line and uncomment the above line when the next version is released
-# _pkgverplus=${pkgver/_p/+}
-_pkgverplus=21+35 # remove this line and uncomment the above line when the next version is released
+_pkgver=${pkgver/_p/_}
+_pkgverplus=${pkgver/_p/+}
 _pkgvername=${_pkgverplus/+/%2B}
 pkgrel=0
 pkgdesc="Eclipse Temurin 21"
@@ -73,10 +71,10 @@ _jre() {
 
 case "$CARCH" in
 	x86_64)
-		_arch_sum="9e7aa5ca9d8819e8fb3ae9f3c146905bee81808b70b875de0984ec55b1bd8559"
+		_arch_sum="a8fcc43927664ba191c9a77d1013f1f32fec1acc22fe6f0c29d687221f2cc95d"
 		;;
 	aarch64)
-		_arch_sum="ff4102e2aa0b35f337d579f0d19aff1aa4a10bee9ab0951137affdb50dd8f3e2"
+		_arch_sum="2898ea1ddf6f70f09b09cf99d928f6d4c862f78f81104f5dce3e44a832b8444a"
 		;;
 esac
 

diff --git a/linux/jre/debian/src/main/packaging/temurin/21/debian/changelog b/linux/jre/debian/src/main/packaging/temurin/21/debian/changelog
@@ -1,3 +1,9 @@
+temurin-21-jre (21.0.1.0.0+12) STABLE; urgency=medium
+
+  * Eclipse Temurin 21.0.1.0.0+12 release.
+
+ -- Eclipse Adoptium Package Maintainers <[email protected]>  Tue, 24 Oct 2023 11:59:00 +0000
+
 temurin-21-jre (21.0.0.0.0+35) STABLE; urgency=medium
 
   * Eclipse Temurin 21.0.0.0.0+35 release.

diff --git a/linux/jre/debian/src/main/packaging/temurin/21/debian/rules b/linux/jre/debian/src/main/packaging/temurin/21/debian/rules
@@ -3,10 +3,12 @@
 pkg_name = temurin-21-jre
 priority = 2112
 jvm_tools = java jfr jrunscript jwebserver keytool rmiregistry
-amd64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21%2B35/OpenJDK21U-jre_x64_linux_hotspot_21_35.tar.gz
-amd64_checksum = 080a53a3f75b94450779199f09c8d91b53637d315f128c58a4f160fb6272502d
-arm64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21%2B35/OpenJDK21U-jre_aarch64_linux_hotspot_21_35.tar.gz
-arm64_checksum = 5a36cde2956749aaad502e1df6729072e5483265fce142230516261da9a391db
+amd64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_x64_linux_hotspot_21.0.1_12.tar.gz
+amd64_checksum = 277f4084bee875f127a978253cfbaad09c08df597feaf5ccc82d2206962279a3
+arm64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.1_12.tar.gz
+arm64_checksum = 4582c4cc0c6d498ba7a23fdb0a5179c9d9c0d7a26f2ee8610468d5c2954fcf2f
+ppc64el_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.1%2B12/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.1_12.tar.gz
+ppc64el_checksum = 05cc9b7bfbe246c27d307783b3d5095797be747184b168018ae3f7cc55608db2
 
 d = debian/$(pkg_name)
 jvm_home = usr/lib/jvm

diff --git a/linux/jre/redhat/src/main/packaging/build.sh b/linux/jre/redhat/src/main/packaging/build.sh
@@ -31,8 +31,8 @@ echo "DEBUG: building RH arch ${buildArch} with jre version ${buildVersion}"
 # Build specified target or build all
 if [ "${buildArch}" != "all" ]; then
 	targets=${buildArch}
-elif [ "${buildVersion}" = "20" ]; then
-        targets="x86_64 aarch64 armv7hl"
+elif [ "${buildVersion}" = "21" ]; then
+        targets="x86_64 ppc64le aarch64"
 else
 	targets="x86_64 ppc64le aarch64 armv7hl s390x"
 fi

diff --git a/linux/jre/redhat/src/main/packaging/temurin/21/temurin-21-jre.spec b/linux/jre/redhat/src/main/packaging/temurin/21/temurin-21-jre.spec
@@ -1,10 +1,10 @@
-%global upstream_version 21+35
+%global upstream_version 21.0.1+12
 # Only [A-Za-z0-9.] allowed in version:
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_upstream_uses_invalid_characters_in_the_version
 # also not very intuitive:
 #  $ rpmdev-vercmp 21.0.0.0.0___21.0.0.0.0+1
 #  20.0.0.0.0___1 == 21.0.0.0.0+35
-%global spec_version 21.0.0.0.0.35
+%global spec_version 21.0.1.0.0.12
 %global spec_release 1
 %global priority 2100
 
@@ -18,12 +18,21 @@
 
 %ifarch x86_64
 %global vers_arch x64
+%global vers_arch2 ppc64le
 %global vers_arch3 aarch64
 %global src_num 0
 %global sha_src_num 1
 %endif
+%ifarch ppc64le
+%global vers_arch x64
+%global vers_arch2 ppc64le
+%global vers_arch3 aarch64
+%global src_num 2
+%global sha_src_num 3
+%endif
 %ifarch aarch64
 %global vers_arch x64
+%global vers_arch2 ppc64le
 %global vers_arch3 aarch64
 %global src_num 4
 %global sha_src_num 5
@@ -48,7 +57,7 @@ Packager:    Eclipse Adoptium Package Maintainers <[email protected]>
 AutoReqProv: no
 Prefix: /usr/lib/jvm/%{name}
 
-ExclusiveArch: x86_64 aarch64
+ExclusiveArch: x86_64 ppc64le aarch64
 
 BuildRequires:  tar
 BuildRequires:  wget
@@ -79,6 +88,9 @@ Provides: jre-%{java_provides}-headless
 # First architecture (x86_64)
 Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
 Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
+# Second architecture (ppc64le)
+Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
+Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
 # Third architecture (aarch64)
 Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
 Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
@@ -145,5 +157,7 @@ fi
 /usr/lib/tmpfiles.d/%{name}.conf
 
 %changelog
+* Tue Oct 24 2023 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.1.0.0.12-1
+- Eclipse Temurin 21.0.1+12 release.
 * Wed Sep 20 2023 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.0.0.0.35-1
 - Eclipse Temurin 21.0.0+35 release 0.
diff --git a/linux/jre/suse/src/main/packaging/build.sh b/linux/jre/suse/src/main/packaging/build.sh
@@ -8,8 +8,8 @@ echo "DEBUG: building Suse arch ${buildArch} with version ${buildVersion}"
 # Build specified target or build all (not s390x on jre8)
 if [ "${buildArch}" != "all" ]; then
 	targets=${buildArch}
-elif [ "${buildVersion}" = "20" ]; then
-        targets="x86_64 aarch64 armv7hl"
+elif [ "${buildVersion}" = "21" ]; then
+        targets="x86_64 ppc64le aarch64"
 else
 	targets="x86_64 ppc64le aarch64 armv7hl s390x"
 fi