qemu-static: minor fix

1 files changed, 9 insertions, 4 deletions

diff --git a/libre/qemu-static/PKGBUILD b/libre/qemu-static/PKGBUILD
index 6729a7906..c787fff70 100644
--- a/libre/qemu-static/PKGBUILD
+++ b/libre/qemu-static/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=qemu
 pkgname=('qemu-static'
          'qemu-arch-extra-static')
 pkgver=2.5.1
-pkgrel=1.5
+pkgrel=1.6
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL2' 'LGPL2.1')
 url='http://wiki.qemu.org/'
@@ -17,10 +17,13 @@ _extra_arches=(aarch64 alpha arm armeb cris m68k microblaze microblazeel
 or32 ppc ppc64 ppc64abi32 ppc64le s390x tilegx
 sh4 sh4eb sparc sparc32plus sparc64 unicore32)
 if [[ $CARCH = x86_64 || $CARCH = i686 ]]; then
+  _native_arches=(x86_64 i386)
   _extra_arches+=(aarch64 arm armeb mips mips64 mips64el mipsel mipsn32 mipsn32el)
 elif [[ $CARCH = armv7h ]]; then
+  _native_arches=(arm)
   _extra_arches+=(x86_64 i386 mips mips64 mips64el mipsel mipsn32 mipsn32el)
 elif [[ $CARCH = mips64el ]]; then
+  _native_arches=(mips mips64 mips64el mipsel mipsn32 mipsn32el)
   _extra_arches+=(x86_64 i386 aarch64 arm armeb)
 fi
 
@@ -57,7 +60,7 @@ build ()
 
 package_qemu-static() {
   pkgdesc='A generic and free processor emulator which achieves a good emulation speed by using dynamic translation (static binaries only)'
-  optdepends=('qemu-static-arch-extra: extra architectures support')
+  optdepends=('qemu-arch-extra-static: extra architectures support')
   options=(!strip)
 
   make -C ${pkgbase}-${pkgver} DESTDIR="${pkgdir}" install
@@ -71,12 +74,14 @@ package_qemu-static() {
 
   # rename all qemu-* binaries
   cd usr/bin
-  rename qemu qemu-static *
+    for _arch in "${_native_arches[@]}"; do
+      mv -v qemu-${_arch} qemu-${_arch}-static
+    done
   cd ../..
 
   # remove conflicting files
   rm -vr usr/{lib,share}
-  rm -v usr/bin/{ivshmem-{client,server},qemu-static-{img,io,nbd}}
+  rm -v usr/bin/{ivshmem-{client,server},qemu-{img,io,nbd}}
 }
 
 package_qemu-arch-extra-static() {