diff options
| author | Joe Slater <jslater@windriver.com> | 2014-05-05 13:43:02 -0700 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-05-06 00:27:49 -0400 |
| commit | df0678b3c9c44aac9703dcf78ceb4fdbe8397f3e (patch) | |
| tree | 98c7815a45c7ca0d6237c0886012992189fad1b4 | |
| parent | 0722667aab18ac49ccca96c55c2459ead023a552 (diff) | |
| download | meta-virtualization-df0678b3c9c44aac9703dcf78ceb4fdbe8397f3e.tar.gz | |
libvirt: force use of libssh2
We add a PACKAGECONFIG[] to deterministically build with
or without libssh2 and add ssh2 to PACKAGECONFIG, so we will
always use it.
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
| -rw-r--r-- | recipes-extended/libvirt/libvirt_1.2.2.bb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes-extended/libvirt/libvirt_1.2.2.bb b/recipes-extended/libvirt/libvirt_1.2.2.bb index a66a6adb..eaa880c6 100644 --- a/recipes-extended/libvirt/libvirt_1.2.2.bb +++ b/recipes-extended/libvirt/libvirt_1.2.2.bb | |||
| @@ -134,6 +134,7 @@ 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 \ | ||
| 137 | ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ | 138 | ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ |
| 138 | ${@base_contains('DISTRO_FEATURES', 'xen', 'xen libxl xen-inotify', '', d)} \ | 139 | ${@base_contains('DISTRO_FEATURES', 'xen', 'xen libxl xen-inotify', '', d)} \ |
| 139 | ${@base_contains('DISTRO_FEATURES', 'x11', 'polkit', '', d)} \ | 140 | ${@base_contains('DISTRO_FEATURES', 'x11', 'polkit', '', d)} \ |
| @@ -169,6 +170,7 @@ PACKAGECONFIG[python] = ",,python," | |||
| 169 | PACKAGECONFIG[sasl] = "--with-sasl,--without-sasl,cyrus-sasl,cyrus-sasl" | 170 | PACKAGECONFIG[sasl] = "--with-sasl,--without-sasl,cyrus-sasl,cyrus-sasl" |
| 170 | PACKAGECONFIG[iproute2] = "ac_cv_path_IP_PATH=/sbin/ip,ac_cv_path_IP_PATH=,iproute2,iproute2" | 171 | PACKAGECONFIG[iproute2] = "ac_cv_path_IP_PATH=/sbin/ip,ac_cv_path_IP_PATH=,iproute2,iproute2" |
| 171 | PACKAGECONFIG[numactl] = "--with-numactl,--without-numactl,numactl," | 172 | PACKAGECONFIG[numactl] = "--with-numactl,--without-numactl,numactl," |
| 173 | PACKAGECONFIG[ssh2] = "--with-ssh2,--without-ssh2,libssh2," | ||
| 172 | 174 | ||
| 173 | # Enable the Python tool support | 175 | # Enable the Python tool support |
| 174 | require libvirt-python.inc | 176 | require libvirt-python.inc |
