summaryrefslogtreecommitdiff
path: root/scripts/package
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2018-07-26 11:20:28 +0100
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-07-28 10:53:44 +0900
commitf2abcc13e4a1b3139f1e3a0ca71bf4db8b7dfe72 (patch)
tree147a50822895445cd456416ab6d91f5dca1c4103 /scripts/package
parent43fee2b238959a7b46e2e8c0cd3305c7c044ded8 (diff)
builddeb: Skip architecture detection when KBUILD_DEBARCH is set
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> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts/package')
-rwxr-xr-xscripts/package/mkdebian9
1 files changed, 6 insertions, 3 deletions
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