import QEMU 5.0.0-rc2 and rebase patches

[pve-qemu.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index adcbf0e84c160f169d20d8502f75877e8ec6dba3..c73d6a18a363a27d53a09c05b9ab6ab56556bdb2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/dpkg/pkg-info.mk
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -20,6 +21,8 @@ ARCH ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 PACKAGE=pve-qemu-kvm
 destdir := $(CURDIR)/debian/$(PACKAGE)
 
+flagfile := $(destdir)/usr/share/kvm/recognized-CPUID-flags-x86_64
+
 CFLAGS = -Wall
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -40,6 +43,7 @@ config.status: configure
        --sysconfdir=/etc \
        --target-list=$(ARCH)-softmmu,aarch64-softmmu \
        --with-confsuffix="/kvm" \
+       --with-pkgversion="${DEB_SOURCE}_${DEB_VERSION_UPSTREAM}" \
        --audio-drv-list="alsa" \
        --datadir=/usr/share \
        --disable-capstone \
@@ -47,9 +51,13 @@ config.status: configure
        --disable-guest-agent \
        --disable-guest-agent-msi \
        --disable-libnfs \
+       --disable-libxml2 \
+       --disable-sdl \
        --disable-smartcard \
        --disable-strip \
        --disable-xen \
+       --enable-curl \
+       --enable-docs \
        --enable-glusterfs \
        --enable-gnutls \
        --enable-jemalloc \
@@ -58,7 +66,7 @@ config.status: configure
        --enable-linux-aio \
        --enable-numa \
        --enable-rbd \
-       --enable-sdl \
+       --enable-seccomp \
        --enable-spice \
        --enable-usb-redir \
        --enable-virtfs \
@@ -107,12 +115,10 @@ install: build
        rm -rf $(destdir)/usr/share/kvm/openbios-*
        # remove ppc files
        rm $(destdir)/usr/share/kvm/*.dtb
-       rm $(destdir)/usr/share/kvm/ppc_rom.bin
        rm $(destdir)/usr/share/kvm/s390-ccw.img
        rm $(destdir)/usr/share/kvm/s390-netboot.img
        rm $(destdir)/usr/share/kvm/qemu_vga.ndrv
        rm $(destdir)/usr/share/kvm/slof.bin
-       rm $(destdir)/usr/share/kvm/spapr-rtas.bin
        rm $(destdir)/usr/share/kvm/u-boot.e500
        # remove Aplha files
        rm $(destdir)/usr/share/kvm/palcode-clipper
@@ -122,6 +128,9 @@ install: build
        rm -Rf $(destdir)/usr/include
        rm -Rf $(destdir)/usr/lib*
 
+       # CPU flags are static for QEMU version, allows avoiding more costly checks
+       $(destdir)/usr/bin/qemu-system-x86_64 -cpu help | ./debian/parse-cpu-flags.pl > $(flagfile)
+
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -153,7 +162,9 @@ binary-arch: build install
 #      dh_perl
 #      dh_makeshlibs
        dh_installdeb
-       dh_shlibdeps
+       # Debian >= Buster has libglusterfs0 and lots of libgfFOO, upstream has the libs in glusterfs-common
+       # pass -x to dpkg-shlibdeps and specify dependencies in d/control instead
+       dh_shlibdeps -- -xlibglusterfs0 -xlibgfxdr0 -xlibgfrpc0 -xlibgfdb0 -xlibgfchangelog0 -xlibgfapi0
        dh_gencontrol
        dh_md5sums
        dh_builddeb