All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ben Hutchings <ben@decadent.org.uk>
To: linux-kbuild@vger.kernel.org
Cc: debian-kernel@lists.debian.org
Subject: [PATCH 02/12] builddeb: Change architecture detection fallback to use dpkg-architecture
Date: Thu, 26 Jul 2018 11:20:45 +0100	[thread overview]
Message-ID: <20180726102045.GV14131@decadent.org.uk> (raw)
In-Reply-To: <20180726101934.GT14131@decadent.org.uk>

[-- Attachment #1: Type: text/plain, Size: 1238 bytes --]

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
 		;;


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

  parent reply	other threads:[~2018-07-26 11:36 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-26 10:19 [PATCH 00/12] Update architecture detection Ben Hutchings
2018-07-26 10:20 ` [PATCH 01/12] builddeb: Skip architecture detection when KBUILD_DEBARCH is set Ben Hutchings
2018-07-26 10:20 ` Ben Hutchings [this message]
2018-07-26 10:20 ` [PATCH 03/12] builddeb: Drop check for 32-bit s390 Ben Hutchings
2018-07-26 10:21 ` [PATCH 04/12] builddeb: Introduce functions to simplify kconfig tests in set_debarch Ben Hutchings
2018-07-26 10:21 ` [PATCH 05/12] builddeb: Add automatic support for ppc64 and powerpcspe architectures Ben Hutchings
2018-07-26 10:21 ` [PATCH 06/12] builddeb: Add automatic support for mips64el architecture Ben Hutchings
2018-07-26 10:22 ` [PATCH 07/12] builddeb: Add automatic support for mips{,64}r6{,el} architectures Ben Hutchings
2018-07-26 10:22 ` [PATCH 08/12] builddeb: Add automatic support for sparc64 architecture Ben Hutchings
2018-07-26 10:22 ` [PATCH 09/12] builddeb: Add automatic support for or1k architecture Ben Hutchings
2018-07-26 10:22 ` [PATCH 10/12] builddeb: Add automatic support for m68k architecture Ben Hutchings
2018-07-26 10:22 ` [PATCH 11/12] builddeb: Add automatic support for riscv* architectures Ben Hutchings
2018-07-26 10:22 ` [PATCH 12/12] builddeb: Add automatic support for sh{3,4}{,eb} architectures Ben Hutchings
2018-08-01 23:10 ` [PATCH 00/12] Update architecture detection Masahiro Yamada

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180726102045.GV14131@decadent.org.uk \
    --to=ben@decadent.org.uk \
    --cc=debian-kernel@lists.debian.org \
    --cc=linux-kbuild@vger.kernel.org \
    --subject='Re: [PATCH 02/12] builddeb: Change architecture detection fallback to use dpkg-architecture' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.