Merge branch 'master' of ssh://git.onelab.eu/git/build

[build.git] / lxc.mk

diff --git a/lxc.mk b/lxc.mk
index 3c5b8a8..6bb9ba3 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -10,6 +10,23 @@
 
 ### the madwifi drivers ahip with fedora16's kernel rpm
 
+#
+# lxctools: scripts for entering containers
+#
+lxctools-MODULES := lxctools
+lxctools-SPEC := lxctools.spec
+ALL += lxctools
+IN_NODEIMAGE += lxctools
+
+#
+# lxcsu: root context module for entering namespaces
+#
+lxcsu-MODULES := lxcsu
+lxcsu-SPEC := lxcsu.spec
+ALL += lxcsu
+IN_NODEIMAGE += lxcsu
+
+#
 #
 # transforward: root context module for transparent port forwarding
 #
@@ -115,14 +132,15 @@ 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'
+libvirt-DEVEL-RPMS += libudev-devel libpcap-devel libnl-devel ebtables scrub ceph-devel
+# The --without options are breaking spec2make
+#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-RPMFLAGS :=    --define 'packager PlanetLab'
 ALL += libvirt
 IN_NODEREPO += libvirt
 IN_NODEIMAGE += libvirt