[01/12] builddeb: Skip architecture detection when KBUILD_DEBARCH is set
diff mbox series

Message ID 20180726102028.GU14131@decadent.org.uk
State New
Headers show
Series
  • Update architecture detection
Related show

Commit Message

Ben Hutchings July 26, 2018, 10:20 a.m. UTC
If KBUILD_DEBARCH is set then we will not use the result of
architecture detection, and we may also warn unnecessarily.
Move the check for KBUILD_DEBARCH further up to avoid this.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 scripts/package/mkdebian | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Patch
diff mbox series

diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index 985d72d1ab34..434f0b4d5231 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -7,6 +7,11 @@ 
 set -e
 
 set_debarch() {
+	if [ -n "$KBUILD_DEBARCH" ] ; then
+		debarch="$KBUILD_DEBARCH"
+		return
+	fi
+
 	# Attempt to find the correct Debian architecture
 	case "$UTS_MACHINE" in
 	i386|ia64|alpha)
@@ -46,10 +51,8 @@  set_debarch() {
 		echo "Falling back to using your current userspace instead!" >&2
 		echo "Please add support for $UTS_MACHINE to ${0} ..." >&2
 		echo "" >&2
+		;;
 	esac
-	if [ -n "$KBUILD_DEBARCH" ] ; then
-		debarch="$KBUILD_DEBARCH"
-	fi
 }
 
 # Some variables and settings used throughout the script