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.

4 files changed, 1 insertions, 163 deletions

diff --git a/scripts/build/bootstrap b/scripts/build/bootstrap
index 8a8293a5c..453040d7f 100755
--- a/scripts/build/bootstrap
+++ b/scripts/build/bootstrap
@@ -36,7 +36,6 @@ Setup_cleanup
 
 # Bootstrapping system
 lb bootstrap_cache restore ${@}
-lb bootstrap_cdebootstrap ${@}
 lb bootstrap_debootstrap ${@}
 lb bootstrap_archive-keys ${@}
 lb bootstrap_cache save ${@}
diff --git a/scripts/build/bootstrap_cdebootstrap b/scripts/build/bootstrap_cdebootstrap
deleted file mode 100755
index 490352b45..000000000
--- a/scripts/build/bootstrap_cdebootstrap
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2014 Daniel Baumann <mail@daniel-baumann.ch>
-##
-## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-set -e
-
-# Including common functions
-[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'bootstrap a Debian system with cdebootstrap(1)')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LB_BOOTSTRAP}" != "cdebootstrap" ] && [ "${LB_BOOTSTRAP}" != "cdebootstrap-static" ]
-then
-	exit 0
-fi
-
-if [ ! -x "$(which cdebootstrap 2>/dev/null)" ]
-then
-	echo "E: cdebootstrap - command not found"
-	echo "I: cdebootstrap can be obtained from http://ftp.debian.org/debian/pool/main/d/cdebootstrap/"
-	echo "I: On Debian based systems, cdebootstrap can be installed with 'apt-get install cdebootstrap'."
-	exit 1
-fi
-
-# Check architecture
-Check_crossarchitectures
-
-Echo_message "Begin bootstrapping system..."
-
-Check_package /usr/bin/${LB_BOOTSTRAP} cdebootstrap
-
-# Checking stage file
-Check_stagefile .build/bootstrap
-Check_stagefile .build/bootstrap_cache.restore
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Creating chroot directory
-mkdir -p chroot
-
-# Setting cdebootstrap options
-if [ -n "${LB_ARCHITECTURES}" ]
-then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURES}"
-fi
-
-if [ "${_DEBUG}" = "true" ]
-then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --debug"
-fi
-
-if [ "${_QUIET}" = "true" ]
-then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --quiet"
-fi
-
-if [ "${_VERBOSE}" = "true" ]
-then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --verbose"
-fi
-
-if [ "${LB_APT_SECURE}" = "false" ]
-then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --allow-unauthenticated"
-fi
-
-if [ -x "/usr/bin/cdebootstrap" ] || [ -x "/usr/bin/cdebootstrap-static" ]
-then
-	if [ "${LB_CACHE_PACKAGES}" = "true" ]
-	then
-		if ls cache/packages.bootstrap/*.deb > /dev/null 2>&1
-		then
-			mkdir -p chroot/var/cache/bootstrap
-			cp cache/packages.bootstrap/*.deb chroot/var/cache/bootstrap
-		fi
-
-		Echo_breakage "Running ${LB_BOOTSTRAP} (download-only)... "
-		${LB_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
-
-		# Removing old cache
-		rm -f cache/packages.bootstrap/*.deb
-
-		# Saving new cache
-		mkdir -p cache/packages.bootstrap
-		cp chroot/var/cache/bootstrap/*.deb cache/packages.bootstrap
-	fi
-
-	Echo_breakage "Running ${LB_BOOTSTRAP}... "
-
-	# Run appropriate bootstrap, i.e. foreign or regular bootstrap
-	if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" = "${LB_ARCHITECTURES}" ]; then
-
-		if [ -n "${LB_BOOTSTRAP_QEMU_EXCLUDE}" ]
-		then
-			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LB_BOOTSTRAP_QEMU_EXCLUDE} | sed 's|  *|,|g')"
-		fi
-
-		Echo_message "Bootstrap will be foreign"
-		${LB_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} --foreign "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
-
-		Echo_message "Running debootstrap second stage under QEMU"
-		cp ${LB_BOOTSTRAP_QEMU_STATIC} chroot/usr/bin
-		Chroot chroot /bin/sh /sbin/cdebootstrap-foreign
-	else
-		${LB_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}"
-	fi
-
-	# Deconfiguring cdebootstrap configurations
-	rm -f chroot/etc/apt/sources.list
-	rm -f chroot/etc/hosts
-	rm -f chroot/etc/resolv.conf
-
-	# Removing bootstrap cache
-	rm -rf chroot/var/cache/bootstrap
-
-	# Creating stage file
-	Create_stagefile .build/bootstrap
-else
-	Echo_error "Can't process file /usr/bin/${LB_BOOTSTRAP} (FIXME)"
-	exit 1
-fi
diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap
index 76fe32e39..36b441e85 100755
--- a/scripts/build/bootstrap_debootstrap
+++ b/scripts/build/bootstrap_debootstrap
@@ -24,11 +24,6 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LB_BOOTSTRAP}" != "debootstrap" ]
-then
-	exit 0
-fi
-
 if [ ! -x "$(which debootstrap 2>/dev/null)" ]
 then
 	echo "E: debootstrap - command not found"
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