Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JULY CPU: Re-introduce Linux Packages For s390x For JDK22 #965

Merged
merged 17 commits into from
Jul 26, 2024
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Maintainer: Eclipse Adoptium Package Maintainers <[email protected]>
Build-Depends: debhelper (>= 11), lsb-release

Package: temurin-22-jdk
Architecture: amd64 arm64 ppc64el riscv64
Architecture: amd64 arm64 ppc64el s390x riscv64
Depends: adoptium-ca-certificates,
java-common,
libasound2,
Expand Down
2 changes: 2 additions & 0 deletions linux/jdk/debian/src/main/packaging/temurin/22/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ arm64_tarball_url = https://github.com/adoptium/temurin22-binaries/releases/down
arm64_checksum = dac62747b5158c4bf4c4636432e3bdb9dea47f80f0c9d1d007f19bd5483b7d29
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
ppc64el_checksum = 1d678752d58e33ff951e75736b8415d6d7ae136b2421ca02e993f2603e9b259b
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
s390x_checksum = 46527cfc560552f05c0462520d69d438f144a3dc8206687952387c910cdd4c40
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
riscv64_checksum = 830a0d006c2dae95c0855aa70e193dba637831b491ccd67333322dea31bcf389

Expand Down
19 changes: 17 additions & 2 deletions linux/jdk/redhat/src/main/packaging/temurin/22/temurin-22-jdk.spec
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 0
%global sha_src_num 1
Expand All @@ -28,6 +29,7 @@
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 2
%global sha_src_num 3
Expand All @@ -36,14 +38,25 @@
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 4
%global sha_src_num 5
%endif
%ifarch s390x
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 6
%global sha_src_num 7
%endif
%ifarch riscv64
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 8
%global sha_src_num 9
Expand All @@ -68,8 +81,7 @@ Packager: Eclipse Adoptium Package Maintainers <[email protected]>
AutoReqProv: no
Prefix: /usr/lib/jvm/%{name}

ExclusiveArch: x86_64 ppc64le aarch64 riscv64
# ExclusiveArch: x86_64 ppc64le aarch64 s390x riscv64
ExclusiveArch: x86_64 ppc64le aarch64 s390x riscv64

BuildRequires: tar
BuildRequires: wget
Expand Down Expand Up @@ -116,6 +128,9 @@ Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_ar
# Third architecture (aarch64)
Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
# Fourth architecture (s390x)
Source6: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source7: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
# Fifth architecture (riscv64)
Source8: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source9: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
Expand Down
19 changes: 17 additions & 2 deletions linux/jdk/suse/src/main/packaging/temurin/22/temurin-22-jdk.spec
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 0
%global sha_src_num 1
Expand All @@ -28,6 +29,7 @@
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 2
%global sha_src_num 3
Expand All @@ -36,14 +38,25 @@
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 4
%global sha_src_num 5
%endif
%ifarch s390x
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 6
%global sha_src_num 7
%endif
%ifarch riscv64
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 8
%global sha_src_num 9
Expand All @@ -68,8 +81,7 @@ Packager: Eclipse Adoptium Package Maintainers <[email protected]>
AutoReqProv: no
Prefix: %{_libdir}/jvm/%{name}

ExclusiveArch: x86_64 ppc64le aarch64 riscv64
# ExclusiveArch: x86_64 ppc64le aarch64 s390x riscv64
ExclusiveArch: x86_64 ppc64le aarch64 s390x riscv64

BuildRequires: tar
BuildRequires: wget
Expand Down Expand Up @@ -116,6 +128,9 @@ Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_ar
# Third architecture (aarch64)
Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
# Fourth architecture (s390x)
Source6: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source7: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
# Fifth architecture (riscv64)
Source8: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source9: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Maintainer: Eclipse Adoptium Package Maintainers <[email protected]>
Build-Depends: debhelper (>= 11), lsb-release

Package: temurin-22-jre
Architecture: amd64 arm64 ppc64el riscv64
Architecture: amd64 arm64 ppc64el s390x riscv64
Depends: adoptium-ca-certificates,
java-common,
libasound2,
Expand Down
2 changes: 2 additions & 0 deletions linux/jre/debian/src/main/packaging/temurin/22/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ arm64_tarball_url = https://github.com/adoptium/temurin22-binaries/releases/down
arm64_checksum = 7cf494b51625505d1843ad032677d885bd8000a80d0d38396685f25acbdb5708
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
ppc64el_checksum = 132191d6f23ad1ac558de67e3e9913d047db07efd979eb84bf5dc20a651ffe61
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
s390x_checksum = 4d9bc998c29fffcbbf752e9d0bf32391928a9e7a46edb1c5706e0f55b34a0c56
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
riscv64_checksum = 81aacc0ae75e65846e6207edf41b8c5927673eba5588eebc5ba8076ca9a6041c

Expand Down
19 changes: 17 additions & 2 deletions linux/jre/redhat/src/main/packaging/temurin/22/temurin-22-jre.spec
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 0
%global sha_src_num 1
Expand All @@ -28,6 +29,7 @@
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 2
%global sha_src_num 3
Expand All @@ -36,14 +38,25 @@
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 4
%global sha_src_num 5
%endif
%ifarch s390x
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 6
%global sha_src_num 7
%endif
%ifarch riscv64
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 8
%global sha_src_num 9
Expand All @@ -68,8 +81,7 @@ Packager: Eclipse Adoptium Package Maintainers <[email protected]>
AutoReqProv: no
Prefix: /usr/lib/jvm/%{name}

ExclusiveArch: x86_64 ppc64le aarch64 riscv64
# ExclusiveArch: x86_64 ppc64le aarch64 s390x riscv64
ExclusiveArch: x86_64 ppc64le aarch64 s390x riscv64

BuildRequires: tar
BuildRequires: wget
Expand Down Expand Up @@ -106,6 +118,9 @@ Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_ar
# Third architecture (aarch64)
Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
# Fourth architecture (s390x)
Source6: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source7: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
# Fifth architecture (riscv64)
Source8: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source9: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
Expand Down
19 changes: 17 additions & 2 deletions linux/jre/suse/src/main/packaging/temurin/22/temurin-22-jre.spec
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 0
%global sha_src_num 1
Expand All @@ -28,6 +29,7 @@
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 2
%global sha_src_num 3
Expand All @@ -36,14 +38,25 @@
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 4
%global sha_src_num 5
%endif
%ifarch s390x
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 6
%global sha_src_num 7
%endif
%ifarch riscv64
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%global vers_arch5 riscv64
%global src_num 8
%global sha_src_num 9
Expand All @@ -68,8 +81,7 @@ Packager: Eclipse Adoptium Package Maintainers <[email protected]>
AutoReqProv: no
Prefix: %{_libdir}/jvm/%{name}

ExclusiveArch: x86_64 ppc64le aarch64 riscv64
# ExclusiveArch: x86_64 ppc64le aarch64 s390x riscv64
ExclusiveArch: x86_64 ppc64le aarch64 s390x riscv64

BuildRequires: tar
BuildRequires: wget
Expand Down Expand Up @@ -106,6 +118,9 @@ Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_ar
# Third architecture (aarch64)
Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch3}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
# Fourth architecture (s390x)
Source6: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source7: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
# Fifth architecture (riscv64)
Source8: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source9: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jre_%{vers_arch5}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
Expand Down
Loading