Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=78162a32df28e64d1f6dcee4cdbbe574e789ffdc
commit 78162a32df28e64d1f6dcee4cdbbe574e789ffdc Author: Miklos Vajna <vmik...@frugalware.org> Date: Mon Mar 7 19:46:07 2011 +0100 libvirt-0.8.8-3-x86_64 - add patch to avoid libcgroup dependency diff --git a/source/xlib-extra/libvirt/FrugalBuild b/source/xlib-extra/libvirt/FrugalBuild index 6a9a180..02e7ce6 100644 --- a/source/xlib-extra/libvirt/FrugalBuild +++ b/source/xlib-extra/libvirt/FrugalBuild @@ -3,7 +3,7 @@ pkgname=libvirt pkgver=0.8.8 -pkgrel=2 +pkgrel=3 pkgdesc="libvirt is a library providing access to information from various virtualization tools" url="http://libvirt.org" depends=('libxml2' 'gnutls' 'cyrus-sasl' 'parted>=2.3' 'lvm2' 'libnl') @@ -13,11 +13,12 @@ groups=('xlib-extra') archs=('x86_64' 'i686') up2date="lynx -dump ftp://libvirt.org/libvirt/|grep "[0-9].tar.gz$"|sed 's/.*-\(.*\).t.*/\1/'|Fsort|sed -n '$ p'" source=(ftp://ftp.libvirt.org/libvirt/$pkgname-$pkgver.tar.gz rc.libvirtd rc.libvirt-guests \ - fix_iptables_path.patch) + fix_iptables_path.patch qemu-no-cgroup.patch) sha1sums=('b80374768d7bc3234735c1221aa554c75fe79ab8' \ 'c14b6de4e3bf04c12757606223e165f37ffc9ea7' \ '1ede84a711b8ca63c04af077fd1e915f6491221a' \ - '3ef036f94a6903e871e2ae8ea2b01fa81943e375') + '3ef036f94a6903e871e2ae8ea2b01fa81943e375' \ + '6bf977880181f25a12a7c5a274d0193ca3609281') subpkgs=('libvirt-python') subdescs=('Python bindings for libvirt') diff --git a/source/xlib-extra/libvirt/qemu-no-cgroup.patch b/source/xlib-extra/libvirt/qemu-no-cgroup.patch new file mode 100644 index 0000000..b926ad4 --- /dev/null +++ b/source/xlib-extra/libvirt/qemu-no-cgroup.patch @@ -0,0 +1,40 @@ +diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c +index e71d3fa..44211a6 100644 +--- a/src/qemu/qemu_cgroup.c ++++ b/src/qemu/qemu_cgroup.c +@@ -46,7 +46,7 @@ static const char *const defaultDeviceACL[] = { + int qemuCgroupControllerActive(struct qemud_driver *driver, + int controller) + { +- if (driver->cgroup == NULL) ++ /*if (driver->cgroup == NULL)*/ + return 0; + if (!virCgroupMounted(driver->cgroup, controller)) + return 0; +@@ -202,7 +202,7 @@ int qemuSetupCgroup(struct qemud_driver *driver, + (const char *const *)driver->cgroupDeviceACL : + defaultDeviceACL; + +- if (driver->cgroup == NULL) ++ /*if (driver->cgroup == NULL)*/ + return 0; /* Not supported, so claim success */ + + rc = virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 1); +@@ -364,7 +364,7 @@ int qemuRemoveCgroup(struct qemud_driver *driver, + virCgroupPtr cgroup; + int rc; + +- if (driver->cgroup == NULL) ++ /*if (driver->cgroup == NULL)*/ + return 0; /* Not supported, so claim success */ + + rc = virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0); +@@ -388,7 +388,7 @@ int qemuAddToCgroup(struct qemud_driver *driver, + int ret = -1; + int rc; + +- if (driver->cgroup == NULL) ++ /*if (driver->cgroup == NULL)*/ + return 0; /* Not supported, so claim success */ + + rc = virCgroupForDomain(driver->cgroup, def->name, &cgroup, 0); _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git