diff options
| -rw-r--r-- | recipes-extended/libvirt/libvirt-python.inc | 2 | ||||
| -rw-r--r-- | recipes-extended/libvirt/libvirt_1.1.1.bb | 7 |
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 | |||
| 5 | export BUILD_SYS | 5 | export BUILD_SYS |
| 6 | export HOST_SYS | 6 | export HOST_SYS |
| 7 | 7 | ||
| 8 | PACKAGECONFIG += "python" | ||
| 9 | PACKAGECONFIG[python] = "--with-python,--without-python,python," | ||
| 10 | RDEPENDS_${PN}-python += "python" | 8 | RDEPENDS_${PN}-python += "python" |
| 11 | PACKAGECONFIG_${PN}-python[xen] = ",,,xen-python" | 9 | PACKAGECONFIG_${PN}-python[xen] = ",,,xen-python" |
| 12 | 10 | ||
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" | |||
| 112 | 112 | ||
| 113 | # full config | 113 | # full config |
| 114 | PACKAGECONFIG ??= "qemu yajl xen libxl xen-inotify uml openvz vmware vbox esx \ | 114 | PACKAGECONFIG ??= "qemu yajl xen libxl xen-inotify uml openvz vmware vbox esx \ |
| 115 | polkit lxc test remote macvtap libvirtd netcf udev python \ | 115 | polkit lxc test remote macvtap libvirtd netcf udev python ebtables \ |
| 116 | ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ | 116 | {@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ |
| 117 | ebtables" | 117 | " |
| 118 | 118 | ||
| 119 | # enable,disable,depends,rdepends | 119 | # enable,disable,depends,rdepends |
| 120 | # | 120 | # |
| @@ -142,6 +142,7 @@ PACKAGECONFIG[dtrace] = "--with-dtrace,--without-dtrace,," | |||
| 142 | PACKAGECONFIG[udev] = "--with-udev --with-pciaccess,--without-udev,udev libpciaccess," | 142 | PACKAGECONFIG[udev] = "--with-udev --with-pciaccess,--without-udev,udev libpciaccess," |
| 143 | PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux," | 143 | PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux," |
| 144 | PACKAGECONFIG[ebtables] = "ac_cv_path_EBTABLES_PATH=/sbin/ebtables,ac_cv_path_EBTABLES_PATH=,ebtables,ebtables" | 144 | PACKAGECONFIG[ebtables] = "ac_cv_path_EBTABLES_PATH=/sbin/ebtables,ac_cv_path_EBTABLES_PATH=,ebtables,ebtables" |
| 145 | PACKAGECONFIG[python] = "--with-python,--without-python,python," | ||
| 145 | 146 | ||
| 146 | # Enable the Python tool support | 147 | # Enable the Python tool support |
| 147 | require libvirt-python.inc | 148 | require libvirt-python.inc |
