JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

debootstrap: Partially revert f2e663f0 "Improved debootstrap hacking support with fixes for Ubuntu Noble"

Browse Source
This commit is contained in:
Ricardo Pardini
2024-03-02 12:18:01 +01:00
committed by Igor
parent 34bfa92052
commit e37525d234
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/functions/configuration/main-config.sh
View File

@@ -303,10 +303,8 @@ function do_extra_configuration() {
if [[ "$RELEASE" =~ ^(focal|jammy|kinetic|lunar|mantic|noble)$ ]]; then
DISTRIBUTION="Ubuntu"
DEBOOTSTRAP_SOURCE="gutsy"
else
DISTRIBUTION="Debian"
DEBOOTSTRAP_SOURCE="sid"
fi
DEBIAN_MIRROR='deb.debian.org/debian'

8
lib/functions/rootfs/rootfs-create.sh
View File

@@ -72,14 +72,6 @@ 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