From 77ee624aada863e08a1cf6a1c16f28d348ae9df7 Mon Sep 17 00:00:00 2001 From: tabris Date: Fri, 24 Oct 2025 20:24:05 -0400 Subject: [PATCH] build framework mmdebstrap - fix hashing of LEGACY_DEBOOTSTRAP --- lib/functions/artifacts/artifact-rootfs.sh | 2 +- lib/functions/rootfs/create-cache.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/functions/artifacts/artifact-rootfs.sh b/lib/functions/artifacts/artifact-rootfs.sh index 50ffc48b4a..ae1be1fa74 100644 --- a/lib/functions/artifacts/artifact-rootfs.sh +++ b/lib/functions/artifacts/artifact-rootfs.sh @@ -18,7 +18,7 @@ function artifact_rootfs_config_dump() { artifact_input_variables[LEGACY_DEBOOTSTRAP]="${LEGACY_DEBOOTSTRAP:-"no"}" # Hash of the packages added/removed by extensions declare pkgs_hash="undetermined" - pkgs_hash="$(echo "${REMOVE_PACKAGES[*]} ${EXTRA_PACKAGES_ROOTFS[*]} ${PACKAGE_LIST_BOARD_REMOVE} ${PACKAGE_LIST_FAMILY_REMOVE} ${LEGACY_DEBOOTSTRAP}" | sha256sum | cut -d' ' -f1)" + pkgs_hash="$(echo "${REMOVE_PACKAGES[*]} ${EXTRA_PACKAGES_ROOTFS[*]} ${PACKAGE_LIST_BOARD_REMOVE} ${PACKAGE_LIST_FAMILY_REMOVE}" | sha256sum | cut -d' ' -f1)" artifact_input_variables[EXTRA_PKG_ADD_REMOVE_HASH]="${pkgs_hash}" } diff --git a/lib/functions/rootfs/create-cache.sh b/lib/functions/rootfs/create-cache.sh index 2438c67ac3..a809a3e450 100644 --- a/lib/functions/rootfs/create-cache.sh +++ b/lib/functions/rootfs/create-cache.sh @@ -28,7 +28,8 @@ function calculate_rootfs_cache_id() { declare -a extension_hooks_to_hash=("custom_apt_repo") declare -a extension_hooks_hashed=("$(dump_extension_method_sources_functions "${extension_hooks_to_hash[@]}")") declare hash_hooks="undetermined" - hash_hooks="$(echo "${extension_hooks_hashed[@]}" | sha256sum | cut -d' ' -f1)" + declare legacy_debootstrap="${LEGACY_DEBOOTSTRAP:-"no"}" + hash_hooks="$(echo "${extension_hooks_hashed[@]}" LDB=${legacy_debootstrap,,} | sha256sum | cut -d' ' -f1)" declare hash_hooks_short="${hash_hooks:0:${short_hash_size}}" # AGGREGATED_ROOTFS_HASH is produced by aggregation.py