From 4dcd0dfea66d3e6df8425a08d3f102c47aca2228 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 18 Feb 2013 11:44:33 +0100 Subject: [PATCH] reset libvirt build deps, in order to determine what's really required with a smaller set of features --- lxc.mk | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/lxc.mk b/lxc.mk index d21953d4..85b0c9d7 100644 --- a/lxc.mk +++ b/lxc.mk @@ -129,21 +129,27 @@ ifeq "$(local_libvirt)" "true" libvirt-MODULES := libvirt libvirt-SPEC := libvirt.spec libvirt-BUILD-FROM-SRPM := yes -libvirt-DEVEL-RPMS += libxml2-devel gnutls-devel device-mapper-devel yajl-devel gettext -libvirt-DEVEL-RPMS += python-devel libcap-ng-devel libpciaccess-devel radvd numactl-devel -libvirt-DEVEL-RPMS += xhtml1-dtds libxslt libtasn1-devel systemtap-sdt-devel iptables-ipv6 augeas -libvirt-DEVEL-RPMS += libudev-devel libpcap-devel libnl-devel ebtables scrub ceph-devel -# added for 0.10.2 -libvirt-DEVEL-RPMS += xen-devel sanlock-devel avahi-devel cyrus-sasl-devel polkit qemu-img lvm2 -libvirt-DEVEL-RPMS += iscsi-initiator-utils parted-devel libssh2-devel netcf-devel libwsman-devel -libvirt-DEVEL-RPMS += audit-libs-devel nfs-utils libblkid-devel -# The --without options are breaking spec2make +# The --without options are breaking spec2make : hard-wired in the specfile instead #libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without storage-scsi \ # --without storage-fs --without storage-lvm \ # --without polkit --without sasl --without audit --with capng --with udev \ # --without netcf --without avahi --without sanlock \ # --without xen --without qemu --without hyperv --without phyp --without esx \ # --without libxl \ +#libvirt-DEVEL-RPMS += libxml2-devel gnutls-devel device-mapper-devel yajl-devel gettext +#libvirt-DEVEL-RPMS += python-devel libcap-ng-devel libpciaccess-devel radvd numactl-devel +#libvirt-DEVEL-RPMS += xhtml1-dtds libxslt libtasn1-devel systemtap-sdt-devel iptables-ipv6 augeas +#libvirt-DEVEL-RPMS += libudev-devel libpcap-devel libnl-devel ebtables scrub ceph-devel +# added for 0.10.2 +#libvirt-DEVEL-RPMS += xen-devel sanlock-devel avahi-devel cyrus-sasl-devel polkit qemu-img lvm2 +#libvirt-DEVEL-RPMS += iscsi-initiator-utils parted-devel libssh2-devel netcf-devel libwsman-devel +#libvirt-DEVEL-RPMS += audit-libs-devel nfs-utils libblkid-devel +# added for 1.0.2 on f16+f18 +#libvirt-DEVEL-RPMS += libattr-devel libssh2-devel +# added for 1.0.2 on f18 +#ifneq "$(DISTRONAME)" "f16" +#libvirt-devel-RPMS" += libnl3-devel fuse-devel dbus-devel numad +#endif libvirt-RPMFLAGS := --define 'packager PlanetLab' ALL += libvirt IN_NODEREPO += libvirt -- 2.43.0