| Message ID | 1415806728-28484-1-git-send-email-clark.laughlin@linaro.org |
|---|---|
| State | New |
| Headers | show |
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
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
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> --- Changed since v1: corrected commit message / subject --- tools/misc/mkdeb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)