MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

libvirt: move python PACKAGECONFIG into main recipe

Browse Source 
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>
This commit is contained in:
Bruce Ashfield 2013-08-11 00:16:58 -04:00
parent dd0c48bd13
commit 5c9d22f016
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes-extended/libvirt/libvirt-python.inc
View File

@ -5,8 +5,6 @@ export STAGING_LIBDIR
export BUILD_SYS export BUILD_SYS
export HOST_SYS export HOST_SYS
PACKAGECONFIG += "python"
PACKAGECONFIG[python] = "--with-python,--without-python,python,"
RDEPENDS_${PN}-python += "python" RDEPENDS_${PN}-python += "python"
PACKAGECONFIG_${PN}-python[xen] = ",,,xen-python" PACKAGECONFIG_${PN}-python[xen] = ",,,xen-python"

7
recipes-extended/libvirt/libvirt_1.1.1.bb
View File

@ -112,9 +112,9 @@ INITSCRIPT_PARAMS_${PN}-libvirtd = "defaults 72"
# full config # full config
PACKAGECONFIG ??= "qemu yajl xen libxl xen-inotify uml openvz vmware vbox esx \ PACKAGECONFIG ??= "qemu yajl xen libxl xen-inotify uml openvz vmware vbox esx \
polkit lxc test remote macvtap libvirtd netcf udev python \ polkit lxc test remote macvtap libvirtd netcf udev python ebtables \
${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ {@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
ebtables" "
# enable,disable,depends,rdepends # 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[udev] = "--with-udev --with-pciaccess,--without-udev,udev libpciaccess,"
PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux," PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux,"
PACKAGECONFIG[ebtables] = "ac_cv_path_EBTABLES_PATH=/sbin/ebtables,ac_cv_path_EBTABLES_PATH=,ebtables,ebtables" 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 # Enable the Python tool support
require libvirt-python.inc require libvirt-python.inc