X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=85b0c9d79bdfbd5b4d764637bf159ea3ba2fda10;hb=4dcd0dfea66d3e6df8425a08d3f102c47aca2228;hp=b9ff7bf092fbce4d38a257f47e549fabcb38e140;hpb=835e81c3e728e4ad49be42e09753cae57dfa9bc7;p=build.git

diff --git a/lxc.mk b/lxc.mk
index b9ff7bf0..85b0c9d7 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -8,6 +8,41 @@
 # 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
+#
+transforward-MODULES := transforward
+transforward-SPEC := transforward.spec
+ALL += transforward
+IN_NODEIMAGE += transforward
+
+#
+# procprotect: root context module for protecting against weaknesses in /proc
+#
+procprotect-MODULES := procprotect
+procprotect-SPEC := procprotect.spec
+ALL += procprotect
+IN_NODEIMAGE += procprotect
+
 #
 # ipfw: root context module, and slice companion
 #
@@ -18,9 +53,6 @@ IN_NODEIMAGE += ipfwroot
 
 ipfwslice-MODULES := ipfw
 ipfwslice-SPEC := planetlab/ipfwslice.spec
-ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
-        kernel_release=$(kernel.rpm-release) \
-        kernel_arch=$(kernel.rpm-arch)
 ALL += ipfwslice
 
 #
@@ -40,12 +72,25 @@ ALL += ipod
 IN_NODEIMAGE += ipod
 
 #
-# NodeManager
+# plnode-utils
+# 
+plnode-utils-MODULES := plnode-utils
+plnode-utils-SPEC := plnode-utils-lxc.spec
+ALL += plnode-utils
+IN_NODEIMAGE += plnode-utils
+
+#
+# nodemanager
 #
-nodemanager-MODULES := nodemanager
-nodemanager-SPEC := NodeManager.spec
-ALL += nodemanager
-IN_NODEIMAGE += nodemanager
+nodemanager-lib-MODULES := nodemanager
+nodemanager-lib-SPEC := nodemanager-lib.spec
+ALL += nodemanager-lib
+IN_NODEIMAGE += nodemanager-lib
+
+nodemanager-lxc-MODULES := nodemanager
+nodemanager-lxc-SPEC := nodemanager-lxc.spec
+ALL += nodemanager-lxc
+IN_NODEIMAGE += nodemanager-lxc
 
 #
 # pl_sshd
@@ -71,26 +116,45 @@ fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
 IN_NODEIMAGE += fprobe-ulog
 
+#################### using our own libvirt on all distros for now
+#local_libvirt=false
+#ifeq "$(DISTRONAME)" "f16"
+local_libvirt=true
+#endif
+
+ifeq "$(local_libvirt)" "true"
 #
 # libvirt
 #
 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
-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
+endif
 
 #
 # DistributedRateLimiting
@@ -110,7 +174,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
@@ -173,15 +237,23 @@ 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
 #
 plcapi-MODULES := plcapi
-plcapi-SPEC := PLCAPI.spec
+plcapi-SPEC := plcapi.spec
 ALL += plcapi
 IN_MYPLC += plcapi