From 48e38f6dca354835a71ab8a3adb31d61eb3475f5 Mon Sep 17 00:00:00 2001 From: Dan Lutker Date: Mon, 10 Jul 2023 23:35:06 +0000 Subject: [PATCH 1/3] Setup AL bootstrapping with Corretto 20. This should not get upstreamed or merged to develop. --- .../spec/java-amazon-corretto.spec.template | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/installers/linux/al2/spec/java-amazon-corretto.spec.template b/installers/linux/al2/spec/java-amazon-corretto.spec.template index d332d3369c1..5a1965d7a16 100644 --- a/installers/linux/al2/spec/java-amazon-corretto.spec.template +++ b/installers/linux/al2/spec/java-amazon-corretto.spec.template @@ -142,9 +142,9 @@ BuildRequires: libXtst-devel BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel -%if %{with bootjdk} -BuildRequires: java-${boot_jdk_major_version}-devel -%endif +#%if %{with bootjdk} +#BuildRequires: java-${boot_jdk_major_version}-devel +#%endif Requires: libX11 Requires: libXi @@ -247,6 +247,19 @@ Amazon Corretto's packaging of the OpenJDK ${java_spec_version} jmods. %build +# Bootstrap with Corretto 20 +%ifarch aarch64 +curl -L -o corretto.tar.gz https://corretto.aws/downloads/latest/amazon-corretto-20-aarch64-linux-jdk.tar.gz +echo "505409e4f7e7c6c9aeae61af6a7df075298ceed70b1b562dc6d5f65588e12b1e corretto.tar.gz" > corretto.tar.gz.sha256 +%else +curl -L -o corretto.tar.gz https://corretto.aws/downloads/latest/amazon-corretto-20-x64-linux-jdk.tar.gz +echo "32a6ce43ec641b0bd55d21bc4aa17995407581fb1c5142703805960aea95d2db corretto.tar.gz" > corretto.tar.gz.sha256 +%endif +sha256sum -c corretto.tar.gz.sha256 +mkdir -p corretto-bootstrap-jdk +tar -xf corretto.tar.gz --strip-component=1 -C corretto-bootstrap-jdk + + %if "%{dist}" == ".amzn2" || "%{dist}" == ".amzn2int" # AmazonLinux ships with GifLib 4.x which does not define GIFLIB_MAJOR. This must be defined # because -Werror=undef is enabled. @@ -254,6 +267,7 @@ Amazon Corretto's packaging of the OpenJDK ${java_spec_version} jmods. %endif bash ./configure \\ + --with-boot-jdk=\${PWD}/corretto-bootstrap-jdk \\ %ifarch aarch64 --with-extra-cflags="-moutline-atomics%{?GIFLIB_DEFINE: %{GIFLIB_DEFINE}}" \\ --with-extra-cxxflags="-moutline-atomics" \\ From dba522df14a260c9b984427fd79af96610eae80c Mon Sep 17 00:00:00 2001 From: Dan Lutker Date: Fri, 8 Sep 2023 22:29:36 +0000 Subject: [PATCH 2/3] Update hashes for new release --- installers/linux/al2/spec/java-amazon-corretto.spec.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/installers/linux/al2/spec/java-amazon-corretto.spec.template b/installers/linux/al2/spec/java-amazon-corretto.spec.template index 5a1965d7a16..aa051073278 100644 --- a/installers/linux/al2/spec/java-amazon-corretto.spec.template +++ b/installers/linux/al2/spec/java-amazon-corretto.spec.template @@ -250,10 +250,10 @@ Amazon Corretto's packaging of the OpenJDK ${java_spec_version} jmods. # Bootstrap with Corretto 20 %ifarch aarch64 curl -L -o corretto.tar.gz https://corretto.aws/downloads/latest/amazon-corretto-20-aarch64-linux-jdk.tar.gz -echo "505409e4f7e7c6c9aeae61af6a7df075298ceed70b1b562dc6d5f65588e12b1e corretto.tar.gz" > corretto.tar.gz.sha256 +echo "4622de17e4afcb98e05f21a8be81d98500bbfc4a15c0c5a5420b39b816ba4f13 corretto.tar.gz" > corretto.tar.gz.sha256 %else curl -L -o corretto.tar.gz https://corretto.aws/downloads/latest/amazon-corretto-20-x64-linux-jdk.tar.gz -echo "32a6ce43ec641b0bd55d21bc4aa17995407581fb1c5142703805960aea95d2db corretto.tar.gz" > corretto.tar.gz.sha256 +echo " 3b60fe04966d0aa762bf1fc2974ad239cf7ab887a657a9e7e3c75a9310e34db2 corretto.tar.gz" > corretto.tar.gz.sha256 %endif sha256sum -c corretto.tar.gz.sha256 mkdir -p corretto-bootstrap-jdk From 839654da21e21fd8460fba635880f5089c3e9b64 Mon Sep 17 00:00:00 2001 From: Dan Lutker Date: Fri, 8 Sep 2023 23:00:51 +0000 Subject: [PATCH 3/3] set release ext to 0 --- installers/linux/al2/spec/java-amazon-corretto.spec.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installers/linux/al2/spec/java-amazon-corretto.spec.template b/installers/linux/al2/spec/java-amazon-corretto.spec.template index aa051073278..10c9b4d3b94 100644 --- a/installers/linux/al2/spec/java-amazon-corretto.spec.template +++ b/installers/linux/al2/spec/java-amazon-corretto.spec.template @@ -47,7 +47,7 @@ %endif # If we need to rev the package for something outside of what the # Corretto team is doing, we can define release_ext. -# %global release_ext 1 +%global release_ext 0 %global boot_jdk_major_version $boot_jdk_major_version