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

[Anatol Pomozov]

    Date: Monday, May 4, 2020 @ 23:52:54
  Author: anatolik
Revision: 382225

upgpkg: qemu 5.0.0-4

Modified:
  qemu/trunk/PKGBUILD

----------+
 PKGBUILD |   35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-04 23:29:27 UTC (rev 382224)
+++ PKGBUILD	2020-05-04 23:52:54 UTC (rev 382225)
@@ -6,11 +6,11 @@
          qemu-block-{iscsi,rbd,gluster} qemu-guest-agent)
 pkgdesc="A generic and open source machine emulator and virtualizer"
 pkgver=5.0.0
-pkgrel=3
+pkgrel=4
 arch=(x86_64)
 license=(GPL2 LGPL2.1)
 url="https://wiki.qemu.org/"
-_headlessdeps=(seabios gnutls libpng libaio numactl jemalloc libnfs
+_headlessdeps=(seabios gnutls libpng libaio numactl libnfs
                lzo snappy curl vde2 libcap-ng spice libcacard usbredir libslirp
                libssh zstd liburing)
 depends=(virglrenderer sdl2 vte3 libpulse brltty "${_headlessdeps[@]}")
@@ -53,12 +53,6 @@
 _build() (
   cd build-$1
 
-  # qemu vs. make 4 == bad
-  export ARFLAGS=rv
-
-  # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
-  export CFLAGS+=" -fPIC"
-
   ../${pkgname}-${pkgver}/configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -68,7 +62,6 @@
     --smbd=/usr/bin/smbd \
     --enable-modules \
     --enable-sdl \
-    --enable-jemalloc \
     --enable-slirp=system \
     --enable-xfsctl \
     "${@:2}"
@@ -99,7 +92,7 @@
                'qemu-block-rbd: RBD block support'
                'qemu-block-gluster: glusterfs block support')
   install=qemu.install
-  options=(!strip)
+  options=(!strip !emptydirs)
 
   make -C build-$1 DESTDIR="$pkgdir" install "${@:2}"
 
@@ -111,7 +104,6 @@
   rm -r var
 
   cd usr/lib
-  tidy_strip
 
   # bridge_helper needs suid
   # https://bugs.archlinux.org/task/32565
@@ -121,7 +113,6 @@
   rm qemu/block-{iscsi,rbd,gluster}.so
 
   cd ../bin
-  tidy_strip
 
   # remove extra arch
   for _bin in qemu-*; do
@@ -132,7 +123,7 @@
       ga) rm "$_bin"; continue ;;
 
       # tools
-      img|io|nbd) continue ;;
+      edid|img|io|keymap|nbd|pr-helper|storage-daemon) continue ;;
 
       # core emu
       system-${_corearch}) continue ;;
@@ -147,25 +138,31 @@
 
     case $_blob in
       # provided by seabios package
-      bios.bin|acpi-dsdt.aml|bios-256k.bin|vgabios-cirrus.bin|vgabios-qxl.bin|\
+      bios.bin|bios-256k.bin|vgabios-cirrus.bin|vgabios-qxl.bin|\
       vgabios-stdvga.bin|vgabios-vmware.bin|vgabios-virtio.bin|vgabios-bochs-display.bin|\
       vgabios-ramfb.bin) rm "$_blob"; continue ;;
 
+      # provided by edk2-ovmf package
+      edk2-*) rm "$_blob"; continue ;;
+
       # iPXE ROMs
       efi-*|pxe-*) continue ;;
 
       # core blobs
-      kvmvapic.bin|linuxboot*|multiboot.bin|sgabios.bin|vgabios*) continue ;;
+      bios-microvm.bin|kvmvapic.bin|linuxboot*|multiboot.bin|sgabios.bin|vgabios*) continue ;;
 
       # Trace events definitions
       trace-events*) continue ;;
-
-      # Logos
-      *.bmp|*.svg) continue ;;
     esac
 
     mv "$_blob" "$srcdir/extra-arch-$1/usr/share/qemu"
   done
+
+  # provided by edk2-ovmf package
+  rm -r firmware
+
+  cd ..
+  if [ "$1" = headless ]; then rm -r {applications,icons}; fi
 }
 
 package_qemu-arch-extra() {
@@ -188,7 +185,7 @@
 
 package_qemu-block-iscsi() {
   pkgdesc="QEMU iSCSI block module"
-  depends=(glib2 libiscsi jemalloc)
+  depends=(glib2 libiscsi)
 
   install -D build-full/block-iscsi.so "$pkgdir/usr/lib/qemu/block-iscsi.so"
 }