diff --git a/lib/functions/rootfs/rootfs-create.sh b/lib/functions/rootfs/rootfs-create.sh index 59d57e10b..145779125 100644 --- a/lib/functions/rootfs/rootfs-create.sh +++ b/lib/functions/rootfs/rootfs-create.sh @@ -72,17 +72,12 @@ function create_new_rootfs_cache_via_debootstrap() { "'--components=${AGGREGATED_DEBOOTSTRAP_COMPONENTS_COMMA}'" # from aggregation.py ) - # Hacking deboostrap to support future releases - # Install most recent version from build framework blob section + # 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}" && "$(debootstrap --version)" != *1.0.134* ]]; then - display_alert "Installing new version of deboostrap to the host" "${HOSTRELEASE}" "wrn" - if [[ "$(cat /etc/os-release | grep "^ID=" | cut -d"=" -f2)" == "ubuntu" ]]; then - 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 + 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. diff --git a/packages/blobs/debootstrap/debootstrap_1.0.134_all.deb b/packages/blobs/debootstrap/debootstrap_1.0.134_all.deb deleted file mode 100644 index fe305222e..000000000 Binary files a/packages/blobs/debootstrap/debootstrap_1.0.134_all.deb and /dev/null differ diff --git a/packages/blobs/debootstrap/debootstrap_1.0.134ubuntu1_all.deb b/packages/blobs/debootstrap/debootstrap_1.0.134ubuntu1_all.deb deleted file mode 100644 index ba8dd0f03..000000000 Binary files a/packages/blobs/debootstrap/debootstrap_1.0.134ubuntu1_all.deb and /dev/null differ