X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=7a925bc4b392e75fd9e6abbbef57474093c558b5;hb=fd795ad430a363fb90ba25fb25fcebfcb54d004d;hp=9a79651db5e5ca4d768cb78c42787caa9bde7d2b;hpb=99b4bcba39948fa3e3ad5ca7e58b65f4f905b38e;p=build.git

diff --git a/onelab.mk b/onelab.mk
index 9a79651d..7a925bc4 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -32,7 +32,7 @@ kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
 ALL += $(KERNELS)
 # this is to mark on which image a given rpm is supposed to go
 IN_BOOTCD += $(KERNELS)
-IN_SLICEIMAGE += $(KERNELS)
+#IN_SLICEIMAGE += $(KERNELS)
 IN_NODEIMAGE += $(KERNELS)
 
 #
@@ -49,9 +49,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
 
 #
@@ -180,7 +177,15 @@ ALL += ipod
 IN_NODEIMAGE += ipod
 
 #
-# NodeManager
+# plnode-utils
+# 
+plnode-utils-MODULES := plnode-utils
+plnode-utils-SPEC := plnode-utils-vs.spec
+ALL += plnode-utils
+IN_NODEIMAGE += plnode-utils
+
+#
+# nodemanager
 #
 nodemanager-lib-MODULES := nodemanager
 nodemanager-lib-SPEC := nodemanager-lib.spec
@@ -237,7 +242,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
@@ -300,10 +305,31 @@ 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
 
+vsys-wrapper-MODULES := vsys-scripts
+vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec
+IN_SLICEIMAGE += vsys-wrapper
+ALL += vsys-wrapper
+
+# openvswitch requires an autoconf more recent than what f12 has
+ifeq "$(DISTRONAME)" "f12"
+autoconf-MODULES := autoconf
+autoconf-SPEC := autoconf.spec
+autoconf-BUILD-FROM-SRPM := yes
+ALL += autoconf
+endif
+
+sliver-openvswitch-MODULES := sliver-openvswitch
+sliver-openvswitch-SPEC := sliver-openvswitch.spec
+ifeq "$(DISTRONAME)" "f12"
+sliver-openvswitch-DEPEND-DEVEL-RPMS-UPDATES := autoconf
+endif
+IN_SLICEIMAGE += sliver-openvswitch
+ALL += sliver-openvswitch
+
 #
 # plcapi
 #