From 6b6b533607d3c15d37466b89dae64a42515f77e96422d1586644d88e020c3db5 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 10 Oct 2012 15:35:30 +0000 Subject: [PATCH] drop obsolete patch to fix build OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=131 --- 0001-launch-appliance-is-optional.patch | 41 ------------------------- libguestfs.spec | 2 -- 2 files changed, 43 deletions(-) delete mode 100644 0001-launch-appliance-is-optional.patch diff --git a/0001-launch-appliance-is-optional.patch b/0001-launch-appliance-is-optional.patch deleted file mode 100644 index 28d8aea..0000000 --- a/0001-launch-appliance-is-optional.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7abe52ae73d918b515098842b19cb54888729b72 Mon Sep 17 00:00:00 2001 -From: Olaf Hering -Date: Mon, 8 Oct 2012 19:51:38 +0200 -Subject: [PATCH] launch: appliance is optional - - # virt-filesystems -v -d 6326ad4e-5805-2ab4-1338-d1dad8c76162 --all -libguestfs: libvirt version = 10002 -libguestfs: [00000ms] connect to libvirt -libguestfs: [00001ms] get libvirt capabilities -libguestfs: [00234ms] build appliance -libguestfs: [00234ms] create libvirt XML -libguestfs: error: error constructing libvirt XML at "xmlTextWriterWriteAttribute (xo, BAD_CAST "file", BAD_CAST appliance)": No such file or directory -libguestfs: closing guestfs handle 0x656270 (state 0) - - # ls -lh /usr/lib64/guestfs/* --rw-r--r-- 1 root root 13M Oct 8 16:15 /usr/lib64/guestfs/initramfs.x86_64.img --rw-r--r-- 1 root root 3.7M Oct 6 09:25 /usr/lib64/guestfs/vmlinuz.x86_64 - -Signed-off-by: Olaf Hering ---- - src/launch-libvirt.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c -index d678266..5914642 100644 ---- a/src/launch-libvirt.c -+++ b/src/launch-libvirt.c -@@ -936,6 +936,10 @@ construct_libvirt_xml_appliance (guestfs_h *g, xmlTextWriterPtr xo, - char drive_name[64] = "sd"; - char scsi_target[64]; - -+ /* appliance is optional */ -+ if (appliance == NULL) -+ return 0; -+ - guestfs___drive_name (drv_index, &drive_name[2]); - snprintf (scsi_target, sizeof scsi_target, "%zu", drv_index); - --- -1.7.12.2 - diff --git a/libguestfs.spec b/libguestfs.spec index fd65a01..824097c 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -79,7 +79,6 @@ License: LGPL-2.1 Group: System/Filesystems Version: 1.19.49 Release: 0 -Patch0: 0001-launch-appliance-is-optional.patch Patch5: libguestfs-1.13.14-ruby.patch Patch1000: 1000-force-virtio_blk-in-old-guest-kernel.patch Source0: %{name}-%{version}.tar.gz @@ -354,7 +353,6 @@ virtual machines. %prep %setup -q -%patch0 -p1 %patch5 -p1 %patch1000 -p1