[Xen-changelog] [xen master] mkdeb: correctly map package architectures for x86 and ARM

[patchbot@xxxxxxx]

commit 4de0025bf45fbf26f9cb6661d23d2d16ec87bb47
Author:     Clark Laughlin <clark.laughlin@xxxxxxxxxx>
AuthorDate: Wed Nov 12 09:38:48 2014 -0600
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu Nov 20 15:34:53 2014 +0000

    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 <clark.laughlin@xxxxxxxxxx>
    Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Acked-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
 tools/misc/mkdeb |   16 +++++++++++-----
 1 files 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
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog