Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/github_actions/actions/setup-ja…
Browse files Browse the repository at this point in the history 
…va-4.1.0
  • Loading branch information
@karianna
karianna authored Mar 2, 2024
2 parents 1887927 + 34029f8 commit b1fed02
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 12 deletions.
2 changes: 1 addition & 1 deletion linux/jdk/debian/src/main/packaging/temurin/21/debian/control
View file
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-21-jdk
Architecture: amd64 arm64 ppc64el
Architecture: amd64 arm64 ppc64el s390x
Depends: adoptium-ca-certificates,
java-common,
libasound2,
Expand Down
2 changes: 2 additions & 0 deletions linux/jdk/debian/src/main/packaging/temurin/21/debian/rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ arm64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/down
arm64_checksum = 3ce6a2b357e2ef45fd6b53d6587aa05bfec7771e7fb982f2c964f6b771b7526a
ppc64el_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.2_13.tar.gz
ppc64el_checksum = d08de863499d8851811c893e8915828f2cd8eb67ed9e29432a6b4e222d80a12f
s390x_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jdk_s390x_linux_hotspot_21.0.2_13.tar.gz
s390x_checksum = 0d5676c50821e0d0b951bf3ffd717e7a13be2a89d8848a5c13b4aedc6f982c78

d = debian/$(pkg_name)
jvm_home = usr/lib/jvm
Expand Down
16 changes: 15 additions & 1 deletion linux/jdk/redhat/src/main/packaging/temurin/21/temurin-21-jdk.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,34 @@
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%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 vers_arch4 s390x
%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 vers_arch4 s390x
%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 src_num 6
%global sha_src_num 7
%endif
# Allow for noarch SRPM build
%ifarch noarch
%global src_num 0
Expand All @@ -58,7 +69,7 @@ Packager: Eclipse Adoptium Package Maintainers <[email protected]>
AutoReqProv: no
Prefix: /usr/lib/jvm/%{name}

ExclusiveArch: x86_64 ppc64le aarch64
ExclusiveArch: x86_64 ppc64le aarch64 s390x

BuildRequires: tar
BuildRequires: wget
Expand Down Expand Up @@ -105,6 +116,9 @@ Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_ar
# 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
# 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

# Set the compression format to xz to be compatible with more Red Hat flavours. Newer versions of Fedora use zstd which
# is not available on CentOS 7, for example. https://github.com/rpm-software-management/rpm/blob/master/macros.in#L353
Expand Down
16 changes: 15 additions & 1 deletion linux/jdk/suse/src/main/packaging/temurin/21/temurin-21-jdk.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,34 @@
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%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 vers_arch4 s390x
%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 vers_arch4 s390x
%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 src_num 6
%global sha_src_num 7
%endif
# Allow for noarch SRPM build
%ifarch noarch
%global src_num 0
Expand All @@ -57,7 +68,7 @@ Packager: Eclipse Adoptium Package Maintainers <[email protected]>
AutoReqProv: no
Prefix: %{_libdir}/jvm/%{name}

ExclusiveArch: x86_64 ppc64le aarch64
ExclusiveArch: x86_64 ppc64le aarch64 s390x

BuildRequires: tar
BuildRequires: wget
Expand Down Expand Up @@ -104,6 +115,9 @@ Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jdk_%{vers_ar
# 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
# 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

# Avoid build failures on some distros due to missing build-id in binaries.
%global debug_package %{nil}
Expand Down
2 changes: 1 addition & 1 deletion linux/jre/debian/src/main/packaging/temurin/21/debian/control
View file
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-21-jre
Architecture: amd64 arm64 ppc64el
Architecture: amd64 arm64 ppc64el s390x
Depends: adoptium-ca-certificates,
java-common,
libasound2,
Expand Down
2 changes: 2 additions & 0 deletions linux/jre/debian/src/main/packaging/temurin/21/debian/rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ arm64_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/down
arm64_checksum = 64c78854184c92a4da5cda571c8e357043bfaf03a03434eef58550cc3410d8a4
ppc64el_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.2_13.tar.gz
ppc64el_checksum = caaf48e50787b80b810dc08ee91bd4ffe0d0696bd14906a92f05bf8c14aabb22
s390x_tarball_url = https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jre_s390x_linux_hotspot_21.0.2_13.tar.gz
s390x_checksum = ff8191fa5b23a175932e7f4fab10a6e8df61fd71b6529c7d21451c81e82f8d55

d = debian/$(pkg_name)
jvm_home = usr/lib/jvm
Expand Down
24 changes: 20 additions & 4 deletions linux/jre/redhat/src/main/packaging/temurin/21/temurin-21-jre.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# $ 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.2.0.0.13
%global spec_release 2
%global spec_release 3
%global priority 2100

%global source_url_base https://github.com/adoptium/temurin21-binaries/releases/download
Expand All @@ -20,23 +20,34 @@
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%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 vers_arch4 s390x
%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 vers_arch4 s390x
%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 src_num 6
%global sha_src_num 7
%endif
# Allow for noarch SRPM build
%ifarch noarch
%global src_num 0
Expand All @@ -57,7 +68,7 @@ Packager: Eclipse Adoptium Package Maintainers <[email protected]>
AutoReqProv: no
Prefix: /usr/lib/jvm/%{name}

ExclusiveArch: x86_64 ppc64le aarch64
ExclusiveArch: x86_64 ppc64le aarch64 s390x

BuildRequires: tar
BuildRequires: wget
Expand Down Expand Up @@ -89,11 +100,14 @@ Provides: jre-%{java_provides}-headless
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
Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch2}_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
# Fourth architecture (s390x)
Source6: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source7: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt

# Set the compression format to xz to be compatible with more Red Hat flavours. Newer versions of Fedora use zstd which
# is not available on CentOS 7, for example. https://github.com/rpm-software-management/rpm/blob/master/macros.in#L353
Expand Down Expand Up @@ -157,6 +171,8 @@ fi
/usr/lib/tmpfiles.d/%{name}.conf

%changelog
* Wed Feb 28 2024 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.2.0.0.13-3
- Eclipse Temurin 21.0.2+13 release.
* Wed Feb 21 2024 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.2.0.0.13-2
- Eclipse Temurin 21.0.2+13 release.
* Tue Jan 23 2024 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.2.0.0.13-1
Expand Down
24 changes: 20 additions & 4 deletions linux/jre/suse/src/main/packaging/temurin/21/temurin-21-jre.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# $ 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.2.0.0.13
%global spec_release 2
%global spec_release 3
%global priority 2100

%global source_url_base https://github.com/adoptium/temurin21-binaries/releases/download
Expand All @@ -20,23 +20,34 @@
%global vers_arch x64
%global vers_arch2 ppc64le
%global vers_arch3 aarch64
%global vers_arch4 s390x
%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 vers_arch4 s390x
%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 vers_arch4 s390x
%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 src_num 6
%global sha_src_num 7
%endif
# Allow for noarch SRPM build
%ifarch noarch
%global src_num 0
Expand All @@ -57,7 +68,7 @@ Packager: Eclipse Adoptium Package Maintainers <[email protected]>
AutoReqProv: no
Prefix: %{_libdir}/jvm/%{name}

ExclusiveArch: x86_64 ppc64le aarch64
ExclusiveArch: x86_64 ppc64le aarch64 s390x

BuildRequires: tar
BuildRequires: wget
Expand Down Expand Up @@ -89,11 +100,14 @@ Provides: jre-%{java_provides}-headless
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
Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch2}_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
# Fourth architecture (s390x)
Source6: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source7: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK21U-jre_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt

# Avoid build failures on some distros due to missing build-id in binaries.
%global debug_package %{nil}
Expand Down Expand Up @@ -147,6 +161,8 @@ fi
%{prefix}

%changelog
* Wed Feb 28 2024 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.2.0.0.13-3
- Eclipse Temurin 21.0.2+13 release.
* Wed Feb 21 2024 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.2.0.0.13-2
- Eclipse Temurin 21.0.2+13 release.
* Tue Jan 23 2024 Eclipse Adoptium Package Maintainers <[email protected]> 21.0.2.0.0.13-1
Expand Down

0 comments on commit b1fed02

Please sign in to comment.