diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-05-07 09:10:58 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-05-07 09:10:58 -0400 |
commit | fba03603996dd9221717e0bed648c28cfdeb2ead (patch) | |
tree | 9df2c2dfd0ce2c27fd3ca5c4892c591c754243e1 /recipes-extended/libvirt | |
parent | df0678b3c9c44aac9703dcf78ceb4fdbe8397f3e (diff) | |
download | meta-virtualization-fba03603996dd9221717e0bed648c28cfdeb2ead.tar.gz |
Revert "libvirt: force use of libssh2"
This reverts commit df0678b3c9c44aac9703dcf78ceb4fdbe8397f3e.
Diffstat (limited to 'recipes-extended/libvirt')
-rw-r--r-- | recipes-extended/libvirt/libvirt_1.2.2.bb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/recipes-extended/libvirt/libvirt_1.2.2.bb b/recipes-extended/libvirt/libvirt_1.2.2.bb index eaa880c6..a66a6adb 100644 --- a/recipes-extended/libvirt/libvirt_1.2.2.bb +++ b/recipes-extended/libvirt/libvirt_1.2.2.bb | |||
@@ -134,7 +134,6 @@ PRIVATE_LIBS_${PN}-ptest = " \ | |||
134 | # full config | 134 | # full config |
135 | PACKAGECONFIG ??= "qemu yajl uml openvz vmware vbox esx iproute2 lxc test \ | 135 | PACKAGECONFIG ??= "qemu yajl uml openvz vmware vbox esx iproute2 lxc test \ |
136 | remote macvtap libvirtd netcf udev python ebtables \ | 136 | remote macvtap libvirtd netcf udev python ebtables \ |
137 | ssh2 \ | ||
138 | ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ | 137 | ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ |
139 | ${@base_contains('DISTRO_FEATURES', 'xen', 'xen libxl xen-inotify', '', d)} \ | 138 | ${@base_contains('DISTRO_FEATURES', 'xen', 'xen libxl xen-inotify', '', d)} \ |
140 | ${@base_contains('DISTRO_FEATURES', 'x11', 'polkit', '', d)} \ | 139 | ${@base_contains('DISTRO_FEATURES', 'x11', 'polkit', '', d)} \ |
@@ -170,7 +169,6 @@ PACKAGECONFIG[python] = ",,python," | |||
170 | PACKAGECONFIG[sasl] = "--with-sasl,--without-sasl,cyrus-sasl,cyrus-sasl" | 169 | PACKAGECONFIG[sasl] = "--with-sasl,--without-sasl,cyrus-sasl,cyrus-sasl" |
171 | PACKAGECONFIG[iproute2] = "ac_cv_path_IP_PATH=/sbin/ip,ac_cv_path_IP_PATH=,iproute2,iproute2" | 170 | PACKAGECONFIG[iproute2] = "ac_cv_path_IP_PATH=/sbin/ip,ac_cv_path_IP_PATH=,iproute2,iproute2" |
172 | PACKAGECONFIG[numactl] = "--with-numactl,--without-numactl,numactl," | 171 | PACKAGECONFIG[numactl] = "--with-numactl,--without-numactl,numactl," |
173 | PACKAGECONFIG[ssh2] = "--with-ssh2,--without-ssh2,libssh2," | ||
174 | 172 | ||
175 | # Enable the Python tool support | 173 | # Enable the Python tool support |
176 | require libvirt-python.inc | 174 | require libvirt-python.inc |