Bug#630464: --architectures armel fails unconditionally
Package: live-build
Version: 3.0~a21-1
Severity: normal
Tags: patch
User: ubuntu-devel@lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch oneiric
functions/defaults.sh exits 1 in the '--architectures armel' case,
saying that you need to use -k/--linux-flavours. It should only do this
if --linux-flavours wasn't passed. Patch attached.
Thanks,
--
Colin Watson [cjwatson@ubuntu.com]
>From 7a59a2f54831167f6b352cd616cf51ed4d652bd6 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@canonical.com>
Date: Tue, 14 Jun 2011 09:02:30 +0100
Subject: [PATCH] Make --architectures armel only fail if --linux-flavours was
not passed.
---
functions/defaults.sh | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 4379704..915c90f 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -593,9 +593,11 @@ 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)
--
1.7.5.4
Reply to: