From patchwork Thu Nov  4 03:44:04 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: =?utf-8?q?Asbj=C3=B8rn_Sloth_T=C3=B8nnesen?=
 <asbjorn@asbjorn.biz>
X-Patchwork-Id: 300972
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oA43iZgu012256
	for <patchwork-kbuild@patchwork.kernel.org>;
	Thu, 4 Nov 2010 03:44:35 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753938Ab0KDDoe (ORCPT
	<rfc822;patchwork-kbuild@patchwork.kernel.org>);
	Wed, 3 Nov 2010 23:44:34 -0400
Received: from mail.asbjorn.biz ([217.195.185.3]:47087 "EHLO
	mail.asbjorn.biz"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753477Ab0KDDoe (ORCPT <rfc822;linux-kbuild@vger.kernel.org>);
	Wed, 3 Nov 2010 23:44:34 -0400
Received: from asbjorn.it (cpe.xe-4-0-0-472.boanqu2.customer.tele.dk
	[62.243.45.94])
	by mail.asbjorn.biz (Postfix) with ESMTPA id 2E79A1C000A8;
	Thu,  4 Nov 2010 04:44:33 +0100 (CET)
Received: by asbjorn.it (Postfix, from userid 1000)
	id AF8B710726E2; Thu,  4 Nov 2010 03:44:32 +0000 (UTC)
From: Asbjoern Sloth Toennesen <asbjorn@asbjorn.biz>
To: Michal Marek <mmarek@suse.cz>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
	debian-kernel@lists.debian.org
Subject: [PATCH] kbuild, deb-pkg: fix Architecture field when cross compiling
Date: Thu,  4 Nov 2010 03:44:04 +0000
Message-Id: <1288842244-6863-1-git-send-email-asbjorn@asbjorn.biz>
X-Mailer: git-send-email 1.7.2.3
In-Reply-To: <4CD22ACF.1000407@asbjorn.it>
References: <4CD22ACF.1000407@asbjorn.it>
Sender: linux-kbuild-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kbuild.vger.kernel.org>
X-Mailing-List: linux-kbuild@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Thu, 04 Nov 2010 03:44:35 +0000 (UTC)


diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 5f1e2fc..43b8826 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -25,8 +25,23 @@ create_package() {
 	chown -R root:root "$pdir"
 	chmod -R go-w "$pdir"
 
+	# Attempt to find the correct Debian architecture
+	local forcearch="" debarch=""
+	case "$ARCH" in
+	i386|ia64)
+		debarch="$ARCH" ;;
+	x86_64)
+		debarch="amd64" ;;
+	*)
+		grep -q CONFIG_ARM=y .config &&
+			debarch=arm$(grep -q CONFIG_AEABI=y .config && echo el)
+	esac
+	if [ -n "$debarch" ] ; then
+		forcearch="-DArchitecture=$debarch"
+	fi
+
 	# Create the package
-	dpkg-gencontrol -isp -p$pname -P"$pdir"
+	dpkg-gencontrol -isp $forcearch -p$pname -P"$pdir"
 	dpkg --build "$pdir" ..
 }