reset libvirt build deps, in order to determine what's really required

[build.git] / lxc.mk

diff --git a/lxc.mk b/lxc.mk
index e70fc9d..85b0c9d 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -13,8 +13,8 @@
 #
 # lxctools: scripts for entering containers
 #
-lxctools-MODULES := transforward
-lxctools-SPEC := transforward.spec
+lxctools-MODULES := lxctools
+lxctools-SPEC := lxctools.spec
 ALL += lxctools
 IN_NODEIMAGE += lxctools
 
@@ -116,11 +116,11 @@ fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
 IN_NODEIMAGE += fprobe-ulog
 
-#################### libvirt on f16 is too old, sounds like f17 has something fine
-local_libvirt=false
-ifeq "$(DISTRONAME)" "f16"
+#################### using our own libvirt on all distros for now
+#local_libvirt=false
+#ifeq "$(DISTRONAME)" "f16"
 local_libvirt=true
-endif
+#endif
 
 ifeq "$(local_libvirt)" "true"
 #
@@ -129,17 +129,28 @@ 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
-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 \
-                       --define 'packager PlanetLab'
+# 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
 IN_NODEIMAGE += libvirt
@@ -242,7 +253,7 @@ ALL += bind_public
 # plcapi
 #
 plcapi-MODULES := plcapi
-plcapi-SPEC := PLCAPI.spec
+plcapi-SPEC := plcapi.spec
 ALL += plcapi
 IN_MYPLC += plcapi