@@ -345,6 +345,22 @@ start_record_timestamp "build packages"
345345start_record_timestamp " build packages/build"
346346start_record_timestamp " build packages/install"
347347
348+ # Download JDK rpm
349+ echo " Downloading MsOpenJDK rpm"
350+ MSOPENJDK_FILENAME=" msopenjdk-17-17.0.12-1.$( uname -m) .rpm"
351+ MSOPENJDK_URL=" https://packages.microsoft.com/azurelinux/3.0/prod/ms-oss/$( uname -m) /$MSOPENJDK_FILENAME "
352+ case $( uname -m) in
353+ x86_64) MSOPENJDK_EXPECTED_HASH=" 08d46b64dc0202ad54be937bb5eab7d4c6a6f7f355a40afbeb295cb591dba126" ;;
354+ aarch64) MSOPENJDK_EXPECTED_HASH=" 0532d42d5c010152c09e88971f9aecd84af54f935973bbf0f1eba2c1c6839726" ;;
355+ esac
356+ wget -nv --server-response --no-clobber --timeout=30 $MSOPENJDK_URL --directory-prefix=$CHROOT_RPMS_DIR_ARCH
357+ MSOPENJDK_ACTUAL_HASH=$( sha256sum " $CHROOT_RPMS_DIR_ARCH /$MSOPENJDK_FILENAME " | awk ' {print $1}' )
358+ if [[ " $MSOPENJDK_EXPECTED_HASH " != " $MSOPENJDK_ACTUAL_HASH " ]]; then
359+ echo " Error, incorrect msopenjdk hash: '$MSOPENJDK_ACTUAL_HASH '. Expected hash: '$MSOPENJDK_EXPECTED_HASH '"
360+ rm -vf " $CHROOT_RPMS_DIR_ARCH /$MSOPENJDK_FILENAME "
361+ exit 1
362+ fi
363+
348364echo Building final list of toolchain RPMs
349365build_rpm_in_chroot_no_install azurelinux-rpm-macros
350366chroot_and_install_rpms azurelinux-rpm-macros
@@ -475,17 +491,6 @@ chroot_and_install_rpms python-setuptools python3-setuptools
475491build_rpm_in_chroot_no_install libxml2
476492chroot_and_install_rpms libxml2
477493
478- # Download JDK rpms
479- echo Download JDK rpms
480- case $( uname -m) in
481- x86_64)
482- 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
483- ;;
484- aarch64)
485- 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
486- ;;
487- esac
488-
489494# Lua needs to be installed for RPM to build
490495build_rpm_in_chroot_no_install lua
491496chroot_and_install_rpms lua lua
0 commit comments