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.

Sign up for GitHub

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

Jump to bottom

April CPU - Change Spec Files etc to ship JDK22 s390x Patched Packages #887

Closed
wants to merge 2 commits into from
Closed

April CPU - Change Spec Files etc to ship JDK22 s390x Patched Packages #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85d40c0
Changes to ship s390x only
steelhead31 Apr 29, 2024
f059b7b
Fix omitted arch4
steelhead31 Apr 29, 2024
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
6 changes: 6 additions & 0 deletions linux/jdk/debian/src/main/packaging/temurin/22/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
temurin-22-jdk (22.0.1.1.0+1-1) STABLE; urgency=medium

* Eclipse Temurin 22.0.1.1.0+1-1 release.

-- Eclipse Adoptium Package Maintainers <[email protected]> Wed, 17 Apr 2024 00:00:00 +0000

temurin-22-jdk (22.0.1.0.0+8-1) STABLE; urgency=medium

* Eclipse Temurin 22.0.1.0.0+8-1 release.
Expand Down
2 changes: 1 addition & 1 deletion linux/jdk/debian/src/main/packaging/temurin/22/debian/control
View file
Open in desktop
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
View file
Open in desktop
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 = d8488fa1e4e8c1e318cef4c0fc3842a7f15a4cf52b27054663bb94471f54b3fa
ppc64el_tarball_url = https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_ppc64le_linux_hotspot_22.0.1_8.tar.gz
ppc64el_checksum = 4113606ba65044a3cbd7678e1c0d41881d24a2441c8ab8b658b4ac58da624de5
s390x_tarball_url = https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1.1%2B1/OpenJDK22U-jdk_s390x_linux_hotspot_22.0.1.1_1.tar.gz
s390x_checksum = 9f648abfa8ae82a1138bf069f498bc73d5ed0463b3f5d79e5d0988d28f9ffcc5
riscv64_tarball_url = https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_riscv64_linux_hotspot_22.0.1_8.tar.gz
riscv64_checksum = 767bbe2b9581272b6ac435b8c62bb1c079041d6ff2a1c39552d4403b4d7170f5

Expand Down
3 changes: 2 additions & 1 deletion linux/jdk/redhat/src/main/packaging/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ fi

# loop spec file originally from src/main/packaging/$product/$productVersion/*.spec
for spec in "$(ls /home/builder/build/generated/packaging/*.spec)"; do
spectool -g -R "$spec";
spectool -g -R -f "$spec";
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How is this related?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its a cludge/workaround to allow for the fact that the rpmbuild process builds ALL architectures regardless of which one is passed in. This is a temporary solution ( thus not to be merged ) to allow the publishing of the packages to be completed. The current plan is to try and make this process a little more consistent ahead of the next release.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanx!

rpmbuild --define "local_build ${buildLocalFlag}" \
--nodeps -bs "$spec"; # build src.rpm
# if buildArch == all, extract ExclusiveArch from the spec file
Expand All @@ -50,6 +50,7 @@ for spec in "$(ls /home/builder/build/generated/packaging/*.spec)"; do
ExclusiveArch=$(grep -E "^ExclusiveArch:" "$spec" | sed -e 's/ExclusiveArch: *//' | sed -e 's/%{arm}/armv7hl/g')
[ -n "$ExclusiveArch" ] && targets="${ExclusiveArch}"
fi
targets="s390x"
for target in $targets; do
rpmbuild --target "$target" \
--define "local_build ${buildLocalFlag}" \
Expand Down
43 changes: 30 additions & 13 deletions linux/jdk/redhat/src/main/packaging/temurin/22/temurin-22-jdk.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
%global upstream_version 22.0.1+8
%global upstream_version 22.0.1.1+1
# 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 22.0.0.0.0___22.0.0.0.0+1
# 22.0.0.0.0___1 == 22.0.0.0.0+36
%global spec_version 22.0.1.0.0.8
%global spec_version 22.0.1.1.0.1
%global spec_release 1
%global priority 2200

Expand All @@ -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
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are all those vers_archX enumerated for each arch? I would guess, that only src_num shoudl be enough (as sha_src_num is jsut src_num+1 wdyt?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See my previous comment :) , its currently impossible using this spec file , and the one jenkins job to actually publish a patch for a single architecture.. I agree this should be made entirely modular and architecture independent.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR is serving as a documentation piece on what was needed to accomplish it, so that when its redesigned we can improve it significantly.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I see. Sure. Sorry for curiosity!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, Im fairly new to all of this rpm packaging, I suspect you know more than I, so if you wouldn't mind helping out when we come to improve this functionality, all help/support will be greatly welcomed!

Copy link

@judovana judovana Apr 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. Considering I will looking to the headless packgae and versionless provides, I think I should do deep dive into this. I will try to keep myself in loop proeprly.

%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 @@ -108,17 +120,20 @@ Provides: java-sdk-22-%{java_provides}
Provides: java-sdk-%{java_provides}

# First architecture (x86_64)
Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
# Second architecture (ppc64le)
Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
# Second architecture (ppc64le)%global vers_arch4 s390x
Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
# 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
Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_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
Source8: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source9: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-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 Expand Up @@ -237,6 +252,8 @@ fi
/usr/lib/tmpfiles.d/%{name}.conf

%changelog
* Wed Apr 17 2024 Eclipse Adoptium Package Maintainers <[email protected]> 22.0.1.1.0.1-1
- Eclipse Temurin 22.0.1.1+1 release.
* Wed Apr 17 2024 Eclipse Adoptium Package Maintainers <[email protected]> 22.0.1.0.0.8-1
- Eclipse Temurin 22.0.1+8 release.
* Wed Mar 20 2024 Eclipse Adoptium Package Maintainers <[email protected]> 22.0.0.0.0.36-0
Expand Down
3 changes: 2 additions & 1 deletion linux/jdk/suse/src/main/packaging/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ else
fi

for spec in "$(ls /home/builder/build/generated/packaging/*.spec)"; do
rpmdev-spectool -g -R "$spec";
rpmdev-spectool -g -R -f "$spec";
rpmbuild --nodeps -bs "$spec";
# if buildArch == all, extract ExclusiveArch from the spec file
if [ "${buildArch}" = "all" ]; then
Expand All @@ -25,6 +25,7 @@ for spec in "$(ls /home/builder/build/generated/packaging/*.spec)"; do
ExclusiveArch=$(grep -E "^ExclusiveArch:" "$spec" | sed -e 's/ExclusiveArch: *//' | sed -e 's/%{arm}/armv7hl/g')
[ -n "$ExclusiveArch" ] && targets="${ExclusiveArch}"
fi
targets="s390x"
for target in $targets; do
rpmbuild --target "$target" --rebuild /home/builder/rpmbuild/SRPMS/*.src.rpm;
done;
Expand Down
41 changes: 29 additions & 12 deletions linux/jdk/suse/src/main/packaging/temurin/22/temurin-22-jdk.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
%global upstream_version 22.0.1+8
%global upstream_version 22.0.1.1+1
# 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 22.0.0.0.0___22.0.0.0.0+1
# 22.0.0.0.0___1 == 22.0.0.0.0+36
%global spec_version 22.0.1.0.0.8
%global spec_version 22.0.1.1.0.1
%global spec_release 1
%global priority 2200

Expand All @@ -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 @@ -108,17 +120,20 @@ Provides: java-sdk-22-%{java_provides}
Provides: java-sdk-%{java_provides}

# First architecture (x86_64)
Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
Source0: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source1: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
# Second architecture (ppc64le)
Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch2}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
Source2: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source3: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz.sha256.txt
# 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
Source4: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source5: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_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
Source8: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-jdk_%{vers_arch4}_linux_hotspot_%{upstream_version_no_plus}.tar.gz
Source9: %{source_url_base}/jdk-%{upstream_version_url}/OpenJDK22U-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 Expand Up @@ -227,6 +242,8 @@ fi
%{prefix}

%changelog
* Wed Apr 17 2024 Eclipse Adoptium Package Maintainers <[email protected]> 22.0.1.1.0.1-1
- Eclipse Temurin 22.0.1.1+1 release.
* Wed Apr 17 2024 Eclipse Adoptium Package Maintainers <[email protected]> 22.0.1.0.0.8-1
- Eclipse Temurin 22.0.1+8 release.
* Wed Mar 20 2024 Eclipse Adoptium Package Maintainers <[email protected]> 22.0.0.0.0.36-0
Expand Down
6 changes: 6 additions & 0 deletions linux/jre/debian/src/main/packaging/temurin/22/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
temurin-22-jre (22.0.1.1.0+1-1) STABLE; urgency=medium

* Eclipse Temurin 22.0.1.1.0+1-1 release.

-- Eclipse Adoptium Package Maintainers <[email protected]> Wed, 17 Apr 2024 00:00:00 +0000

temurin-22-jre (22.0.1.0.0+8-1) STABLE; urgency=medium

* Eclipse Temurin 22.0.1.0.0+8-1 release.
Expand Down
2 changes: 1 addition & 1 deletion linux/jre/debian/src/main/packaging/temurin/22/debian/control
View file
Open in desktop
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
View file
Open in desktop
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 = 8e5996a2bbae2da9797cff5a62cb2080965e08fd66de24673b29a8e481ec769e
ppc64el_tarball_url = https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_ppc64le_linux_hotspot_22.0.1_8.tar.gz
ppc64el_checksum = 7df4a10fab324181a6c9e8b1e2a45042b8d30490f0fdb937a536f6cd17c907ef
s390x_tarball_url = https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1.1%2B1/OpenJDK22U-jre_s390x_linux_hotspot_22.0.1.1_1.tar.gz
s390x_checksum = 86dd7d37d5bb6091f3e6e2da4049ffaa0c5c2576cfcb45659606c4aab83b5824
riscv64_tarball_url = https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_riscv64_linux_hotspot_22.0.1_8.tar.gz
riscv64_checksum = 15193b64eac9a5ade9fc7d20fe90b9769887c0195afb20442d2a6adeb07c140f

Expand Down
3 changes: 2 additions & 1 deletion linux/jre/redhat/src/main/packaging/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ fi

# loop spec file originally from src/main/packaging/$product/$productVersion/*.spec
for spec in "$(ls /home/builder/build/generated/packaging/*.spec)"; do
spectool -g -R "$spec";
spectool -g -R -f "$spec";
rpmbuild --define "local_build ${buildLocalFlag}" \
--nodeps -bs "$spec"; # build src.rpm
# if buildArch == all, extract ExclusiveArch from the spec file
Expand All @@ -50,6 +50,7 @@ for spec in "$(ls /home/builder/build/generated/packaging/*.spec)"; do
ExclusiveArch=$(grep -E "^ExclusiveArch:" "$spec" | sed -e 's/ExclusiveArch: *//' | sed -e 's/%{arm}/armv7hl/g')
[ -n "$ExclusiveArch" ] && targets="${ExclusiveArch}"
fi
targets="s390x"
for target in $targets; do
rpmbuild --target "$target" \
--define "local_build ${buildLocalFlag}" \
Expand Down
Loading
Loading