From patchwork Fri Nov  5 13:30:08 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: 304092
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 oA5DUN1h014799
	for <patchwork-kbuild@patchwork.kernel.org>;
	Fri, 5 Nov 2010 13:30:23 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754522Ab0KENaW (ORCPT
	<rfc822;patchwork-kbuild@patchwork.kernel.org>);
	Fri, 5 Nov 2010 09:30:22 -0400
Received: from mail.asbjorn.biz ([217.195.185.3]:43717 "EHLO
	mail.asbjorn.biz"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751782Ab0KENaW (ORCPT <rfc822;linux-kbuild@vger.kernel.org>);
	Fri, 5 Nov 2010 09:30:22 -0400
Received: from asbjorn.it (unknown [178.209.166.5])
	by mail.asbjorn.biz (Postfix) with ESMTPA id CA0261C000AA;
	Fri,  5 Nov 2010 14:30:20 +0100 (CET)
Received: by asbjorn.it (Postfix, from userid 1000)
	id 730F1106C8D7; Fri,  5 Nov 2010 13:30:20 +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: select userland architecture based on UTS_MACHINE
Date: Fri,  5 Nov 2010 13:30:08 +0000
Message-Id: <1288963808-7057-1-git-send-email-asbjorn@asbjorn.biz>
X-Mailer: git-send-email 1.7.2.3
In-Reply-To: <4CD406C7.8090801@asbjorn.biz>
References: <4CD406C7.8090801@asbjorn.biz>
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]);
	Fri, 05 Nov 2010 13:30:23 +0000 (UTC)


diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 5f1e2fc..0043ccd 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -25,8 +25,41 @@ create_package() {
 	chown -R root:root "$pdir"
 	chmod -R go-w "$pdir"
 
+	# Attempt to find the correct Debian architecture
+	local forcearch="" debarch=""
+	case "$UTS_MACHINE" in
+	i386|ia64|alpha)
+		debarch="$UTS_MACHINE" ;;
+	x86_64)
+		debarch=amd64 ;;
+	sparc*)
+		debarch=sparc ;;
+	s390*)
+		debarch=s390 ;;
+	ppc*)
+		debarch=powerpc ;;
+	parisc*)
+		debarch=hppa ;;
+	mips*)
+		debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y .config && echo el) ;;
+	arm*)
+		debarch=arm$(grep -q CONFIG_AEABI=y .config && echo el) ;;
+	*)
+		echo "" >&2
+		echo "** ** **  WARNING  ** ** **" >&2
+		echo "" >&2
+		echo "Your architecture doesn't have it's equivalent" >&2
+		echo "Debian userspace architecture defined!" >&2
+		echo "Falling back to using your current userspace instead!" >&2
+		echo "Please add support for $UTS_MACHINE to ${0} ..." >&2
+		echo "" >&2
+	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" ..
 }