Skip to content

Commit ae9d4b0

Browse files
steelhead31steelhead31
committed
July CPU Reintroduce s390x For JDK22
1 parent bd0b94f commit ae9d4b0

File tree

8 files changed

+74
-10
lines changed

8 files changed

+74
-10
lines changed

‎linux/jdk/debian/src/main/packaging/temurin/22/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Maintainer: Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org>
55
Build-Depends: debhelper (>= 11), lsb-release
66

77
Package: temurin-22-jdk
8-
Architecture: amd64 arm64 ppc64el riscv64
8+
Architecture: amd64 arm64 ppc64el s390x riscv64
99
Depends: adoptium-ca-certificates,
1010
java-common,
1111
libasound2,

‎linux/jdk/debian/src/main/packaging/temurin/22/debian/rules

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ arm64_tarball_url = https://github.com/adoptium/temurin22-binaries/releases/down
99
arm64_checksum = dac62747b5158c4bf4c4636432e3bdb9dea47f80f0c9d1d007f19bd5483b7d29
1010
ppc64el_tarball_url = https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_ppc64le_linux_hotspot_22.0.2_9.tar.gz
1111
ppc64el_checksum = 1d678752d58e33ff951e75736b8415d6d7ae136b2421ca02e993f2603e9b259b
12+
s390x_tarball_url = https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_s390x_linux_hotspot_22.0.2_9.tar.gz
13+
s390x_checksum = 46527cfc560552f05c0462520d69d438f144a3dc8206687952387c910cdd4c40
1214
riscv64_tarball_url = https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_riscv64_linux_hotspot_22.0.2_9.tar.gz
1315
riscv64_checksum = 830a0d006c2dae95c0855aa70e193dba637831b491ccd67333322dea31bcf389
1416

‎linux/jdk/redhat/src/main/packaging/temurin/22/temurin-22-jdk.spec

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
%global vers_arch x64
2121
%global vers_arch2 ppc64le
2222
%global vers_arch3 aarch64
23+
%global vers_arch4 s390x
2324
%global vers_arch5 riscv64
2425
%global src_num 0
2526
%global sha_src_num 1
@@ -28,6 +29,7 @@
2829
%global vers_arch x64
2930
%global vers_arch2 ppc64le
3031
%global vers_arch3 aarch64
32+
%global vers_arch4 s390x
3133
%global vers_arch5 riscv64
3234
%global src_num 2
3335
%global sha_src_num 3
@@ -36,14 +38,25 @@
3638
%global vers_arch x64
3739
%global vers_arch2 ppc64le
3840
%global vers_arch3 aarch64
41+
%global vers_arch4 s390x
3942
%global vers_arch5 riscv64
4043
%global src_num 4
4144
%global sha_src_num 5
4245
%endif
46+
%ifarch s390x
47+
%global vers_arch x64
48+
%global vers_arch2 ppc64le
49+
%global vers_arch3 aarch64
50+
%global vers_arch4 s390x
51+
%global vers_arch5 riscv64
52+
%global src_num 6
53+
%global sha_src_num 7
54+
%endif
4355
%ifarch riscv64
4456
%global vers_arch x64
4557
%global vers_arch2 ppc64le
4658
%global vers_arch3 aarch64
59+
%global vers_arch4 s390x
4760
%global vers_arch5 riscv64
4861
%global src_num 8
4962
%global sha_src_num 9
@@ -68,8 +81,7 @@ Packager: Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org>
6881
AutoReqProv: no
6982
Prefix: /usr/lib/jvm/%{name}
7083

71-
ExclusiveArch: x86_64 ppc64le aarch64 riscv64
72-
# ExclusiveArch: x86_64 ppc64le aarch64 s390x riscv64
84+
ExclusiveArch: x86_64 ppc64le aarch64 s390x riscv64
7385

7486
BuildRequires: tar
7587
BuildRequires: wget
@@ -116,6 +128,9 @@ Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_ar
116128
# Third architecture (aarch64)
117129
Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
118130
Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
131+
# Fourth architecture (s390x)
132+
Source6: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
133+
Source7: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
119134
# Fifth architecture (riscv64)
120135
Source8: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
121136
Source9: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt

‎linux/jdk/suse/src/main/packaging/temurin/22/temurin-22-jdk.spec

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
%global vers_arch x64
2121
%global vers_arch2 ppc64le
2222
%global vers_arch3 aarch64
23+
%global vers_arch4 s390x
2324
%global vers_arch5 riscv64
2425
%global src_num 0
2526
%global sha_src_num 1
@@ -28,6 +29,7 @@
2829
%global vers_arch x64
2930
%global vers_arch2 ppc64le
3031
%global vers_arch3 aarch64
32+
%global vers_arch4 s390x
3133
%global vers_arch5 riscv64
3234
%global src_num 2
3335
%global sha_src_num 3
@@ -36,14 +38,25 @@
3638
%global vers_arch x64
3739
%global vers_arch2 ppc64le
3840
%global vers_arch3 aarch64
41+
%global vers_arch4 s390x
3942
%global vers_arch5 riscv64
4043
%global src_num 4
4144
%global sha_src_num 5
4245
%endif
46+
%ifarch s390x
47+
%global vers_arch x64
48+
%global vers_arch2 ppc64le
49+
%global vers_arch3 aarch64
50+
%global vers_arch4 s390x
51+
%global vers_arch5 riscv64
52+
%global src_num 6
53+
%global sha_src_num 7
54+
%endif
4355
%ifarch riscv64
4456
%global vers_arch x64
4557
%global vers_arch2 ppc64le
4658
%global vers_arch3 aarch64
59+
%global vers_arch4 s390x
4760
%global vers_arch5 riscv64
4861
%global src_num 8
4962
%global sha_src_num 9
@@ -68,8 +81,7 @@ Packager: Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org>
6881
AutoReqProv: no
6982
Prefix: %{_libdir}/jvm/%{name}
7083

71-
ExclusiveArch: x86_64 ppc64le aarch64 riscv64
72-
# ExclusiveArch: x86_64 ppc64le aarch64 s390x riscv64
84+
ExclusiveArch: x86_64 ppc64le aarch64 s390x riscv64
7385

7486
BuildRequires: tar
7587
BuildRequires: wget
@@ -116,6 +128,9 @@ Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_ar
116128
# Third architecture (aarch64)
117129
Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
118130
Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
131+
# Fourth architecture (s390x)
132+
Source6: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
133+
Source7: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
119134
# Fifth architecture (riscv64)
120135
Source8: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
121136
Source9: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt

‎linux/jre/debian/src/main/packaging/temurin/22/debian/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Maintainer: Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org>
55
Build-Depends: debhelper (>= 11), lsb-release
66

77
Package: temurin-22-jre
8-
Architecture: amd64 arm64 ppc64el riscv64
8+
Architecture: amd64 arm64 ppc64el s390x riscv64
99
Depends: adoptium-ca-certificates,
1010
java-common,
1111
libasound2,

‎linux/jre/debian/src/main/packaging/temurin/22/debian/rules

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ arm64_tarball_url = https://github.com/adoptium/temurin22-binaries/releases/down
99
arm64_checksum = 7cf494b51625505d1843ad032677d885bd8000a80d0d38396685f25acbdb5708
1010
ppc64el_tarball_url = https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_ppc64le_linux_hotspot_22.0.2_9.tar.gz
1111
ppc64el_checksum = 132191d6f23ad1ac558de67e3e9913d047db07efd979eb84bf5dc20a651ffe61
12+
s390x_tarball_url = https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_s390x_linux_hotspot_22.0.2_9.tar.gz
13+
s390x_checksum = 4d9bc998c29fffcbbf752e9d0bf32391928a9e7a46edb1c5706e0f55b34a0c56
1214
riscv64_tarball_url = https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_riscv64_linux_hotspot_22.0.2_9.tar.gz
1315
riscv64_checksum = 81aacc0ae75e65846e6207edf41b8c5927673eba5588eebc5ba8076ca9a6041c
1416

‎linux/jre/redhat/src/main/packaging/temurin/22/temurin-22-jre.spec

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
%global vers_arch x64
2121
%global vers_arch2 ppc64le
2222
%global vers_arch3 aarch64
23+
%global vers_arch4 s390x
2324
%global vers_arch5 riscv64
2425
%global src_num 0
2526
%global sha_src_num 1
@@ -28,6 +29,7 @@
2829
%global vers_arch x64
2930
%global vers_arch2 ppc64le
3031
%global vers_arch3 aarch64
32+
%global vers_arch4 s390x
3133
%global vers_arch5 riscv64
3234
%global src_num 2
3335
%global sha_src_num 3
@@ -36,14 +38,25 @@
3638
%global vers_arch x64
3739
%global vers_arch2 ppc64le
3840
%global vers_arch3 aarch64
41+
%global vers_arch4 s390x
3942
%global vers_arch5 riscv64
4043
%global src_num 4
4144
%global sha_src_num 5
4245
%endif
46+
%ifarch s390x
47+
%global vers_arch x64
48+
%global vers_arch2 ppc64le
49+
%global vers_arch3 aarch64
50+
%global vers_arch4 s390x
51+
%global vers_arch5 riscv64
52+
%global src_num 6
53+
%global sha_src_num 7
54+
%endif
4355
%ifarch riscv64
4456
%global vers_arch x64
4557
%global vers_arch2 ppc64le
4658
%global vers_arch3 aarch64
59+
%global vers_arch4 s390x
4760
%global vers_arch5 riscv64
4861
%global src_num 8
4962
%global sha_src_num 9
@@ -68,8 +81,7 @@ Packager: Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org>
6881
AutoReqProv: no
6982
Prefix: /usr/lib/jvm/%{name}
7083

71-
ExclusiveArch: x86_64 ppc64le aarch64 riscv64
72-
# ExclusiveArch: x86_64 ppc64le aarch64 s390x riscv64
84+
ExclusiveArch: x86_64 ppc64le aarch64 s390x riscv64
7385

7486
BuildRequires: tar
7587
BuildRequires: wget
@@ -106,6 +118,9 @@ Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_ar
106118
# Third architecture (aarch64)
107119
Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
108120
Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
121+
# Fourth architecture (s390x)
122+
Source6: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
123+
Source7: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
109124
# Fifth architecture (riscv64)
110125
Source8: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
111126
Source9: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt

‎linux/jre/suse/src/main/packaging/temurin/22/temurin-22-jre.spec

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
%global vers_arch x64
2121
%global vers_arch2 ppc64le
2222
%global vers_arch3 aarch64
23+
%global vers_arch4 s390x
2324
%global vers_arch5 riscv64
2425
%global src_num 0
2526
%global sha_src_num 1
@@ -28,6 +29,7 @@
2829
%global vers_arch x64
2930
%global vers_arch2 ppc64le
3031
%global vers_arch3 aarch64
32+
%global vers_arch4 s390x
3133
%global vers_arch5 riscv64
3234
%global src_num 2
3335
%global sha_src_num 3
@@ -36,14 +38,25 @@
3638
%global vers_arch x64
3739
%global vers_arch2 ppc64le
3840
%global vers_arch3 aarch64
41+
%global vers_arch4 s390x
3942
%global vers_arch5 riscv64
4043
%global src_num 4
4144
%global sha_src_num 5
4245
%endif
46+
%ifarch s390x
47+
%global vers_arch x64
48+
%global vers_arch2 ppc64le
49+
%global vers_arch3 aarch64
50+
%global vers_arch4 s390x
51+
%global vers_arch5 riscv64
52+
%global src_num 6
53+
%global sha_src_num 7
54+
%endif
4355
%ifarch riscv64
4456
%global vers_arch x64
4557
%global vers_arch2 ppc64le
4658
%global vers_arch3 aarch64
59+
%global vers_arch4 s390x
4760
%global vers_arch5 riscv64
4861
%global src_num 8
4962
%global sha_src_num 9
@@ -68,8 +81,7 @@ Packager: Eclipse Adoptium Package Maintainers <temurin-dev@eclipse.org>
6881
AutoReqProv: no
6982
Prefix: %{_libdir}/jvm/%{name}
7083

71-
ExclusiveArch: x86_64 ppc64le aarch64 riscv64
72-
# ExclusiveArch: x86_64 ppc64le aarch64 s390x riscv64
84+
ExclusiveArch: x86_64 ppc64le aarch64 s390x riscv64
7385

7486
BuildRequires: tar
7587
BuildRequires: wget
@@ -106,6 +118,9 @@ Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_ar
106118
# Third architecture (aarch64)
107119
Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
108120
Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
121+
# Fourth architecture (s390x)
122+
Source6: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
123+
Source7: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
109124
# Fifth architecture (riscv64)
110125
Source8: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
111126
Source9: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt

0 commit comments

Comments
 (0)