Skip to contentSkip to conversation

libvirt: Only add polkit to PACKAGECONFIG if polkit is in DISTRO_FEATURES

PATCH Superseded [email protected] 2 participants 4 messages Jul 12, 2019 – Jul 16, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libvirt: Only add polkit to PACKAGECONFIG if polkit is in DISTRO_FEATURES

From: Mingli Yu <[email protected]>

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 <[email protected]>
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.

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

---
 recipes-extended/libvirt/libvirt_5.3.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-extended/libvirt/libvirt_5.3.0.bb +1 -1
index c54a99e..286f0de 100644
@@ -188,7 +188,7 @@ PACKAGECONFIG ??= "qemu yajl openvz vmware vbox esx iproute2 lxc test \
                    fuse iproute2 firewalld libpcap \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit libcap-ng', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'libxl', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'polkit', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'polkit', '', d)} \
                    ${@bb.utils.contains('KARCH', 'arm', '', 'numactl', d)} \
                   "
 
Signature · 1 line
2.7.4
#1 lore raw

I just pushed an update to libvirt to master. Can you rebase and resend this on top of the latest ?

Bruce

Quoted 71 lines · On Fri, Jul 12, 2019 at 2:46 AM <[email protected]> wrote:

From: Mingli Yu <[email protected]>

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 <[email protected]>
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.

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

---
 recipes-extended/libvirt/libvirt_5.3.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-extended/libvirt/libvirt_5.3.0.bb +1 -2
index c54a99e..286f0de 100644
@@ -188,7 +188,7 @@ PACKAGECONFIG ??= "qemu yajl openvz vmware vbox esx iproute2 lxc test \
                    fuse iproute2 firewalld libpcap \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit libcap-ng', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'libxl', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'polkit', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'polkit', '', d)} \
                    ${@bb.utils.contains('KARCH', 'arm', '', 'numactl', d)} \
                   "
 
--

2.7.4

--
_______________________________________________
meta-virtualization mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-virtualization

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
#2 lore raw

PATCH v2 1/1 libvirt: Only add polkit to PACKAGECONFIG if polkit is in DISTRO_FEATURES

From: Mingli Yu <[email protected]>

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 <[email protected]>
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.

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

---
 recipes-extended/libvirt/libvirt_5.5.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-extended/libvirt/libvirt_5.5.0.bb +1 -1
index 222654a..7ed40a6 100644
@@ -188,7 +188,7 @@ PACKAGECONFIG ??= "qemu yajl openvz vmware vbox esx iproute2 lxc test \
                    fuse iproute2 firewalld libpcap \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit libcap-ng', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'libxl', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'polkit', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'polkit', '', d)} \
                    ${@bb.utils.contains('KARCH', 'arm', '', 'numactl', d)} \
                   "
 
Signature · 1 line
2.7.4
#3 lore raw

Thanks for the rebase.

Merged.

Bruce

Quoted 66 lines · On Sun, Jul 14, 2019 at 10:10 PM <[email protected]> wrote:

From: Mingli Yu <[email protected]>

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 <[email protected]>
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.

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

---
 recipes-extended/libvirt/libvirt_5.5.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-extended/libvirt/libvirt_5.5.0.bb +1 -2
index 222654a..7ed40a6 100644
@@ -188,7 +188,7 @@ PACKAGECONFIG ??= "qemu yajl openvz vmware vbox esx iproute2 lxc test \
                    fuse iproute2 firewalld libpcap \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit libcap-ng', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'xen', 'libxl', '', d)} \
-                   ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'polkit', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'polkit', '', d)} \
                    ${@bb.utils.contains('KARCH', 'arm', '', 'numactl', d)} \
                   "
 
--

2.7.4

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II