From c47686cdc1fff9662e92390e027fcd18bfab3a01 Mon Sep 17 00:00:00 2001 From: Sergei Radich Date: Mon, 9 Mar 2026 13:34:27 +0100 Subject: [PATCH 1/3] Moved libicu installation from helper script to toolset --- images/ubuntu/scripts/build/configure-dpkg.sh | 11 ----------- images/ubuntu/toolsets/toolset-2404.json | 1 + 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/images/ubuntu/scripts/build/configure-dpkg.sh b/images/ubuntu/scripts/build/configure-dpkg.sh index bff62a932d..a7c6ee55e4 100644 --- a/images/ubuntu/scripts/build/configure-dpkg.sh +++ b/images/ubuntu/scripts/build/configure-dpkg.sh @@ -6,7 +6,6 @@ # Source the helpers for use with the script source $HELPER_SCRIPTS/etc-environment.sh -source $HELPER_SCRIPTS/os.sh # This is the anti-frontend. It never interacts with you at all, # and makes the default answers be used for all questions. It # might mail error messages to root, but that's it; otherwise it @@ -30,13 +29,3 @@ cat <> /etc/apt/apt.conf.d/10apt-autoremove APT::Get::AutomaticRemove "0"; APT::Get::HideAutoRemove "1"; EOF - -# Install libicu70 package for Ubuntu 24 -if is_ubuntu24 ; then - wget https://archive.ubuntu.com/ubuntu/pool/main/i/icu/libicu70_70.1-2_amd64.deb - - EXPECTED_LIBICU_SHA512="a6315482d93606e375c272718d2458870b95e4ed4b672ea8640cf7bc2d2c2f41aea13b798b1e417e1ffc472a90c6aad150d3d293aa9bddec48e39106e4042807" - ACTUAL_LIBICU_SHA512="$(sha512sum "./libicu70_70.1-2_amd64.deb" | awk '{print $1}')" - [ "$EXPECTED_LIBICU_SHA512" = "$ACTUAL_LIBICU_SHA512" ] || { echo "libicu checksum mismatch in configure-dpkg.sh"; exit 1;} - sudo apt-get install -y ./libicu70_70.1-2_amd64.deb -fi diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index a4e3add97d..813238c734 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -132,6 +132,7 @@ "gnupg2", "iproute2", "iputils-ping", + "libicu", "libyaml-dev", "libtool", "libssl-dev", From 93dc1c21e5a21fb2ebb0f840f5f54a21a897c02b Mon Sep 17 00:00:00 2001 From: Sergei Radich Date: Mon, 9 Mar 2026 15:15:31 +0100 Subject: [PATCH 2/3] Fixed package name --- images/ubuntu/toolsets/toolset-2404.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index 5bc3bafc7f..d753682419 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -132,7 +132,7 @@ "gnupg2", "iproute2", "iputils-ping", - "libicu", + "libicu-dev", "libyaml-dev", "libtool", "libssl-dev", From 21ae7f68473ae1c52d9c1c56cf0eb59e1ff0b384 Mon Sep 17 00:00:00 2001 From: Sergei Radich Date: Tue, 10 Mar 2026 10:04:50 +0100 Subject: [PATCH 3/3] Removed libicu from toolset --- images/ubuntu/toolsets/toolset-2404.json | 1 - 1 file changed, 1 deletion(-) diff --git a/images/ubuntu/toolsets/toolset-2404.json b/images/ubuntu/toolsets/toolset-2404.json index d753682419..f5b11bdd53 100644 --- a/images/ubuntu/toolsets/toolset-2404.json +++ b/images/ubuntu/toolsets/toolset-2404.json @@ -132,7 +132,6 @@ "gnupg2", "iproute2", "iputils-ping", - "libicu-dev", "libyaml-dev", "libtool", "libssl-dev",