[arch-commits] Commit in qemu/trunk (PKGBUILD)

[Sébastien Luttringer]

    Date: Thursday, August 20, 2015 @ 11:51:23
  Author: seblu
Revision: 244412

upgpkg: qemu 2.4.0-2

- FS#45977

Modified:
  qemu/trunk/PKGBUILD

----------+
 PKGBUILD |   68 +++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 49 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-08-20 09:51:07 UTC (rev 244411)
+++ PKGBUILD	2015-08-20 09:51:23 UTC (rev 244412)
@@ -4,6 +4,7 @@
 
 pkgbase=qemu
 pkgname=('qemu'
+         'qemu-arch-extra'
          'qemu-block-iscsi'
          'qemu-block-rbd'
          'qemu-block-gluster'
@@ -10,7 +11,7 @@
          'qemu-guest-agent'
          'libcacard')
 pkgver=2.4.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
 url='http://wiki.qemu.org/'
@@ -28,6 +29,14 @@
          '44ee242d758f9318c6a1ea1dae96aa3a'
          '33ab286a20242dda7743a900f369d68a')
 
+_extra_arches=(aarch64 alpha arm armeb cris lm32 m68k microblaze microblazeel mips
+mips64 mips64el mipsel mipsn32 mipsn32el or32 ppc ppc64 ppc64abi32 ppc64le s390x
+sh4 sh4eb sparc sparc32plus sparc64 moxie ppcemb tricore unicore32 xtensa xtensaeb)
+_extra_blob=(QEMU,cgthree.bin QEMU,tcx.bin bamboo.dtb openbios-ppc
+openbios-sparc32 openbios-sparc64 palcode-clipper petalogix-ml605.dtb
+petalogix-s3adsp1800.dtb ppc_rom.bin s390-ccw.img s390-zipl.rom slof.bin
+spapr-rtas.bin u-boot.e500)
+
 prepare() {
   for _p in *.patch; do
     [[ -e "$_p" ]] || continue
@@ -61,9 +70,9 @@
            'seabios' 'libcap' 'libcap-ng' 'libaio' 'libseccomp' 'libcacard'
            'spice' 'usbredir' 'lzo' 'snappy' 'gcc-libs' 'zlib' 'bzip2' 'nspr'
            'ncurses' 'libx11' 'libusb' 'libpulse' 'libssh2' 'curl')
-  backup=('etc/qemu/target-x86_64.conf')
   replaces=('qemu-kvm')
   optdepends=('samba: SMB/CIFS server support'
+              'qemu-arch-extra: extra architectures support'
               'qemu-block-iscsi: iSCSI block support'
               'qemu-block-rbd: RBD block support'
               'qemu-block-gluster: glusterfs block support')
@@ -95,14 +104,6 @@
   # https://bugs.archlinux.org/task/32565
   chmod u+s usr/lib/qemu/qemu-bridge-helper
 
-  # manual striping in scripts directory
-  find usr/src/linux-${_kernver}/scripts -type f -perm -u+w 2>/dev/null|while read binary ; do
-      case "$(file -bi "$binary")" in
-        *application/x-executable*) # Binaries
-        /usr/bin/strip $STRIP_BINARIES "$binary";;
-      esac
-    done
-
   # remove libcacard files
   rm -r usr/include/cacard
   rm usr/lib/libcacard*
@@ -114,18 +115,34 @@
 
   # remove guest agent
   rm usr/bin/qemu-ga
+
+  # remove extra arch
+  for _arch in "${_extra_arches[@]}"; do
+    rm -f usr/bin/qemu-${_arch} usr/bin/qemu-system-${_arch}
+  done
+  for _blob in "${_extra_blob[@]}"; do
+    rm usr/share/qemu/${_blob}
+  done
 }
 
-package_libcacard() {
- pkgdesc='Common Access Card (CAC) Emulation'
- depends=('glibc' 'nss' 'nspr' 'glib2')
+package_qemu-arch-extra() {
+  pkgdesc='QEMU with full support for non x86 architectures'
+  depends=('glibc' 'gcc-libs' 'glib2' 'qemu')
+  options=(!strip)
 
-  cd "${pkgdir}"
-  install -d usr/{bin,lib/pkgconfig,include/cacard}
-  cp -a "${srcdir}"/qemu-${pkgver}/libcacard/*.h usr/include/cacard/
-  cp -a "${srcdir}"/qemu-${pkgver}/libcacard.pc usr/lib/pkgconfig/
-  cp -a "${srcdir}"/qemu-${pkgver}/.libs/vscclient usr/bin/
-  cp -a "${srcdir}"/qemu-${pkgver}/.libs/libcacard.so* usr/lib/
+  cd qemu-${pkgver}
+  install -dm755 "${pkgdir}"/usr/bin
+  for _arch in "${_extra_arches[@]}"; do
+    install -m755 ${_arch}-*/qemu-*${_arch} "${pkgdir}"/usr/bin
+  done
+
+  cd pc-bios
+  for _blob in "${_extra_blob[@]}"; do
+    install -Dm644 ${_blob} "${pkgdir}"/usr/share/qemu/${_blob}
+  done
+
+  # manually stripping
+  find "${pkgdir}"/usr/bin -type f -exec strip {} \;
 }
 
 package_qemu-block-iscsi() {
@@ -157,4 +174,17 @@
   install -D qemu-ga.service "${pkgdir}"/usr/lib/systemd/system/qemu-ga.service
 }
 
+package_libcacard() {
+ pkgdesc='Common Access Card (CAC) Emulation'
+ depends=('glibc' 'nss' 'nspr' 'glib2')
+
+  cd "${pkgdir}"
+  install -d usr/{bin,lib/pkgconfig,include/cacard}
+  cp -a "${srcdir}"/qemu-${pkgver}/libcacard/*.h usr/include/cacard/
+  cp -a "${srcdir}"/qemu-${pkgver}/libcacard.pc usr/lib/pkgconfig/
+  cp -a "${srcdir}"/qemu-${pkgver}/.libs/vscclient usr/bin/
+  cp -a "${srcdir}"/qemu-${pkgver}/.libs/libcacard.so* usr/lib/
+}
+
+
 # vim:set ts=2 sw=2 et: