From d02e65c889aa757afe2f6538eb9815b513fae0ce Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 8 Dec 2015 18:33:25 +0100 Subject: meta-openstack: add wildcard to libvirt bbappend This is currently a dangling bbappend as libvirt is now version 1.2.15. The content of the file appears to still be relevant so simply renaming this bbappend to apply to a range of releases. This will throw a warning as no 'sanlock' PKGCONFIG currently exists in the base recipe, a commit will be sent for meta-virtualizaiton to add this. Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- .../recipes-extended/libvirt/libvirt_1.%.bbappend | 13 +++++++++++++ .../recipes-extended/libvirt/libvirt_1.2.12.bbappend | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 meta-openstack/recipes-extended/libvirt/libvirt_1.%.bbappend delete mode 100644 meta-openstack/recipes-extended/libvirt/libvirt_1.2.12.bbappend (limited to 'meta-openstack') diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_1.%.bbappend b/meta-openstack/recipes-extended/libvirt/libvirt_1.%.bbappend new file mode 100644 index 0000000..195633b --- /dev/null +++ b/meta-openstack/recipes-extended/libvirt/libvirt_1.%.bbappend @@ -0,0 +1,13 @@ +PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \ + python sanlock ebtables \ + ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ + " + +inherit useradd +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "--system libvirt" + +do_install_append() { + sed -e "s:^#unix_sock_group =:unix_sock_group =:g" -i ${D}/etc/libvirt/libvirtd.conf + sed -e "s:^#unix_sock_rw_perms =:unix_sock_rw_perms =:g" -i ${D}/etc/libvirt/libvirtd.conf +} diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_1.2.12.bbappend b/meta-openstack/recipes-extended/libvirt/libvirt_1.2.12.bbappend deleted file mode 100644 index 195633b..0000000 --- a/meta-openstack/recipes-extended/libvirt/libvirt_1.2.12.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \ - python sanlock ebtables \ - ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ - " - -inherit useradd -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system libvirt" - -do_install_append() { - sed -e "s:^#unix_sock_group =:unix_sock_group =:g" -i ${D}/etc/libvirt/libvirtd.conf - sed -e "s:^#unix_sock_rw_perms =:unix_sock_rw_perms =:g" -i ${D}/etc/libvirt/libvirtd.conf -} -- cgit v1.2.3-54-g00ecf