[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH] Added --flavour option to lb config.



The flavour option allows an arbitrary "build flavour" to be set, and is
intended for use in package list conditionals.
---
 functions/defaults.sh |  3 +++
 scripts/build/config  | 12 +++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/functions/defaults.sh b/functions/defaults.sh
index a0cb968..e7a85d6 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -508,6 +508,9 @@ Set_defaults ()
 			;;
 	esac
 
+	# Set build flavour
+	LB_FLAVOUR="${LB_FLAVOUR-}"
+
 	## config/binary
 
 	# Setting image filesystem
diff --git a/scripts/build/config b/scripts/build/config
index e5810b4..aeee2b6 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -57,6 +57,7 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--parent-debian-installer-distribution CODENAME]\n\
 \t    [--dump]\n\
 \t    [--fdisk fdisk|fdisk.dist]\n\
+\t    [--flavour FLAVOUR]\n\
 \t    [--force]\n\
 \t    [--grub-splash FILE]\n\
 \t    [--gzip-options OPTION|\"OPTIONS\"]\n\
@@ -137,7 +138,7 @@ Local_arguments ()
 		mirror-binary-security:,mirror-debian-installer:,
 		archive-areas:,parent-archive-areas:,chroot-filesystem:,
 		gzip-options:,image-name:,interactive:,keyring-packages:,linux-flavours:,linux-packages:,
-		security:,updates:,backports:,binary-filesystem:,binary-images:,
+		security:,updates:,backports:,flavour:,binary-filesystem:,binary-images:,
 		apt-indices:,bootappend-install:,bootappend-live:,bootappend-live-failsafe:,bootloaders:,checksums:,compression:,config:,zsync:,build-with-chroot:,
 		debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:,
 		grub-splash:,isohybrid-options:,hdd-label:,hdd-size:,hdd-partition-start:,iso-application:,iso-preparer:,iso-publisher:,
@@ -466,6 +467,11 @@ Local_arguments ()
 				shift 2
 				;;
 
+			--flavour)
+				LB_FLAVOUR="${2}"
+				shift 2
+				;;
+
 			# config/binary
 			--binary-filesystem)
 				LB_BINARY_FILESYSTEM="${2}"
@@ -1123,6 +1129,10 @@ LB_UPDATES="${LB_UPDATES}"
 # \$LB_BACKPORTS: enable backports updates
 # (Default: ${LB_BACKPORTS})
 LB_BACKPORTS="${LB_BACKPORTS}"
+
+# \$LB_FLAVOUR: set build flavour
+# (Default: ${LB_FLAVOUR})
+LB_FLAVOUR="${LB_FLAVOUR}"
 EOF
 
 # Creating lb_binary_* configuration
-- 
2.1.4


Reply to: