Improved debootstrap hacking support with fixes for Ubuntu Noble (#6076)

* Remove extension for patching Deboostrap to support Ubuntu Noble
* Integrate Deboostrap patching to the build script
* fix problems related to Noble
This commit is contained in:
Igor
2023-12-22 08:04:55 +01:00
committed by GitHub
parent b8cd5dc4fe
commit f2e663f087
34 changed files with 35 additions and 19 deletions

View File

@@ -72,6 +72,14 @@ function create_new_rootfs_cache_via_debootstrap() {
"'--components=${AGGREGATED_DEBOOTSTRAP_COMPONENTS_COMMA}'" # from aggregation.py
)
# Hacking debootstrap to support future releases as symlink is often the only change, so we don't need to bump host OS
# This functionality is coming with debootstrap v1.0.128 (Mantic)
local debootstrap_home="/usr/share/debootstrap/scripts"
if [[ ! -L "${debootstrap_home}/${RELEASE}" && ! -e "${debootstrap_home}/${RELEASE}" ]]; then
display_alert "Making symlink as host deboostrap is missing it" "" "wrn"
run_host_command_logged ln -s "${DEBOOTSTRAP_SOURCE}" "${debootstrap_home}/${RELEASE}"
fi
# Small detour for local apt caching option.
local_apt_deb_cache_prepare "before debootstrap" # sets LOCAL_APT_CACHE_INFO
if [[ "${LOCAL_APT_CACHE_INFO[USE]}" == "yes" ]]; then