X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=f2231a4fa3abe08b95bb1ca53aff0ab5e210e046;hb=05fc87661bc91431e2acef5219b4dfc464e0f818;hp=d49583a7cac4673d004c1ace2d345cc0f12d2ddb;hpb=cb4e742fecd0473d2ccd2b88d8e911875e1e1b81;p=build.git

diff --git a/lxc.mk b/lxc.mk
index d49583a7..f2231a4f 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -9,35 +9,32 @@
 #
 
 #
-# kernel
-#
-# use a package name with srpm in it:
-# so the source rpm is created by running make srpm in the codebase
-#
-
-# rebuild kernel-3.1 on fedora14 due to instabilities of the stock kernel
-ifeq "$(DISTRONAME)" "f14"
-kernel-MODULES := linux-3
-kernel-SPEC := kernel-3.1.spec
-kernel-DEVEL-RPMS += gettext elfutils-devel
-kernel-BUILD-FROM-SRPM := yes
-ifeq "$(HOSTARCH)" "i386"
-kernel-RPMFLAGS:= --target i686 --with firmware
-else
-kernel-RPMFLAGS:= --target $(HOSTARCH) --with firmware
-endif
-kernel-SPECVARS += kernelconfig=planetlab
-KERNELS += kernel
+# transforward: root context module for transparent port forwarding
+#
+transforward-MODULES := transforward
+transforward-SPEC := transforward.spec
+ALL += transforward
+IN_NODEIMAGE += transforward
 
-kernels: $(KERNELS)
-kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
+#
+# procprotect: root context module for protecting against weaknesses in /proc
+#
+procprotect-MODULES := procprotect
+procprotect-SPEC := procprotect.spec
+ALL += procprotect
+IN_NODEIMAGE += procprotect
 
-ALL += $(KERNELS)
-# this is to mark on which image a given rpm is supposed to go
-IN_BOOTCD += $(KERNELS)
-IN_SLICEIMAGE += $(KERNELS)
-IN_NODEIMAGE += $(KERNELS)
-endif
+#
+# ipfw: root context module, and slice companion
+#
+ipfwroot-MODULES := ipfw
+ipfwroot-SPEC := planetlab/ipfwroot.spec
+ALL += ipfwroot
+IN_NODEIMAGE += ipfwroot
+
+ipfwslice-MODULES := ipfw
+ipfwslice-SPEC := planetlab/ipfwslice.spec
+ALL += ipfwslice
 
 #
 # NodeUpdate
@@ -56,12 +53,25 @@ ALL += ipod
 IN_NODEIMAGE += ipod
 
 #
-# NodeManager
+# plnode_utils
+# 
+plnode-utils-MODULES := plnode-utils
+plnode-utils-SPEC := plnode-utils.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
@@ -87,6 +97,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
 #
@@ -96,7 +113,7 @@ 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-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 \
@@ -107,6 +124,7 @@ libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without sto
 ALL += libvirt
 IN_NODEREPO += libvirt
 IN_NODEIMAGE += libvirt
+endif
 
 #
 # DistributedRateLimiting
@@ -155,11 +173,14 @@ endif
 #
 # openvswitch
 #
-openvswitch-MODULES := openvswitch
-openvswitch-SPEC := openvswitch.spec
-openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
-IN_NODEIMAGE += openvswitch
-ALL += openvswitch
+# openvswitch-MODULES := openvswitch
+# openvswitch-SPEC := openvswitch.spec
+# openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
+# IN_NODEIMAGE += openvswitch
+# # build only on f14 as f16 has this natively
+# ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14)"
+# ALL += openvswitch
+# endif
 
 #
 # vsys
@@ -190,6 +211,14 @@ vsys-scripts-SPEC := 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
 #
@@ -357,12 +386,13 @@ ALL += sliceimage
 IN_NODEIMAGE += sliceimage
 
 #
-# LXC reference images
-#
-lxcref-MODULES := lxc-reference
-lxcref-SPEC    := lxc-reference.spec
-ALL += lxcref
-IN_NODEIMAGE += lxcref
+# lxc-specific sliceimage initialization
+# 
+lxc-sliceimage-MODULES	:= sliceimage
+lxc-sliceimage-SPEC	:= lxc-sliceimage.spec
+lxc-sliceimage-RPMDATE	:= yes
+ALL			+= lxc-sliceimage
+IN_NODEIMAGE		+= lxc-sliceimage
 
 #
 # nodeimage