diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 8434b6d4e84..ca049dd48bf 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -248,7 +248,7 @@ newt-0.52.23-1.azl3.aarch64.rpm newt-lang-0.52.23-1.azl3.aarch64.rpm chkconfig-1.25-1.azl3.aarch64.rpm chkconfig-lang-1.25-1.azl3.aarch64.rpm -msopenjdk-17-17.0.11-1.aarch64.rpm +msopenjdk-17-17.0.12-1.aarch64.rpm pyproject-rpm-macros-1.12.0-2.azl3.noarch.rpm pyproject-srpm-macros-1.12.0-2.azl3.noarch.rpm python3-rpm-generators-14-11.azl3.noarch.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index bb0c43c015f..18b2dfbc136 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -248,7 +248,7 @@ newt-0.52.23-1.azl3.x86_64.rpm newt-lang-0.52.23-1.azl3.x86_64.rpm chkconfig-1.25-1.azl3.x86_64.rpm chkconfig-lang-1.25-1.azl3.x86_64.rpm -msopenjdk-17-17.0.11-1.x86_64.rpm +msopenjdk-17-17.0.12-1.x86_64.rpm pyproject-rpm-macros-1.12.0-2.azl3.noarch.rpm pyproject-srpm-macros-1.12.0-2.azl3.noarch.rpm python3-rpm-generators-14-11.azl3.noarch.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index e7ffc44a179..3995bb5e849 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -256,7 +256,7 @@ meson-1.3.1-1.azl3.noarch.rpm mpfr-4.2.1-1.azl3.aarch64.rpm mpfr-debuginfo-4.2.1-1.azl3.aarch64.rpm mpfr-devel-4.2.1-1.azl3.aarch64.rpm -msopenjdk-17-17.0.11-1.aarch64.rpm +msopenjdk-17-17.0.12-1.aarch64.rpm ncurses-6.4-2.azl3.aarch64.rpm ncurses-compat-6.4-2.azl3.aarch64.rpm ncurses-debuginfo-6.4-2.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index be41e90402d..60d91166aa5 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -262,7 +262,7 @@ meson-1.3.1-1.azl3.noarch.rpm mpfr-4.2.1-1.azl3.x86_64.rpm mpfr-debuginfo-4.2.1-1.azl3.x86_64.rpm mpfr-devel-4.2.1-1.azl3.x86_64.rpm -msopenjdk-17-17.0.11-1.x86_64.rpm +msopenjdk-17-17.0.12-1.x86_64.rpm ncurses-6.4-2.azl3.x86_64.rpm ncurses-compat-6.4-2.azl3.x86_64.rpm ncurses-debuginfo-6.4-2.azl3.x86_64.rpm diff --git a/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh b/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh index 20b8470f366..6946773883a 100755 --- a/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh +++ b/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh @@ -345,6 +345,22 @@ start_record_timestamp "build packages" start_record_timestamp "build packages/build" start_record_timestamp "build packages/install" +# Download JDK rpm +echo "Downloading MsOpenJDK rpm" +MSOPENJDK_FILENAME="msopenjdk-17-17.0.12-1.$(uname -m).rpm" +MSOPENJDK_URL="https://packages.microsoft.com/azurelinux/3.0/prod/ms-oss/$(uname -m)/$MSOPENJDK_FILENAME" +case $(uname -m) in + x86_64) MSOPENJDK_EXPECTED_HASH="08d46b64dc0202ad54be937bb5eab7d4c6a6f7f355a40afbeb295cb591dba126" ;; + aarch64) MSOPENJDK_EXPECTED_HASH="0532d42d5c010152c09e88971f9aecd84af54f935973bbf0f1eba2c1c6839726" ;; +esac +wget -nv --server-response --no-clobber --timeout=30 $MSOPENJDK_URL --directory-prefix=$CHROOT_RPMS_DIR_ARCH +MSOPENJDK_ACTUAL_HASH=$(sha256sum "$CHROOT_RPMS_DIR_ARCH/$MSOPENJDK_FILENAME" | awk '{print $1}') +if [[ "$MSOPENJDK_EXPECTED_HASH" != "$MSOPENJDK_ACTUAL_HASH" ]]; then + echo "Error, incorrect msopenjdk hash: '$MSOPENJDK_ACTUAL_HASH'. Expected hash: '$MSOPENJDK_EXPECTED_HASH'" + rm -vf "$CHROOT_RPMS_DIR_ARCH/$MSOPENJDK_FILENAME" + exit 1 +fi + echo Building final list of toolchain RPMs build_rpm_in_chroot_no_install azurelinux-rpm-macros chroot_and_install_rpms azurelinux-rpm-macros @@ -475,17 +491,6 @@ chroot_and_install_rpms python-setuptools python3-setuptools build_rpm_in_chroot_no_install libxml2 chroot_and_install_rpms libxml2 -# Download JDK rpms -echo Download JDK rpms -case $(uname -m) in - x86_64) - wget -nv --no-clobber --timeout=30 https://packages.microsoft.com/azurelinux/3.0/preview/ms-oss/x86_64/msopenjdk-17-17.0.11-1.x86_64.rpm --directory-prefix=$CHROOT_RPMS_DIR_ARCH - ;; - aarch64) - wget -nv --no-clobber --timeout=30 https://packages.microsoft.com/azurelinux/3.0/preview/ms-oss/aarch64/msopenjdk-17-17.0.11-1.aarch64.rpm --directory-prefix=$CHROOT_RPMS_DIR_ARCH - ;; -esac - # Lua needs to be installed for RPM to build build_rpm_in_chroot_no_install lua chroot_and_install_rpms lua lua