libvirt: move python PACKAGECONFIG into main recipe

The libvirt-python.inc manipulation of PACKAGECONFIG meant that the default
configuration options of the libvirt recipe never fired, since the variable
had an assignment and the lazy set of the configuration values never
applied to the build.

Moving the python PACKAGE_CONFIG options into the main recipe, and ensuring
that PACKAGE_CONFIG_${PN} is used for libvirt-python means that most builds
will now use the default configuration.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

2 files changed, 4 insertions, 5 deletions

diff --git a/recipes-extended/libvirt/libvirt-python.inc b/recipes-extended/libvirt/libvirt-python.inc
index 63e06577..1bf63234 100644
--- a/recipes-extended/libvirt/libvirt-python.inc
+++ b/recipes-extended/libvirt/libvirt-python.inc
@@ -5,8 +5,6 @@ export STAGING_LIBDIR
 export BUILD_SYS 
 export HOST_SYS
 
-PACKAGECONFIG += "python"
-PACKAGECONFIG[python] = "--with-python,--without-python,python,"
 RDEPENDS_${PN}-python += "python"
 PACKAGECONFIG_${PN}-python[xen] = ",,,xen-python"
 
diff --git a/recipes-extended/libvirt/libvirt_1.1.1.bb b/recipes-extended/libvirt/libvirt_1.1.1.bb
index 4502e852..2b971dfd 100644
--- a/recipes-extended/libvirt/libvirt_1.1.1.bb
+++ b/recipes-extended/libvirt/libvirt_1.1.1.bb
@@ -112,9 +112,9 @@ INITSCRIPT_PARAMS_${PN}-libvirtd = "defaults 72"
 
 # full config
 PACKAGECONFIG ??= "qemu yajl xen libxl xen-inotify uml openvz vmware vbox esx \
-                  polkit lxc test remote macvtap libvirtd netcf udev python \
-                  ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
-                  ebtables"
+                   polkit lxc test remote macvtap libvirtd netcf udev python ebtables \
+                   {@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
+                  "
 
 # enable,disable,depends,rdepends
 #
@@ -142,6 +142,7 @@ PACKAGECONFIG[dtrace] = "--with-dtrace,--without-dtrace,,"
 PACKAGECONFIG[udev] = "--with-udev --with-pciaccess,--without-udev,udev libpciaccess,"
 PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux,"
 PACKAGECONFIG[ebtables] = "ac_cv_path_EBTABLES_PATH=/sbin/ebtables,ac_cv_path_EBTABLES_PATH=,ebtables,ebtables"
+PACKAGECONFIG[python] = "--with-python,--without-python,python,"
 
 # Enable the Python tool support
 require libvirt-python.inc