From 1272efc755df8c41e50106caa0040391c9c9d8e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Wed, 16 May 2018 10:34:10 +0200 Subject: Drop patches due to upstream code removal Allow-xen-toolstack-to-find-it-s-binaries.patch debian/fix-Debian-specific-path-to-hvm-loader.patch --- ...Allow-xen-toolstack-to-find-it-s-binaries.patch | 243 --------------------- .../Pass-GPG_TTY-env-var-to-the-ssh-binary.patch | 4 +- .../patches/debian/Debianize-libvirt-guests.patch | 6 +- .../Don-t-enable-default-network-on-boot.patch | 4 +- .../patches/debian/Prefer-sbin-over-usr-sbin.patch | 2 +- .../patches/debian/Use-upstreams-polkit-rule.patch | 12 +- .../debian/apparmor_profiles_local_include.patch | 4 +- .../fix-Debian-specific-path-to-hvm-loader.patch | 87 -------- debian/patches/debian/remove-RHism.diff.patch | 2 +- debian/patches/series | 2 - 10 files changed, 17 insertions(+), 349 deletions(-) delete mode 100644 debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch delete mode 100644 debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch diff --git a/debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch b/debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch deleted file mode 100644 index f5a9aaa31..000000000 --- a/debian/patches/Allow-xen-toolstack-to-find-it-s-binaries.patch +++ /dev/null @@ -1,243 +0,0 @@ -From: George Dunlap -Date: Tue, 2 Oct 2012 19:19:04 +0200 -Subject: Allow xen toolstack to find it's binaries - -Closes: #685749 ---- - docs/schemas/capability.rng | 4 ++-- - src/xen/xen_hypervisor.c | 6 ++---- - tests/xencapsdata/xen-i686-pae-hvm.xml | 6 +++--- - tests/xencapsdata/xen-i686-pae.xml | 2 +- - tests/xencapsdata/xen-i686.xml | 2 +- - tests/xencapsdata/xen-ia64-be-hvm.xml | 6 +++--- - tests/xencapsdata/xen-ia64-be.xml | 2 +- - tests/xencapsdata/xen-ia64-hvm.xml | 6 +++--- - tests/xencapsdata/xen-ia64.xml | 2 +- - tests/xencapsdata/xen-ppc64.xml | 2 +- - tests/xencapsdata/xen-x86_64-hvm.xml | 10 +++++----- - tests/xencapsdata/xen-x86_64.xml | 2 +- - 12 files changed, 24 insertions(+), 26 deletions(-) - -diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng -index e1ab5c2..763c3df 100644 ---- a/docs/schemas/capability.rng -+++ b/docs/schemas/capability.rng -@@ -351,13 +351,13 @@ - - - -- -+ - - - - - -- -+ - - - -diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c -index 136e0c2..b91c493 100644 ---- a/src/xen/xen_hypervisor.c -+++ b/src/xen/xen_hypervisor.c -@@ -2142,11 +2142,9 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch, - if ((guest = virCapabilitiesAddGuest(caps, - guest_archs[i].hvm ? VIR_DOMAIN_OSTYPE_HVM : VIR_DOMAIN_OSTYPE_XEN, - guest_archs[i].arch, -- (hostarch == VIR_ARCH_X86_64 ? -- "/usr/lib64/xen/bin/qemu-dm" : -- "/usr/lib/xen/bin/qemu-dm"), -+ "qemu-dm", - (guest_archs[i].hvm ? -- "/usr/lib/xen-default/boot/hvmloader" : -+ "hvmloader" : - NULL), - 1, - machines)) == NULL) { -diff --git a/tests/xencapsdata/xen-i686-pae-hvm.xml b/tests/xencapsdata/xen-i686-pae-hvm.xml -index 435c141..a33d65d 100644 ---- a/tests/xencapsdata/xen-i686-pae-hvm.xml -+++ b/tests/xencapsdata/xen-i686-pae-hvm.xml -@@ -20,7 +20,7 @@ - xen - - 32 -- /usr/lib/xen/bin/qemu-dm -+ qemu-dm - xenpv - - -@@ -33,8 +33,8 @@ - hvm - - 32 -- /usr/lib/xen/bin/qemu-dm -- /usr/lib/xen-default/boot/hvmloader -+ qemu-dm -+ hvmloader - xenfv - - -diff --git a/tests/xencapsdata/xen-i686-pae.xml b/tests/xencapsdata/xen-i686-pae.xml -index c917fbe..d211163 100644 ---- a/tests/xencapsdata/xen-i686-pae.xml -+++ b/tests/xencapsdata/xen-i686-pae.xml -@@ -20,7 +20,7 @@ - xen - - 32 -- /usr/lib/xen/bin/qemu-dm -+ qemu-dm - xenpv - - -diff --git a/tests/xencapsdata/xen-i686.xml b/tests/xencapsdata/xen-i686.xml -index 5771e2b..c540996 100644 ---- a/tests/xencapsdata/xen-i686.xml -+++ b/tests/xencapsdata/xen-i686.xml -@@ -17,7 +17,7 @@ - xen - - 32 -- /usr/lib/xen/bin/qemu-dm -+ qemu-dm - xenpv - - -diff --git a/tests/xencapsdata/xen-ia64-be-hvm.xml b/tests/xencapsdata/xen-ia64-be-hvm.xml -index 5d60dc2..00bdcf9 100644 ---- a/tests/xencapsdata/xen-ia64-be-hvm.xml -+++ b/tests/xencapsdata/xen-ia64-be-hvm.xml -@@ -17,7 +17,7 @@ - xen - - 64 -- /usr/lib/xen/bin/qemu-dm -+ qemu-dm - xenpv - - -@@ -30,8 +30,8 @@ - hvm - - 64 -- /usr/lib/xen/bin/qemu-dm -- /usr/lib/xen-default/boot/hvmloader -+ qemu-dm -+ hvmloader - xenfv - - -diff --git a/tests/xencapsdata/xen-ia64-be.xml b/tests/xencapsdata/xen-ia64-be.xml -index 78fa77e..77f0acb 100644 ---- a/tests/xencapsdata/xen-ia64-be.xml -+++ b/tests/xencapsdata/xen-ia64-be.xml -@@ -17,7 +17,7 @@ - xen - - 64 -- /usr/lib/xen/bin/qemu-dm -+ qemu-dm - xenpv - - -diff --git a/tests/xencapsdata/xen-ia64-hvm.xml b/tests/xencapsdata/xen-ia64-hvm.xml -index b6f788e..6a5b299 100644 ---- a/tests/xencapsdata/xen-ia64-hvm.xml -+++ b/tests/xencapsdata/xen-ia64-hvm.xml -@@ -17,7 +17,7 @@ - xen - - 64 -- /usr/lib/xen/bin/qemu-dm -+ qemu-dm - xenpv - - -@@ -27,8 +27,8 @@ - hvm - - 64 -- /usr/lib/xen/bin/qemu-dm -- /usr/lib/xen-default/boot/hvmloader -+ qemu-dm -+ hvmloader - xenfv - - -diff --git a/tests/xencapsdata/xen-ia64.xml b/tests/xencapsdata/xen-ia64.xml -index 9e3eaf4..79eabf1 100644 ---- a/tests/xencapsdata/xen-ia64.xml -+++ b/tests/xencapsdata/xen-ia64.xml -@@ -17,7 +17,7 @@ - xen - - 64 -- /usr/lib/xen/bin/qemu-dm -+ qemu-dm - xenpv - - -diff --git a/tests/xencapsdata/xen-ppc64.xml b/tests/xencapsdata/xen-ppc64.xml -index 0132c45..3445bfa 100644 ---- a/tests/xencapsdata/xen-ppc64.xml -+++ b/tests/xencapsdata/xen-ppc64.xml -@@ -17,7 +17,7 @@ - xen - - 64 -- /usr/lib/xen/bin/qemu-dm -+ qemu-dm - xenpv - - -diff --git a/tests/xencapsdata/xen-x86_64-hvm.xml b/tests/xencapsdata/xen-x86_64-hvm.xml -index 6371e86..2c5ab2e 100644 ---- a/tests/xencapsdata/xen-x86_64-hvm.xml -+++ b/tests/xencapsdata/xen-x86_64-hvm.xml -@@ -20,7 +20,7 @@ - xen - - 64 -- /usr/lib64/xen/bin/qemu-dm -+ qemu-dm - xenpv - - -@@ -30,8 +30,8 @@ - hvm - - 32 -- /usr/lib64/xen/bin/qemu-dm -- /usr/lib/xen-default/boot/hvmloader -+ qemu-dm -+ hvmloader - xenfv - - -@@ -47,8 +47,8 @@ - hvm - - 64 -- /usr/lib64/xen/bin/qemu-dm -- /usr/lib/xen-default/boot/hvmloader -+ qemu-dm -+ hvmloader - xenfv - - -diff --git a/tests/xencapsdata/xen-x86_64.xml b/tests/xencapsdata/xen-x86_64.xml -index b686432..2cdae7c 100644 ---- a/tests/xencapsdata/xen-x86_64.xml -+++ b/tests/xencapsdata/xen-x86_64.xml -@@ -20,7 +20,7 @@ - xen - - 64 -- /usr/lib64/xen/bin/qemu-dm -+ qemu-dm - xenpv - - diff --git a/debian/patches/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch b/debian/patches/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch index 07531b4bb..b1dc8f21f 100644 --- a/debian/patches/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch +++ b/debian/patches/Pass-GPG_TTY-env-var-to-the-ssh-binary.patch @@ -13,10 +13,10 @@ require the 'TERM' environment variable to be set to the terminal type. 1 file changed, 2 insertions(+) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c -index 2d41a71..a5578c1 100644 +index f253eb2..acb669d 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c -@@ -850,6 +850,8 @@ int virNetSocketNewConnectSSH(const char *nodename, +@@ -847,6 +847,8 @@ int virNetSocketNewConnectSSH(const char *nodename, virCommandAddEnvPassBlockSUID(cmd, "KRB5CCNAME", NULL); virCommandAddEnvPassBlockSUID(cmd, "SSH_AUTH_SOCK", NULL); virCommandAddEnvPassBlockSUID(cmd, "SSH_ASKPASS", NULL); diff --git a/debian/patches/debian/Debianize-libvirt-guests.patch b/debian/patches/debian/Debianize-libvirt-guests.patch index 0636db85e..a47385761 100644 --- a/debian/patches/debian/Debianize-libvirt-guests.patch +++ b/debian/patches/debian/Debianize-libvirt-guests.patch @@ -9,7 +9,7 @@ Origin: vendor 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in -index fcada31..f486070 100644 +index 4bc6e86..9ec4064 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -1,5 +1,17 @@ @@ -81,7 +81,7 @@ index fcada31..f486070 100644 RETVAL=0 -@@ -550,8 +562,7 @@ gueststatus() { +@@ -552,8 +564,7 @@ gueststatus() { # rh_status # Display current status: whether saved state exists, and whether start @@ -92,7 +92,7 @@ index fcada31..f486070 100644 if [ -f "$LISTFILE" ]; then gettext "stopped, with saved guests"; echo diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf -index 08204ca..55127fb 100644 +index 669b046..1c4b450 100644 --- a/tools/libvirt-guests.sysconf +++ b/tools/libvirt-guests.sysconf @@ -8,7 +8,7 @@ diff --git a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch index 8ecc1f36f..d04910a28 100644 --- a/debian/patches/debian/Don-t-enable-default-network-on-boot.patch +++ b/debian/patches/debian/Don-t-enable-default-network-on-boot.patch @@ -9,10 +9,10 @@ to not interfere with existing network configurations 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Makefile.in b/src/Makefile.in -index 771464d..d9d7146 100644 +index 310e64a..fad96a2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -13023,8 +13023,7 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \ +@@ -12866,8 +12866,7 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \ @WITH_NETWORK_TRUE@ $(DESTDIR)$(confdir)/qemu/networks/default.xml && \ @WITH_NETWORK_TRUE@ rm $(DESTDIR)$(confdir)/qemu/networks/default.xml.t; } @WITH_NETWORK_TRUE@ ( cd $(DESTDIR)$(confdir)/qemu/networks/autostart && \ diff --git a/debian/patches/debian/Prefer-sbin-over-usr-sbin.patch b/debian/patches/debian/Prefer-sbin-over-usr-sbin.patch index 5d0dc9539..428c996b7 100644 --- a/debian/patches/debian/Prefer-sbin-over-usr-sbin.patch +++ b/debian/patches/debian/Prefer-sbin-over-usr-sbin.patch @@ -11,7 +11,7 @@ Closes: #895145 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 115eb60..df1ad85 100644 +index 0aecf68..5e49a3e 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,7 @@ then diff --git a/debian/patches/debian/Use-upstreams-polkit-rule.patch b/debian/patches/debian/Use-upstreams-polkit-rule.patch index b668ac85f..36880efe5 100644 --- a/debian/patches/debian/Use-upstreams-polkit-rule.patch +++ b/debian/patches/debian/Use-upstreams-polkit-rule.patch @@ -10,10 +10,10 @@ As of 1.2.16 upstream ships a Polkit rule like Debian does. 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am -index 8b1e4c8..5cce0d7 100644 +index 0d8d380..56679be 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -811,7 +811,6 @@ else ! WITH_LIBVIRTD +@@ -818,7 +818,6 @@ else ! WITH_LIBVIRTD install-logrotate: uninstall-logrotate: endif ! WITH_LIBVIRTD @@ -22,10 +22,10 @@ index 8b1e4c8..5cce0d7 100644 install-init:: $(SYSVINIT_FILES) install-sysconfig $(MKDIR_P) $(DESTDIR)$(sysconfdir)/rc.d/init.d diff --git a/src/Makefile.in b/src/Makefile.in -index d9d7146..01d41e6 100644 +index fad96a2..bd34b57 100644 --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -13072,12 +13072,12 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \ +@@ -12915,12 +12915,12 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatch.pl \ @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@ $(DESTDIR)$(policydir)/org.libvirt.unix.policy @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@ $(MKDIR_P) $(DESTDIR)$(datadir)/polkit-1/rules.d @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_TRUE@ $(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \ @@ -41,10 +41,10 @@ index d9d7146..01d41e6 100644 @WITH_LIBVIRTD_TRUE@@WITH_POLKIT_FALSE@install-polkit:: diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am -index 12600b8..8b374a7 100644 +index eb8d6fe..9467eaf 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am -@@ -213,12 +213,12 @@ install-polkit:: +@@ -218,12 +218,12 @@ install-polkit:: $(DESTDIR)$(policydir)/org.libvirt.unix.policy $(MKDIR_P) $(DESTDIR)$(datadir)/polkit-1/rules.d $(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \ diff --git a/debian/patches/debian/apparmor_profiles_local_include.patch b/debian/patches/debian/apparmor_profiles_local_include.patch index e587db487..9c92dba8c 100644 --- a/debian/patches/debian/apparmor_profiles_local_include.patch +++ b/debian/patches/debian/apparmor_profiles_local_include.patch @@ -20,10 +20,10 @@ index 6869685..f806e3c 100644 #include } diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd -index be4fabf..72d7987 100644 +index 3102cab..3a6c7d6 100644 --- a/examples/apparmor/usr.sbin.libvirtd +++ b/examples/apparmor/usr.sbin.libvirtd -@@ -118,4 +118,7 @@ +@@ -126,4 +126,7 @@ /usr/{lib,lib64,lib/qemu,libexec}/qemu-bridge-helper rmix, } diff --git a/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch b/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch deleted file mode 100644 index 1db913084..000000000 --- a/debian/patches/debian/fix-Debian-specific-path-to-hvm-loader.patch +++ /dev/null @@ -1,87 +0,0 @@ -From: =?utf-8?q?Guido_G=C3=BCnther?= -Date: Thu, 26 Feb 2009 14:29:58 +0100 -Subject: fix Debian specific path to hvm loader - -Closes: #517059 ---- - src/xen/xen_hypervisor.c | 2 +- - tests/xencapsdata/xen-i686-pae-hvm.xml | 2 +- - tests/xencapsdata/xen-ia64-be-hvm.xml | 2 +- - tests/xencapsdata/xen-ia64-hvm.xml | 2 +- - tests/xencapsdata/xen-x86_64-hvm.xml | 4 ++-- - 5 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c -index 4621507..136e0c2 100644 ---- a/src/xen/xen_hypervisor.c -+++ b/src/xen/xen_hypervisor.c -@@ -2146,7 +2146,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch, - "/usr/lib64/xen/bin/qemu-dm" : - "/usr/lib/xen/bin/qemu-dm"), - (guest_archs[i].hvm ? -- "/usr/lib/xen/boot/hvmloader" : -+ "/usr/lib/xen-default/boot/hvmloader" : - NULL), - 1, - machines)) == NULL) { -diff --git a/tests/xencapsdata/xen-i686-pae-hvm.xml b/tests/xencapsdata/xen-i686-pae-hvm.xml -index cf6a1de..435c141 100644 ---- a/tests/xencapsdata/xen-i686-pae-hvm.xml -+++ b/tests/xencapsdata/xen-i686-pae-hvm.xml -@@ -34,7 +34,7 @@ - - 32 - /usr/lib/xen/bin/qemu-dm -- /usr/lib/xen/boot/hvmloader -+ /usr/lib/xen-default/boot/hvmloader - xenfv - - -diff --git a/tests/xencapsdata/xen-ia64-be-hvm.xml b/tests/xencapsdata/xen-ia64-be-hvm.xml -index 19d23e9..5d60dc2 100644 ---- a/tests/xencapsdata/xen-ia64-be-hvm.xml -+++ b/tests/xencapsdata/xen-ia64-be-hvm.xml -@@ -31,7 +31,7 @@ - - 64 - /usr/lib/xen/bin/qemu-dm -- /usr/lib/xen/boot/hvmloader -+ /usr/lib/xen-default/boot/hvmloader - xenfv - - -diff --git a/tests/xencapsdata/xen-ia64-hvm.xml b/tests/xencapsdata/xen-ia64-hvm.xml -index 6e22372..b6f788e 100644 ---- a/tests/xencapsdata/xen-ia64-hvm.xml -+++ b/tests/xencapsdata/xen-ia64-hvm.xml -@@ -28,7 +28,7 @@ - - 64 - /usr/lib/xen/bin/qemu-dm -- /usr/lib/xen/boot/hvmloader -+ /usr/lib/xen-default/boot/hvmloader - xenfv - - -diff --git a/tests/xencapsdata/xen-x86_64-hvm.xml b/tests/xencapsdata/xen-x86_64-hvm.xml -index 7458f0b..6371e86 100644 ---- a/tests/xencapsdata/xen-x86_64-hvm.xml -+++ b/tests/xencapsdata/xen-x86_64-hvm.xml -@@ -31,7 +31,7 @@ - - 32 - /usr/lib64/xen/bin/qemu-dm -- /usr/lib/xen/boot/hvmloader -+ /usr/lib/xen-default/boot/hvmloader - xenfv - - -@@ -48,7 +48,7 @@ - - 64 - /usr/lib64/xen/bin/qemu-dm -- /usr/lib/xen/boot/hvmloader -+ /usr/lib/xen-default/boot/hvmloader - xenfv - - diff --git a/debian/patches/debian/remove-RHism.diff.patch b/debian/patches/debian/remove-RHism.diff.patch index 0d155f614..dd5a8ffab 100644 --- a/debian/patches/debian/remove-RHism.diff.patch +++ b/debian/patches/debian/remove-RHism.diff.patch @@ -7,7 +7,7 @@ Subject: remove-RHism.diff 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod -index 9d69a75..b29d628 100644 +index 929958a..6668ab5 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -119,7 +119,7 @@ virsh is coming from and which options and driver are compiled in. diff --git a/debian/patches/series b/debian/patches/series index e9a402e32..4a7de797c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,8 +8,6 @@ openpty-Skip-test-if-no-pty-is-available.patch Disable-gnulib-s-test-nonplocking-pipe.sh.patch Skip-vircgrouptest.patch debian/Don-t-enable-default-network-on-boot.patch -debian/fix-Debian-specific-path-to-hvm-loader.patch -Allow-xen-toolstack-to-find-it-s-binaries.patch test-posix_openpt-don-t-fail-on-EACCESS.patch Reduce-udevadm-settle-timeout-to-10-seconds.patch debian/Use-upstreams-polkit-rule.patch -- cgit v1.2.3