[meta-virtualization] [m-c-s][PATCH 02/11] meta-openstack: add wildcard to libvirt bbappend

Bruce Ashfield bruce.ashfield at gmail.com
Thu Aug 6 06:37:00 PDT 2015


On Thu, Aug 6, 2015 at 9:37 AM, Mark Asselstine
<mark.asselstine at windriver.com> wrote:
> On August 5, 2015 16:29:43 Mark Asselstine wrote:
>> 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.
>
> I might still send a commit for meta-virt to add the sanlock PKGCONFIG but
> there is yet to exist a recipe for sanlock so I might just do a V2 of this
> patch and remove 'sanlock' from the PACKAGECONFIG. Obviously this dangler has
> been dangling for a long time.
>

I just pushed the series. So rebase and send a fixup patch!

Bruce

> Mark
>
>>
>> Signed-off-by: Mark Asselstine <mark.asselstine at windriver.com>
>> ---
>>  .../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
>>
>> 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 -}
>> --
>> 2.1.4
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"


More information about the meta-virtualization mailing list