From b814f4e07e392397f5c4eec5981809ccd07d4fad Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 23 Dec 2014 22:53:24 +0100 Subject: Dropping cdebootstrap support (Closes: #773657). debootstrap is the official tool to bootstrap debian, cdebootstrap has had the one or other bug making it broken for times during the release cycles. The extra effort of supporting both debootstrap and cdebootstrap is hardly worth it since the bootstrap stage is cached anyway. --- scripts/build/config | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'scripts/build/config') diff --git a/scripts/build/config b/scripts/build/config index 6a57f4df1..c3e6bcfe0 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -33,7 +33,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\ \t [--bootappend-live-failsafe PARAMETER|\"PARAMETERS\"]\n\ \t [--bootloader grub|grub2|syslinux]\n\ -\t [--bootstrap cdebootstrap|cdebootstrap-static|debootstrap]\n\ \t [--cache true|false]\n\ \t [--cache-indices true|false]\n\ \t [--cache-packages true|false]\n\ @@ -127,7 +126,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ Local_arguments () { - LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-options:,aptitude-options:,debootstrap-options:,cdebootstrap-options:, + LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-options:,aptitude-options:,debootstrap-options:, apt-pipeline:,apt-recommends:,apt-secure:,apt-source-archives:,bootstrap:,cache:,cache-indices:,cache-packages:, cache-stages:,debconf-frontend:,debconf-priority:,dump, initramfs:,initramfs-compression:,initsystem:,fdisk:,losetup:,mode:,system:,tasksel:, @@ -255,21 +254,11 @@ Local_arguments () shift 2 ;; - --bootstrap) - LB_BOOTSTRAP="${2}" - shift 2 - ;; - --debootstrap-options) DEBOOTSTRAP_OPTIONS="${2}" shift 2 ;; - --cdebootstrap-options) - CDEBOOTSTRAP_OPTIONS="${2}" - shift 2 - ;; - --cache) LB_CACHE="${2}" shift 2 @@ -921,10 +910,6 @@ LB_APT_SECURE="${LB_APT_SECURE}" # (Default: ${LB_APT_SOURCE_ARCHIVES}) LB_APT_SOURCE_ARCHIVES="${LB_APT_SOURCE_ARCHIVES}" -# \$LB_BOOTSTRAP: set bootstrap program -# (Default: ${LB_BOOTSTRAP}) -LB_BOOTSTRAP="${LB_BOOTSTRAP}" - # \$LB_CACHE: control cache # (Default: ${LB_CACHE}) LB_CACHE="${LB_CACHE}" @@ -1015,7 +1000,6 @@ _QUIET="${_QUIET}" APT_OPTIONS="${APT_OPTIONS}" APTITUDE_OPTIONS="${APTITUDE_OPTIONS}" DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS}" -CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS}" GZIP_OPTIONS="${GZIP_OPTIONS}" ISOHYBRID_OPTIONS="${ISOHYBRID_OPTIONS}" EOF -- cgit v1.2.3