diff options
| author | Mingli Yu <Mingli.Yu@windriver.com> | 2019-07-15 10:09:31 +0800 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-07-16 19:40:49 +0000 |
| commit | 990d6d8d2bc9c1551cb5df36bac3e4b544841f12 (patch) | |
| tree | 94786fb4a211fbf64501c1a669a99a6c634e58c2 /recipes-extended/libvirt | |
| parent | cd3767f0b0e6f5802a575433d0ca62f8fee3e5a0 (diff) | |
| download | meta-virtualization-990d6d8d2bc9c1551cb5df36bac3e4b544841f12.tar.gz | |
libvirt: Only add polkit to PACKAGECONFIG if polkit is in DISTRO_FEATURES
At first, the polkit support is always enabled in
PACKAGECONFIG and since Feb 27 2014, use x11
DISTRO_FEATURES to control the polkit support
with below commit.
=========================================================
commit ce991a62d5f2ce006074ee4b8a97c6029308548c
Author: Jonas Eriksson <jonas.eriksson@enea.com>
Date: Thu Feb 27 17:10:09 2014 +0100
libvirt: Disable polkit driver when there is no x11
To avoid having the default build of libvirt depend on virtual/x11
through polkit and consolekit, check for x11 in DISTRO_FEATURES before
enabling the polkit support in the default PKG_CONFIG.
Signed-off-by: Jonas Eriksson <jonas.eriksson@enea.com>
Acked-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
diff --git a/recipes-extended/libvirt/libvirt_1.2.1.bb b/recipes-extended/libvirt/libvirt_1.2.1.bb
index 5365b8d..4c9cf36 100644
--- a/recipes-extended/libvirt/libvirt_1.2.1.bb
+++ b/recipes-extended/libvirt/libvirt_1.2.1.bb
@@ -109,10 +109,11 @@ INITSCRIPT_PARAMS_${PN}-libvirtd = "defaults 72"
#PACKAGECONFIG ??= "xen libxl xen-inotify test remote libvirtd"
# full config
-PACKAGECONFIG ??= "qemu yajl uml openvz vmware vbox esx iproute2 polkit lxc test \
+PACKAGECONFIG ??= "qemu yajl uml openvz vmware vbox esx iproute2 lxc test \
remote macvtap libvirtd netcf udev python ebtables \
${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
${@base_contains('DISTRO_FEATURES', 'xen', 'xen libxl xen-inotify', '', d)} \
+ ${@base_contains('DISTRO_FEATURES', 'x11', 'polkit', '', d)} \
"
=========================================================
After below commits to add polkit as a required distro feature
in meta-oe, we should unify altogether to enable polkit if
polkit distro feature is set.
97a1a55 polkit: add polkit as a required distro
feature c049e02 polkit: inherit distro_features_check
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-extended/libvirt')
| -rw-r--r-- | recipes-extended/libvirt/libvirt_5.5.0.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-extended/libvirt/libvirt_5.5.0.bb b/recipes-extended/libvirt/libvirt_5.5.0.bb index 222654a3..7ed40a64 100644 --- a/recipes-extended/libvirt/libvirt_5.5.0.bb +++ b/recipes-extended/libvirt/libvirt_5.5.0.bb | |||
| @@ -188,7 +188,7 @@ PACKAGECONFIG ??= "qemu yajl openvz vmware vbox esx iproute2 lxc test \ | |||
| 188 | fuse iproute2 firewalld libpcap \ | 188 | fuse iproute2 firewalld libpcap \ |
| 189 | ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit libcap-ng', '', d)} \ | 189 | ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit libcap-ng', '', d)} \ |
| 190 | ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'libxl', '', d)} \ | 190 | ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'libxl', '', d)} \ |
| 191 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'polkit', '', d)} \ | 191 | ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'polkit', '', d)} \ |
| 192 | ${@bb.utils.contains('KARCH', 'arm', '', 'numactl', d)} \ | 192 | ${@bb.utils.contains('KARCH', 'arm', '', 'numactl', d)} \ |
| 193 | " | 193 | " |
| 194 | 194 | ||