Skip to content

Commit c841b33

Browse files
authored
[3.0] msopenjdk: update to latest prod version and add hash verification (#… (#10019)
1 parent d42aff8 commit c841b33

5 files changed

Lines changed: 20 additions & 15 deletions

File tree

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ newt-0.52.23-1.azl3.aarch64.rpm
248248
newt-lang-0.52.23-1.azl3.aarch64.rpm
249249
chkconfig-1.25-1.azl3.aarch64.rpm
250250
chkconfig-lang-1.25-1.azl3.aarch64.rpm
251-
msopenjdk-17-17.0.11-1.aarch64.rpm
251+
msopenjdk-17-17.0.12-1.aarch64.rpm
252252
pyproject-rpm-macros-1.12.0-2.azl3.noarch.rpm
253253
pyproject-srpm-macros-1.12.0-2.azl3.noarch.rpm
254254
python3-rpm-generators-14-11.azl3.noarch.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ newt-0.52.23-1.azl3.x86_64.rpm
248248
newt-lang-0.52.23-1.azl3.x86_64.rpm
249249
chkconfig-1.25-1.azl3.x86_64.rpm
250250
chkconfig-lang-1.25-1.azl3.x86_64.rpm
251-
msopenjdk-17-17.0.11-1.x86_64.rpm
251+
msopenjdk-17-17.0.12-1.x86_64.rpm
252252
pyproject-rpm-macros-1.12.0-2.azl3.noarch.rpm
253253
pyproject-srpm-macros-1.12.0-2.azl3.noarch.rpm
254254
python3-rpm-generators-14-11.azl3.noarch.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ meson-1.3.1-1.azl3.noarch.rpm
256256
mpfr-4.2.1-1.azl3.aarch64.rpm
257257
mpfr-debuginfo-4.2.1-1.azl3.aarch64.rpm
258258
mpfr-devel-4.2.1-1.azl3.aarch64.rpm
259-
msopenjdk-17-17.0.11-1.aarch64.rpm
259+
msopenjdk-17-17.0.12-1.aarch64.rpm
260260
ncurses-6.4-2.azl3.aarch64.rpm
261261
ncurses-compat-6.4-2.azl3.aarch64.rpm
262262
ncurses-debuginfo-6.4-2.azl3.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ meson-1.3.1-1.azl3.noarch.rpm
262262
mpfr-4.2.1-1.azl3.x86_64.rpm
263263
mpfr-debuginfo-4.2.1-1.azl3.x86_64.rpm
264264
mpfr-devel-4.2.1-1.azl3.x86_64.rpm
265-
msopenjdk-17-17.0.11-1.x86_64.rpm
265+
msopenjdk-17-17.0.12-1.x86_64.rpm
266266
ncurses-6.4-2.azl3.x86_64.rpm
267267
ncurses-compat-6.4-2.azl3.x86_64.rpm
268268
ncurses-debuginfo-6.4-2.azl3.x86_64.rpm

toolkit/scripts/toolchain/build_official_toolchain_rpms.sh

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,22 @@ start_record_timestamp "build packages"
345345
start_record_timestamp "build packages/build"
346346
start_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+
348364
echo Building final list of toolchain RPMs
349365
build_rpm_in_chroot_no_install azurelinux-rpm-macros
350366
chroot_and_install_rpms azurelinux-rpm-macros
@@ -475,17 +491,6 @@ chroot_and_install_rpms python-setuptools python3-setuptools
475491
build_rpm_in_chroot_no_install libxml2
476492
chroot_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
490495
build_rpm_in_chroot_no_install lua
491496
chroot_and_install_rpms lua lua

0 commit comments

Comments
 (0)