From df1cea54c56ecd4ea99e2d9d5d3cb3ce075b150a Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 27 Aug 2012 14:26:08 +0200 Subject: Removing bootstrap-flavour option (Closes: #685675). live-build does too much magic that causes too much effort in maintaining for stuff that hardly everyone uses. Rather than 'translating' back and forth and maintaining compatibility between options of different debootstrap and cdebootstrap versions (and possibly any other in the future), it's is better to 'off-load' this to the user. For non-live specific options passed to the bootstrap tools, we'll be introducing --debootstrap-options and --cdebootstrap-options where users can specify their additional options passed to the respective bootstrap tool, rather than us maintaining them in a 'hardcoded' and selected list. --- scripts/build/lb_bootstrap_cdebootstrap | 5 ----- scripts/build/lb_bootstrap_debootstrap | 6 ------ scripts/build/lb_config | 12 +----------- 3 files changed, 1 insertion(+), 22 deletions(-) (limited to 'scripts/build') diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap index bb4eb6dff..0e75765a8 100755 --- a/scripts/build/lb_bootstrap_cdebootstrap +++ b/scripts/build/lb_bootstrap_cdebootstrap @@ -76,11 +76,6 @@ then CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LB_BOOTSTRAP_KEYRING}" fi -if [ -n "${LB_BOOTSTRAP_FLAVOUR}" ] -then - CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=${LB_BOOTSTRAP_FLAVOUR}" -fi - if [ "${_DEBUG}" = "true" ] then CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --debug" diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap index 1cb371f0f..5e9caf249 100755 --- a/scripts/build/lb_bootstrap_debootstrap +++ b/scripts/build/lb_bootstrap_debootstrap @@ -81,12 +81,6 @@ case "${LB_USE_FAKEROOT}" in true) DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=fakechroot" ;; - false) - if [ -n "${LB_BOOTSTRAP_FLAVOUR}" ] - then - DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=${LB_BOOTSTRAP_FLAVOUR}" - fi - ;; esac if [ "${_VERBOSE}" = "true" ] diff --git a/scripts/build/lb_config b/scripts/build/lb_config index 13a81c6b8..58f98a1e3 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -34,7 +34,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--bootappend-failsafe PARAMETER|\"PARAMETERS\"]\n\ \t [--bootloader grub|syslinux|yaboot]\n\ \t [--bootstrap cdebootstrap|cdebootstrap-static|debootstrap|copy]\n\ -\t [-f|--bootstrap-flavour minimal|standard]\n\ \t [--bootstrap-keyring PACKAGE]\n\ \t [--cache true|false]\n\ \t [--cache-indices true|false]\n\ @@ -146,7 +145,7 @@ Local_arguments () apt-pipeline:,apt-recommends:,apt-secure:,apt-source-archives:,bootstrap:,cache:,cache-indices:,cache-packages:, cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump, initramfs:,initramfs-compression:,initsystem:,fdisk:,losetup:,mode:,system:,root-command:,use-fakeroot:,tasksel:, - templates:,architectures:,bootstrap-flavour:,bootstrap-keyring:,clean, + templates:,architectures:,bootstrap-keyring:,clean, distribution:,parent-distribution:,parent-debian-installer-distribution:,parent-mirror-bootstrap:,parent-mirror-chroot:,parent-mirror-chroot-security:,parent-mirror-chroot-volatile:,parent-mirror-chroot-backports:,parent-mirror-binary:, parent-mirror-binary-security:,parent-mirror-binary-volatile:,parent-mirror-binary-backports:,parent-mirror-debian-installer:, mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-chroot-backports:,mirror-binary:, @@ -371,11 +370,6 @@ Local_arguments () shift 2 ;; - -f|--bootstrap-flavour) - LB_BOOTSTRAP_FLAVOUR="${2}" - shift 2 - ;; - --bootstrap-keyring) LB_BOOTSTRAP_KEYRING="${2}" shift 2 @@ -1107,10 +1101,6 @@ LB_BOOTSTRAP_INCLUDE="${LB_BOOTSTRAP_INCLUDE}" # (Default: empty) LB_BOOTSTRAP_EXCLUDE="${LB_BOOTSTRAP_EXCLUDE}" -# \$LB_BOOTSTRAP_FLAVOUR: select flavour to use -# (Default: empty) -LB_BOOTSTRAP_FLAVOUR="${LB_BOOTSTRAP_FLAVOUR}" - # \$LB_BOOTSTRAP_KEYRING: set distribution keyring # (Default: empty) LB_BOOTSTRAP_KEYRING="${LB_BOOTSTRAP_KEYRING}" -- cgit v1.2.3