From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konrad Rzeszutek Wilk Subject: Re: [PATCH v2] mkdeb: correctly map package architectures for x86 and ARM Date: Wed, 19 Nov 2014 14:45:15 -0500 Message-ID: <20141119194515.GB18117@laptop.dumpdata.com> References: <1415806728-28484-1-git-send-email-clark.laughlin@linaro.org> <1415807026.1155.21.camel@citrix.com> <1415959858.21321.23.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XrBBx-0002r6-HC for xen-devel@lists.xenproject.org; Wed, 19 Nov 2014 19:45:29 +0000 Content-Disposition: inline In-Reply-To: <1415959858.21321.23.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell Cc: Wei Liu , Clark Laughlin , Ian Jackson , xen-devel@lists.xenproject.org, Tim Deegan List-Id: xen-devel@lists.xenproject.org On Fri, Nov 14, 2014 at 10:10:58AM +0000, Ian Campbell wrote: > (CCing some more maintainers and the release manager) > > On Wed, 2014-11-12 at 15:43 +0000, Ian Campbell wrote: > > 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 > > > > Acked-by: Ian Campbell > > Actually thinking about it some more I'd be happier arguing for a freeze > exception for something like the below which only handles the actual > valid values of XEN_TARGET_ARCH and not the GNU names (which cannot > happen) and prints an error for unknown architectures (so new ports > aren't bitten in the future, etc). > > Konrad, wrt the freeze I think this is low risk for breaking x86 > platforms and makes things work for arm, so is worth it. Release-Acked-by: Konrad Rzeszutek Wilk > > ------ > > >From d861e1bcf5c3530ef322515ec2c55031dd538277 Mon Sep 17 00:00:00 2001 > From: Clark Laughlin > Date: Wed, 12 Nov 2014 09:38:48 -0600 > Subject: [PATCH] mkdeb: correctly map package architectures for x86 and ARM > > 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 XEN_TARGET_ARCH to the Debian architecture names for x86 and ARM > architectures. > > Signed-off-by: Clark Laughlin > Signed-off-by: Ian Campbell > --- > v3 (ijc): Handle only valid values for $XEN_TARGET_ARCH, print an error if the > arch is unknown. > --- > tools/misc/mkdeb | 16 +++++++++++----- > 1 file changed, 11 insertions(+), 5 deletions(-) > > diff --git a/tools/misc/mkdeb b/tools/misc/mkdeb > index 3bbf881..67b91cc 100644 > --- a/tools/misc/mkdeb > +++ b/tools/misc/mkdeb > @@ -13,11 +13,17 @@ fi > > cd $1 > version=$2 > -if test "$XEN_TARGET_ARCH" = "x86_32"; then > - arch=i386 > -else > - arch=amd64 > -fi > + > +# map the architecture, if necessary > +case "$XEN_TARGET_ARCH" in > + x86_32|x86_32p) arch=i386 ;; > + x86_64) arch=amd64 ;; > + arm32) arch=armhf ;; > + arm64) arch=$XEN_TARGET_ARCH;; > + *) echo "Unknown XEN_TARGET_ARCH $XEN_TARGET_ARCH" >&2 > + exit 1 > + ;; > +esac > > # Prepare the directory to package > cd dist > -- > 1.7.10.4 > > >