X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=4c14296cb6c180cfef64060ea6685866282da3ef;hb=8582ee8301df413f453f7cc8bfd9eec78c8028bc;hp=61aef0ec332e389ccc4cf3a90ce6c1f71a7dad7b;hpb=246b90502855622582b94514046f5c8b8375c727;p=build.git

diff --git a/lxc.mk b/lxc.mk
index 61aef0ec..4c14296c 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -8,6 +8,25 @@
 # see doc in Makefile  
 #
 
+### 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
 #
@@ -52,6 +71,14 @@ ipod-SPEC := ipod.spec
 ALL += ipod
 IN_NODEIMAGE += ipod
 
+#
+# plnode-utils
+# 
+plnode-utils-MODULES := plnode-utils
+plnode-utils-SPEC := plnode-utils-lxc.spec
+ALL += plnode-utils
+IN_NODEIMAGE += plnode-utils
+
 #
 # nodemanager
 #
@@ -89,6 +116,13 @@ 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"
+local_libvirt=true
+endif
+
+ifeq "$(local_libvirt)" "true"
 #
 # libvirt
 #
@@ -98,17 +132,23 @@ 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
-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
+# 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
+#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
+endif
 
 #
 # DistributedRateLimiting
@@ -128,7 +168,7 @@ ALL += pf2slice
 ##
 ## PlanetLab Mom: Cleans up your mess
 ##
-#mom-MODULES := Mom
+#mom-MODULES := mom
 #mom-SPEC := pl_mom.spec
 #ALL += mom
 #IN_NODEIMAGE += mom
@@ -191,10 +231,18 @@ ALL += vsyssh
 # vsys-scripts
 #
 vsys-scripts-MODULES := vsys-scripts
-vsys-scripts-SPEC := vsys-scripts.spec
+vsys-scripts-SPEC := root-context/vsys-scripts.spec
 IN_NODEIMAGE += vsys-scripts
 ALL += vsys-scripts
 
+#
+# bind_public
+#
+bind_public-MODULES := bind_public
+bind_public-SPEC := bind_public.spec
+IN_SLICEIMAGE += bind_public
+ALL += bind_public
+
 #
 # plcapi
 #