Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.kernel > #61605

[PATCH 02/12] builddeb: Change architecture detection fallback to use dpkg-architecture

Show all headers | View raw

[Multipart message — attachments visible in raw view] - view raw

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>
---
 scripts/package/mkdebian | 4 ++--
 1 file 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
 		;;

Back to linux.debian.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/12] Update architecture detection Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:20 +0200
  [PATCH 01/12] builddeb: Skip architecture detection when  KBUILD_DEBARCH is set Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 05/12] builddeb: Add automatic support for ppc64 and  powerpcspe architectures Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 04/12] builddeb: Introduce functions to simplify kconfig  tests in set_debarch Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 12/12] builddeb: Add automatic support for sh{3,4}{,eb}  architectures Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 02/12] builddeb: Change architecture detection fallback to  use dpkg-architecture Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 11/12] builddeb: Add automatic support for riscv*  architectures Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 10/12] builddeb: Add automatic support for m68k architecture Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 06/12] builddeb: Add automatic support for mips64el  architecture Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 08/12] builddeb: Add automatic support for sparc64  architecture Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 07/12] builddeb: Add automatic support for mips{,64}r6{,el}  architectures Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 09/12] builddeb: Add automatic support for or1k architecture Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  [PATCH 03/12] builddeb: Drop check for 32-bit s390 Ben Hutchings <ben@decadent.org.uk> - 2018-07-26 12:30 +0200
  Re: [PATCH 00/12] Update architecture detection Masahiro Yamada <yamada.masahiro@socionext.com> - 2018-08-02 01:50 +0200

csiph-web