try to pull in default planetlab-f8-i386 slice image

[build.git] / lxc.mk

diff --git a/lxc.mk b/lxc.mk
index d49583a..4540a2e 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -9,35 +9,35 @@
 #
 
 #
-# 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
+ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
+        kernel_release=$(kernel.rpm-release) \
+        kernel_arch=$(kernel.rpm-arch)
+ALL += ipfwslice
 
 #
 # NodeUpdate
@@ -155,11 +155,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
@@ -357,12 +360,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