Revert "Debootstrap is again too old for latest releases. Lets ship currently latest with and install it when we build distros that needs it."

This reverts commit 7b61b05867.
This commit is contained in:
Ricardo Pardini
2024-03-02 11:28:51 +01:00
committed by Igor
parent 88ed514b89
commit 34bfa92052
3 changed files with 5 additions and 10 deletions

View File

@@ -72,17 +72,12 @@ function create_new_rootfs_cache_via_debootstrap() {
"'--components=${AGGREGATED_DEBOOTSTRAP_COMPONENTS_COMMA}'" # from aggregation.py "'--components=${AGGREGATED_DEBOOTSTRAP_COMPONENTS_COMMA}'" # from aggregation.py
) )
# Hacking deboostrap to support future releases # Hacking debootstrap to support future releases as symlink is often the only change, so we don't need to bump host OS
# Install most recent version from build framework blob section # This functionality is coming with debootstrap v1.0.128 (Mantic)
local debootstrap_home="/usr/share/debootstrap/scripts" local debootstrap_home="/usr/share/debootstrap/scripts"
if [[ ! -L "${debootstrap_home}/${RELEASE}" && ! -e "${debootstrap_home}/${RELEASE}" && "$(debootstrap --version)" != *1.0.134* ]]; then if [[ ! -L "${debootstrap_home}/${RELEASE}" && ! -e "${debootstrap_home}/${RELEASE}" ]]; then
display_alert "Installing new version of deboostrap to the host" "${HOSTRELEASE}" "wrn" display_alert "Making symlink as host deboostrap is missing it" "" "wrn"
if [[ "$(cat /etc/os-release | grep "^ID=" | cut -d"=" -f2)" == "ubuntu" ]]; then run_host_command_logged ln -s "${DEBOOTSTRAP_SOURCE}" "${debootstrap_home}/${RELEASE}"
run_host_command_logged dpkg -i "${SRC}/packages/blobs/debootstrap/debootstrap_1.0.134ubuntu1_all.deb"
else
run_host_command_logged dpkg -i "${SRC}/packages/blobs/debootstrap/debootstrap_1.0.134_all.deb"
fi
run_host_command_logged apt -f install
fi fi
# Small detour for local apt caching option. # Small detour for local apt caching option.