From 7281419bc4ae24b6e7b0fb8a87fb39e45f2e7cf0 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:24:20 +0000 Subject: import qemu-guest-agent-2.8.0-2.el7 --- diff --git a/.gitignore b/.gitignore index 2673557..279b827 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/qemu-2.5.0.tar.bz2 +SOURCES/qemu-2.8.0.tar.bz2 diff --git a/.qemu-guest-agent.metadata b/.qemu-guest-agent.metadata index d3fed97..001aef0 100644 --- a/.qemu-guest-agent.metadata +++ b/.qemu-guest-agent.metadata @@ -1 +1 @@ -ed6c02a267f9edf98058743f0f76a25743a0dfe7 SOURCES/qemu-2.5.0.tar.bz2 +a5602f2ddb51d61b4c0e618b779fdb0dbdc9cc1f SOURCES/qemu-2.8.0.tar.bz2 diff --git a/SOURCES/0001-Initial-redhat-build.patch b/SOURCES/0001-Initial-redhat-build.patch deleted file mode 100644 index 91c07a4..0000000 --- a/SOURCES/0001-Initial-redhat-build.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 327852f029b9d70613cdce223f57bdc1e97210ac Mon Sep 17 00:00:00 2001 -From: Miroslav Rezanina -Date: Thu, 5 Nov 2015 10:38:15 +0100 -Subject: Initial redhat build - -Switch to new unified build structure. - -Rebase to 2.5: -- New seccomp hadling in configure -- libcacard extracted -- vnc fixes -- libsecomp for aarch64 requirements changed downstream -- guest-agent separated from qemu-kvm - -Rebase to 2.4: - - remove --enable-ws-vnc - - use error_setg instead of error_set in migration/migration.c - - remove target-x86_64.conf - - create /etc/qemu-kvm on copying of bridge.conf - - disabled opengl - - rebased to version 2.3.0-30.el7 - -Included commits (rebase 2.4) - - 9201274 spec: Remove obsolete differentiation code - - a938a8c spec: Use external configuration script - - 5ca8d0e spec: Use configure options to prevent default resolution - - 5dca391 spec: Ship complete QMP documentation files - - 7899edd aarch64: allow --enable-seccomp - - a56fb9c aarch64: redhat spec: enable seccomp - - a9571e6 rhel: Update package version for SLOF dependency - - 25c70c4 configure: Add support for tcmalloc - - db72485 Change fsreeze-hook default location - - 14b8a9e redhat: add kvm-unit-tests tarball to environment - - 5ee4238 spec: Build tscdeadline_latency.flat from kvm-unit-tests - - 6ba800b Downstream-only: Start kvm-setup service before libvirtd service - - 59b43d6 Do not stop qemu-guest-agent service on target switch - - 4d851fa provide vhost module config file with max_mem_regions set to 509 - - 0b18027 spec: Require proper version of SLOF - - 3c436c7 Fix rh-brew-aarch64, rh-brew-ppc rh-brew-ga-ppc target ---- - .gitpublish | 8 + - configure | 4 +- - redhat/.gitignore | 1 + - redhat/99-qemu-guest-agent.rules | 2 + - redhat/Makefile | 72 ++++++ - redhat/Makefile.common | 35 +++ - redhat/build_configure.sh | 116 ++++++++++ - redhat/qemu-ga.sysconfig | 19 ++ - redhat/qemu-guest-agent.service | 21 ++ - redhat/qemu-guest-agent.spec.template | 408 ++++++++++++++++++++++++++++++++++ - redhat/rpmbuild/BUILD/.gitignore | 2 + - redhat/rpmbuild/RPMS/.gitignore | 2 + - redhat/rpmbuild/SOURCES/.gitignore | 2 + - redhat/rpmbuild/SPECS/.gitignore | 2 + - redhat/rpmbuild/SRPMS/.gitignore | 2 + - redhat/scripts/frh.py | 27 +++ - redhat/scripts/git-backport-diff | 302 +++++++++++++++++++++++++ - redhat/scripts/git-compile-check | 215 ++++++++++++++++++ - redhat/scripts/process-patches.sh | 70 ++++++ - redhat/scripts/tarball_checksum.sh | 3 + - 20 files changed, 1311 insertions(+), 2 deletions(-) - create mode 100644 .gitpublish - create mode 100644 redhat/.gitignore - create mode 100644 redhat/99-qemu-guest-agent.rules - create mode 100644 redhat/Makefile - create mode 100644 redhat/Makefile.common - create mode 100755 redhat/build_configure.sh - create mode 100644 redhat/qemu-ga.sysconfig - create mode 100644 redhat/qemu-guest-agent.service - create mode 100644 redhat/qemu-guest-agent.spec.template - create mode 100644 redhat/rpmbuild/BUILD/.gitignore - create mode 100644 redhat/rpmbuild/RPMS/.gitignore - create mode 100644 redhat/rpmbuild/SOURCES/.gitignore - create mode 100644 redhat/rpmbuild/SPECS/.gitignore - create mode 100644 redhat/rpmbuild/SRPMS/.gitignore - create mode 100755 redhat/scripts/frh.py - create mode 100755 redhat/scripts/git-backport-diff - create mode 100755 redhat/scripts/git-compile-check - create mode 100755 redhat/scripts/process-patches.sh - create mode 100755 redhat/scripts/tarball_checksum.sh - -diff --git a/configure b/configure -index b9552fd..38e233e 100755 ---- a/configure -+++ b/configure -@@ -1904,10 +1904,10 @@ fi - - if test "$seccomp" != "no" ; then - case "$cpu" in -- i386|x86_64) -+ i386|x86_64|aarch64) - libseccomp_minver="2.1.0" - ;; -- arm|aarch64) -+ arm) - libseccomp_minver="2.2.3" - ;; - *) diff --git a/SOURCES/build_configure.sh b/SOURCES/build_configure.sh index 0fd2a66..00981ee 100755 --- a/SOURCES/build_configure.sh +++ b/SOURCES/build_configure.sh @@ -20,33 +20,9 @@ optflags=$1 shift have_fdt=$1 shift -have_gluster=$1 -shift -have_guest_agent=$1 -shift -have_numa=$1 -shift -have_rbd=$1 -shift -have_rdma=$1 -shift -have_seccomp=$1 -shift -have_spice=$1 -shift -have_usbredir=$1 -shift have_tcmalloc=$1 shift -if [ "$have_rbd" == "enable" ]; then - rbd_driver=rbd, -fi - -if [ "$have_gluster" == "enable" ]; then - gluster_driver=gluster, -fi - ./configure \ --prefix=${_prefix} \ --libdir=${_libdir} \ @@ -59,58 +35,55 @@ fi --with-pkgversion=${nvr} \ --with-confsuffix=/${pkgname} \ --with-coroutine=ucontext \ - --with-system-pixman \ --disable-archipelago \ --disable-bluez \ --disable-brlapi \ --disable-cap-ng \ --enable-coroutine-pool \ - --enable-curl \ + --disable-curl \ --disable-curses \ --disable-debug-tcg \ --enable-docs \ --disable-gtk \ --enable-kvm \ - --enable-libiscsi \ + --disable-libiscsi \ --disable-libnfs \ - --enable-libssh2 \ - --enable-libusb \ + --disable-libssh2 \ + --disable-libusb \ --disable-bzip2 \ - --enable-linux-aio \ - --enable-lzo \ + --disable-linux-aio \ + --disable-lzo \ --disable-opengl \ --enable-pie \ --disable-qom-cast-debug \ --disable-sdl \ - --enable-smartcard \ - --enable-snappy \ + --disable-smartcard \ + --disable-snappy \ --disable-sparse \ --disable-strip \ --disable-tpm \ --enable-trace-backend=dtrace \ - --enable-uuid \ --disable-vde \ - --enable-vhdx \ + --disable-vhdx \ --disable-vhost-scsi \ --disable-virtfs \ --disable-vnc-jpeg \ --disable-vte \ - --enable-vnc-png \ - --enable-vnc-sasl \ + --disable-vnc-png \ + --disable-vnc-sasl \ --enable-werror \ --disable-xen \ --disable-xfsctl \ --${have_fdt}-fdt \ - --${have_gluster}-glusterfs \ - --${have_guest_agent}-guest-agent \ - --${have_numa}-numa \ - --${have_rbd}-rbd \ - --${have_rdma}-rdma \ - --${have_seccomp}-seccomp \ - --${have_spice}-spice \ - --${have_usbredir}-usb-redir \ + --disable-glusterfs \ + --enable-guest-agent \ + --disable-numa \ + --disable-rbd \ + --disable-rdma \ + --disable-seccomp \ + --disable-spice \ + --disable-usb-redir \ --${have_tcmalloc}-tcmalloc \ - --audio-drv-list=pa,alsa \ - --block-drv-rw-whitelist=qcow2,raw,file,host_device,nbd,iscsi,${gluster_driver}${rbd_driver}blkdebug \ - --block-drv-ro-whitelist=vmdk,vhdx,vpc,https,ssh \ + --disable-system \ + --disable-tools \ "$@" diff --git a/SPECS/qemu-guest-agent.spec b/SPECS/qemu-guest-agent.spec index 13c9409..1104b1a 100644 --- a/SPECS/qemu-guest-agent.spec +++ b/SPECS/qemu-guest-agent.spec @@ -58,8 +58,8 @@ Summary: QEMU guest agent Name: qemu-guest-agent -Version: 2.5.0 -Release: 3%{?dist} +Version: 2.8.0 +Release: 2%{?dist} # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped Epoch: 10 License: GPLv2+ and LGPLv2+ and BSD @@ -74,99 +74,24 @@ Requires(postun): systemd-units %define _smp_mflags %{nil} %endif -Source0: http://wiki.qemu.org/download/qemu-2.5.0.tar.bz2 +Source0: http://wiki.qemu.org/download/qemu-2.8.0.tar.bz2 Source1: qemu-guest-agent.service Source2: 99-qemu-guest-agent.rules Source3: qemu-ga.sysconfig Source4: build_configure.sh -Patch0001: 0001-Initial-redhat-build.patch BuildRequires: zlib-devel -BuildRequires: SDL-devel -BuildRequires: which -BuildRequires: texi2html -BuildRequires: gnutls-devel -BuildRequires: cyrus-sasl-devel -BuildRequires: libtool -BuildRequires: libaio-devel -BuildRequires: rsync +BuildRequires: glib2-devel +BuildRequires: systemd BuildRequires: python -BuildRequires: pciutils-devel -BuildRequires: pulseaudio-libs-devel -BuildRequires: libiscsi-devel -BuildRequires: ncurses-devel -BuildRequires: libattr-devel -BuildRequires: libusbx-devel -%if 0%{have_usbredir} -BuildRequires: usbredir-devel >= 0.6 -%endif -BuildRequires: texinfo -%if 0%{have_spice} -BuildRequires: spice-protocol >= 0.12.2 -BuildRequires: spice-server-devel >= 0.12.0 -%endif -%if 0%{have_seccomp} -BuildRequires: libseccomp-devel >= 1.0.0 -%endif -# For network block driver -BuildRequires: libcurl-devel -BuildRequires: libssh2-devel -%ifarch x86_64 -BuildRequires: librados2-devel -BuildRequires: librbd1-devel -%endif -%if 0%{have_gluster} -# For gluster block driver -BuildRequires: glusterfs-api-devel -BuildRequires: glusterfs-devel -%endif -# We need both because the 'stap' binary is probed for by configure -BuildRequires: systemtap BuildRequires: systemtap-sdt-devel -# For smartcard NSS support -BuildRequires: nss-devel -# For XFS discard support in raw-posix.c -# For VNC JPEG support -BuildRequires: libjpeg-devel -# For VNC PNG support -BuildRequires: libpng-devel -# For uuid generation -BuildRequires: libuuid-devel -# For BlueZ device support -BuildRequires: bluez-libs-devel -# For Braille device support -BuildRequires: brlapi-devel -# For test suite -BuildRequires: check-devel -# For virtfs -BuildRequires: libcap-devel -# Hard requirement for version >= 1.3 -BuildRequires: pixman-devel -# Documentation requirement BuildRequires: perl-podlators BuildRequires: texinfo -# For rdma -%if 0%{have_librdma} -BuildRequires: librdmacm-devel -%endif %if 0%{have_tcmalloc} BuildRequires: gperftools-devel %endif -# iasl and cpp for acpi generation (not a hard requirement as we can use -# pre-compiled files, but it's better to use this) -%ifarch %{ix86} x86_64 -BuildRequires: iasl -BuildRequires: cpp -%endif -# For compressed guest memory dumps -BuildRequires: lzo-devel snappy-devel -# For NUMA memory binding -%if 0%{have_numa} -BuildRequires: numactl-devel -%endif -BuildRequires: libcacard-devel %define qemudocdir %{_docdir}/%{pkgname} @@ -228,7 +153,6 @@ ApplyOptionalPatch() } -%patch0001 -p1 ApplyOptionalPatch qemu-kvm-test.patch @@ -264,42 +188,6 @@ cp %{SOURCE4} build_configure.sh %else disable \ %endif -%if 0%{have_gluster} - enable \ -%else - disable \ -%endif - enable \ -%if 0%{have_numa} - enable \ -%else - disable \ -%endif -%ifarch x86_64 - enable \ -%else - disable \ -%endif -%if 0%{have_librdma} - enable \ -%else - disable \ -%endif -%if 0%{have_seccomp} - enable \ -%else - disable \ -%endif -%if 0%{have_spice} - enable \ -%else - disable \ -%endif -%if 0%{have_usbredir} - enable \ -%else - disable \ -%endif %if 0%{have_tcmalloc} enable \ %else @@ -368,6 +256,16 @@ install -m 0644 qemu-ga.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ %changelog +* Fri May 19 2017 Miroslav Rezanina - 2.8.0-2.el7 +- qemuga-Remove-unnecessary-dependencies.patch [bz#1441999] +- Resolves: bz#1441999 + (Clean qemu-ga dependencies) + +* Tue Feb 07 2017 Miroslav Rezanina - 2.8.0-1.el7 +- Rebase to 2.8.0 base [bz#1414676] +- Resolves: bz#1414676 + (Rebase qemu-guest-agent to 2.8.0 base) + * Thu Sep 01 2016 Miroslav Rezanina - 2.5.0-3.el7 - qemuga-spec-add-qemu-ga-man-page.patch [bz#1101556] - Resolves: bz#1101556 @@ -382,7 +280,6 @@ install -m 0644 qemu-ga.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ - Rebase to QEMU 2.5.0 [bz#1297673] - Resolves: bz#1297673 (Rebase to QEMU 2.5) - * Tue Aug 25 2015 Miroslav Rezanina - 2.3.0-3.el7 - qemuga-Do-not-stop-qemu-guest-agent-service-on-target-switc.patch [bz#1160930] - Resolves: bz#1160930