config: obsolete old --tasksel option

note that the bit of code removed from source_debian relies upon a
variable LB_TASKS which itself is an old leftover artefact from before
v4.0.

Gbp-Dch: Short

4 files changed, 1 insertions, 21 deletions

diff --git a/functions/configuration.sh b/functions/configuration.sh
index 0c25673d6..75b2f35c6 100755
--- a/functions/configuration.sh
+++ b/functions/configuration.sh
@@ -142,8 +142,6 @@ Prepare_config ()
 		APTITUDE_OPTIONS="${APTITUDE_OPTIONS} -o APT::Color=false"
 	fi
 
-	LB_TASKSEL="${LB_TASKSEL:-apt}"
-
 	BZIP2_OPTIONS="${BZIP2_OPTIONS:--6}"
 	GZIP_OPTIONS="${GZIP_OPTIONS:--6}"
 	LZIP_OPTIONS="${LZIP_OPTIONS:--6}"
@@ -703,11 +701,6 @@ Validate_config_permitted_values ()
 		exit 1
 	fi
 
-	if ! In_list "${LB_TASKSEL}" apt aptitude tasksel; then
-		Echo_error "You have specified an invalid value for LB_TASKSEL (--tasksel)."
-		exit 1
-	fi
-
 	if ! In_list "${LB_UEFI_SECURE_BOOT}" auto enable disable; then
 		Echo_error "You have specified an invalid value for LB_UEFI_SECURE_BOOT (--uefi-secure-boot)."
 		exit 1
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index b6f263746..5975a49df 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -208,8 +208,6 @@
 .br
 	[\fB\-\-system\fR live|normal]
 .br
-	[\fB\-\-tasksel\fR apt|aptitude|tasksel]
-.br
 	[\fB\-\-uefi\-secure\-boot\fR \fIauto|enable|disable\fR]
 .br
 	[\fB\-\-updates\fR true|false]
@@ -432,8 +430,6 @@ defines the path to a swap file to create in the binary image. Default is not to
 defines what size in megabytes the swap file should be, if one is to be created. Default is 512MB.
 .IP "\fB\-\-system\fR live|normal" 4
 defines if the resulting system image should be a live system or a normal, non-live system. Defaults to live.
-.IP "\fB\-\-tasksel\fR apt|aptitude|tasksel" 4
-selects which program is used to install tasks. By default, this is set to tasksel.
 .IP "\fB\-\-uefi\-secure\-boot\fR \fIauto|enable|disable\fR" 4
 enables or disables Secure Boot support when using grub-efi, by installing signed shim and grub-efi packages. By default, this is set to auto, which means if the packages are available they will be installed, but if not only a warning will be printed and the normal non-signed grub-efi will be used.
 .IP "\fB\-\-updates\fR true|false" 4
diff --git a/scripts/build/config b/scripts/build/config
index 5690d7ad7..674026212 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -118,7 +118,6 @@ USAGE="${PROGRAM}   [--apt apt|apt-get|aptitude]\n\
 \t    [--swap-file-path PATH]\n\
 \t    [--swap-file-size MB]\n\
 \t    [--system live|normal]\n\
-\t    [--tasksel apt|aptitude|tasksel]\n\
 \t    [--uefi-secure-boot auto|enable|disable]\n\
 \t    [--updates true|false]\n\
 \t    [--validate]\n\
@@ -817,7 +816,7 @@ Local_arguments ()
 				;;
 
 			--tasksel)
-				LB_TASKSEL="${2}"
+				Echo_warning "--tasksel is an obsolete option"
 				shift 2
 				;;
 
@@ -1031,9 +1030,6 @@ LB_MODE="${LB_MODE}"
 # \$LB_SYSTEM: set system type
 LB_SYSTEM="${LB_SYSTEM}"
 
-# \$LB_TASKSEL: set tasksel program
-LB_TASKSEL="${LB_TASKSEL}"
-
 # live-build options
 
 # \$_BREAKPOINTS: enable breakpoints
diff --git a/scripts/build/source_debian b/scripts/build/source_debian
index 5e37edbca..21d4a3e5a 100755
--- a/scripts/build/source_debian
+++ b/scripts/build/source_debian
@@ -98,11 +98,6 @@ case "${LB_ARCHITECTURES}" in
 		;;
 esac
 
-if [ -n "${LB_TASKS}" ]
-then
-	echo "${LB_TASKSEL}" >> source-selection.txt
-fi
-
 # Make a clean directory to download the packages to.
 # We need to set the ownership to user `_apt` to give write access to the apt user,
 # otherwise we get a lot of warnings from apt about downloading as root.