[SCM] live-build branch, debian-next, updated. debian/3.0_a21-1-2-g65ac1c6
Daniel Baumann
daniel at debian.org
Tue Jun 14 10:14:13 UTC 2011
The following commit has been merged in the debian-next branch:
commit 65ac1c651c517deb260389b8b9c374741a594bbd
Author: Colin Watson <cjwatson at canonical.com>
Date: Tue Jun 14 12:14:14 2011 +0200
Make --architectures armel only fail if --linux-flavours was not passed (Closes: #630464).
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 4379704..67b34e4 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -593,9 +593,12 @@ Set_defaults ()
# Setting linux flavour string
case "${LB_ARCHITECTURES}" in
armel)
- Echo_error "There is no default kernel flavour defined for your architecture."
- Echo_error "Please configure it manually with 'lb config -k FLAVOUR'."
- exit 1
+ if [ -z "${LB_LINUX_FLAVOURS}" ]
+ then
+ Echo_error "There is no default kernel flavour defined for your architecture."
+ Echo_error "Please configure it manually with 'lb config -k FLAVOUR'."
+ exit 1
+ fi
;;
amd64)
--
live-build
More information about the debian-live-changes
mailing list