[PATCHv2 0/4] libvirt fixes

[PATCHv2 0/4] libvirt fixes

[Jonas Eriksson]

Hi,

Resubmitting the series without the LXC IMAGE/DISTRO_FEATURE patch.

Regards,
/Jonas

Jonas Eriksson (4):
  libvirt: Change license to LGPLv2.1+
  libvirt: Fix selinux DISTRO_FEATURE check
  libvirt: Use DISTRO_FEATURES to enable Xen support
  libvirt: Disable polkit driver when there is no x11

 recipes-extended/libvirt/libvirt_1.2.1.bb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

-- 
1.9.rc1

[PATCH 1/4] libvirt: Change license to LGPLv2.1+

[Jonas Eriksson]

libvirt is to a large extent licensed under LGPLv2.1 (or later) rather
than GPLv2. From my investigations, there are only some tests and a
couple of files under tools are licensed as GPL. Other than that, files
are generally licensed as LGPL. My recommendation is therefore to set
the default license to LGPLv2.1+, and to add a LICENSE_${PN}-ptest that
is set to LGPLv2.1+ & GPLv2+ if a ptest package is added. This is
preferred to avoid having to specify explicit licenses for every other
package, such as the auto generated libvirt-locale-XX packages.

Signed-off-by: Jonas Eriksson <jonas.eriksson@enea.com>
Acked-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 recipes-extended/libvirt/libvirt_1.2.1.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/recipes-extended/libvirt/libvirt_1.2.1.bb b/recipes-extended/libvirt/libvirt_1.2.1.bb
index 3b95486..d30f09d 100644
--- a/recipes-extended/libvirt/libvirt_1.2.1.bb
+++ b/recipes-extended/libvirt/libvirt_1.2.1.bb
@@ -1,7 +1,8 @@
 DESCRIPTION = "A toolkit to interact with the virtualization capabilities of recent versions of Linux." 
 HOMEPAGE = "http://libvirt.org"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+LICENSE = "LGPLv2.1+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c"
 SECTION = "console/tools"
 PR = "r1"
 
-- 
1.9.rc1

[PATCH 2/4] libvirt: Fix selinux DISTRO_FEATURE check

[Jonas Eriksson]

It seems that a $ was forgotten in the DISTRO_FEATURE check for selinux.

Signed-off-by: Jonas Eriksson <jonas.eriksson@enea.com>
Acked-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 recipes-extended/libvirt/libvirt_1.2.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/libvirt/libvirt_1.2.1.bb b/recipes-extended/libvirt/libvirt_1.2.1.bb
index d30f09d..76d3f42 100644
--- a/recipes-extended/libvirt/libvirt_1.2.1.bb
+++ b/recipes-extended/libvirt/libvirt_1.2.1.bb
@@ -111,7 +111,7 @@ INITSCRIPT_PARAMS_${PN}-libvirtd = "defaults 72"
 # full config
 PACKAGECONFIG ??= "qemu yajl xen libxl xen-inotify uml openvz vmware vbox esx iproute2 \
                    polkit lxc test remote macvtap libvirtd netcf udev python ebtables \
-                   {@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
+                   ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
                   "
 
 # enable,disable,depends,rdepends
-- 
1.9.rc1

[PATCH 3/4] libvirt: Use DISTRO_FEATURES to enable Xen support

[Jonas Eriksson]

The Xen drivers in libvirt is needed when the build file system image
and kernel are running as dom0. The parts of the kernel needed to run as
dom0 are controlled by DISTRO_FEATURES, and thus there is no need for
the Xen drivers if DISTRO_FEATURES does not contain 'xen'.

Signed-off-by: Jonas Eriksson <jonas.eriksson@enea.com>
Acked-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 recipes-extended/libvirt/libvirt_1.2.1.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/recipes-extended/libvirt/libvirt_1.2.1.bb b/recipes-extended/libvirt/libvirt_1.2.1.bb
index 76d3f42..5365b8d 100644
--- a/recipes-extended/libvirt/libvirt_1.2.1.bb
+++ b/recipes-extended/libvirt/libvirt_1.2.1.bb
@@ -109,9 +109,10 @@ INITSCRIPT_PARAMS_${PN}-libvirtd = "defaults 72"
 #PACKAGECONFIG ??= "xen libxl xen-inotify test remote libvirtd"
 
 # full config
-PACKAGECONFIG ??= "qemu yajl xen libxl xen-inotify uml openvz vmware vbox esx iproute2 \
-                   polkit lxc test remote macvtap libvirtd netcf udev python ebtables \
+PACKAGECONFIG ??= "qemu yajl uml openvz vmware vbox esx iproute2 polkit 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)} \
                   "
 
 # enable,disable,depends,rdepends
-- 
1.9.rc1

[PATCH 4/4] libvirt: Disable polkit driver when there is no x11

[Jonas Eriksson]

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>
---
 recipes-extended/libvirt/libvirt_1.2.1.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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)} \
                   "
 
 # enable,disable,depends,rdepends
-- 
1.9.rc1