leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builddeb: Skip architecture detection when KBUILD_DEBARCH is set

Browse Source 
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>
This commit is contained in:
Ben Hutchings
2018-07-26 11:20:28 +01:00
committed by Masahiro Yamada
parent 43fee2b238
commit f2abcc13e4
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/package/mkdebian
View File

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