summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2018-07-26 13:20:45 +0300
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-07-28 04:53:44 +0300
commit091d30aefc8a4d76ffa139a6e51dc237ea1cd599 (patch)
tree3c1f310fb72ec2ece85485c080311caa5f0ed9bd
parentf2abcc13e4a1b3139f1e3a0ca71bf4db8b7dfe72 (diff)
downloadlinux-091d30aefc8a4d76ffa139a6e51dc237ea1cd599.tar.xz
builddeb: Change architecture detection fallback to use dpkg-architecture
We currently use dpkg --print-architecture, which reports the architecture of the build machine. We can make a better guess than this by asking dpkg-architecture what the host architecture, i.e. the default architecture for building packages, is. This is sensitive to environment variables such as CC and DEB_HOST_ARCH, which should already be set in a cross-build environment. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
-rwxr-xr-xscripts/package/mkdebian4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index 434f0b4d5231..389bf983879d 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -42,13 +42,13 @@ set_debarch() {
fi
;;
*)
- debarch=$(dpkg --print-architecture)
+ debarch=$(dpkg-architecture -qDEB_HOST_ARCH)
echo "" >&2
echo "** ** ** WARNING ** ** **" >&2
echo "" >&2
echo "Your architecture doesn't have its equivalent" >&2
echo "Debian userspace architecture defined!" >&2
- echo "Falling back to using your current userspace instead!" >&2
+ echo "Falling back to the current host architecture ($debarch)." >&2
echo "Please add support for $UTS_MACHINE to ${0} ..." >&2
echo "" >&2
;;