From 65ac1c651c517deb260389b8b9c374741a594bbd Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 14 Jun 2011 12:14:14 +0200 Subject: [PATCH] Make --architectures armel only fail if --linux-flavours was not passed (Closes: #630464). --- functions/defaults.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/functions/defaults.sh b/functions/defaults.sh index 4379704ff..67b34e43a 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)