From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <Ian.Campbell@citrix.com>
Subject: Re: [PATCH v2] mkdeb: correctly map package
 architectures for x86 and ARM
Date: Wed, 12 Nov 2014 15:43:46 +0000
Message-ID: <1415807026.1155.21.camel@citrix.com>
References: <1415806728-28484-1-git-send-email-clark.laughlin@linaro.org>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta14.messagelabs.com ([193.109.254.103])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <Ian.Campbell@citrix.com>) id 1Xoa5J-00016e-Go
	for xen-devel@lists.xenproject.org; Wed, 12 Nov 2014 15:43:53 +0000
In-Reply-To: <1415806728-28484-1-git-send-email-clark.laughlin@linaro.org>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Clark Laughlin <clark.laughlin@linaro.org>
Cc: xen-devel@lists.xenproject.org
List-Id: xen-devel@lists.xenproject.org

On Wed, 2014-11-12 at 09:38 -0600, Clark Laughlin wrote:
> mkdeb previously set the package architecture to be 'amd64' for anything other than
> XEN_TARGET_ARCH=x86_32.  This patch attempts to correctly map the architecture from
> GNU names to debian names for x86 and ARM architectures, or otherwise, defaults it
> to the value in XEN_TARGET_ARCH.
> 
> Signed-off-by: Clark Laughlin <clark.laughlin@linaro.org>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

> ---
> Changed since v1: corrected commit message / subject
> ---
>  tools/misc/mkdeb | 15 ++++++++++-----
>  1 file changed, 10 insertions(+), 5 deletions(-)
> 
> diff --git a/tools/misc/mkdeb b/tools/misc/mkdeb
> index 3bbf881..4d14d9e 100644
> --- a/tools/misc/mkdeb
> +++ b/tools/misc/mkdeb
> @@ -13,11 +13,16 @@ fi
>  
>  cd $1
>  version=$2
> -if test "$XEN_TARGET_ARCH" = "x86_32"; then
> -  arch=i386
> -else
> -  arch=amd64
> -fi
> +
> +# map the architecture, if necessary
> +arch=$XEN_TARGET_ARCH
> +case "$XEN_TARGET_ARCH" in
> +  x86_32)  arch=i386 ;;
> +  i686)    arch=i386 ;;
> +  x86_64)  arch=amd64 ;;
> +  arm32)   arch=armhf ;;
> +  aarch64) arch=arm64 ;;
> +esac
>  
>  # Prepare the directory to package
>  cd dist