psycopg2 dependency for sfa

[build.git] / onelab.mk

diff --git a/onelab.mk b/onelab.mk
index 35222ad..5c91f8e 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -1,3 +1,5 @@
+# $Id$
+# $URL$
 #
 # declare the packages to be built and their dependencies
 # initial version from Mark Huang
@@ -5,8 +7,6 @@
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 # rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
 #
-# $Id$
-#
 # see doc in Makefile  
 #
 
@@ -43,20 +43,24 @@ IN_MYPLC += $(KERNELS)
 #
 # ipfw: root context module, and slice companion
 #
-ipfw-MODULES := ipfw
-ipfw-SPEC := ipfw.spec
-ipfw-DEPEND-DEVEL-RPMS := kernel-devel
-ipfw-SPECVARS = kernel_version=$(kernel.rpm-version) \
-       kernel_release=$(kernel.rpm-release) \
-       kernel_arch=$(kernel.rpm-arch)
-IN_BOOTSTRAPFS += ipfw
-ALL += ipfw
-
-ipfwslice-MODULES := ipfw
-ipfwslice-SPEC := ipfw-slice.spec
-IN_VSERVER += ipfwslice
+ipfwroot-MODULES := ipfwsrc
+ipfwroot-SPEC := planetlab/ipfwroot.spec
+ipfwroot-DEPEND-DEVEL-RPMS := kernel-devel
+ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
+        kernel_release=$(kernel.rpm-release) \
+        kernel_arch=$(kernel.rpm-arch)
+ALL += ipfwroot
+
+ipfwslice-MODULES := ipfwsrc
+ipfwslice-SPEC := planetlab/ipfwslice.spec
+ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
+        kernel_release=$(kernel.rpm-release) \
+        kernel_arch=$(kernel.rpm-arch)
 ALL += ipfwslice
 
+# this doesn't build on f12 - weird all right - I suspect gcc to be smarter but that needs investigation
+# is madwifi still current anyway ? should we move to ath5k instead ?
+ifneq "$(DISTRONAME)" "f12"
 #
 # madwifi
 #
@@ -69,6 +73,7 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
        kernel_arch=$(kernel.rpm-arch)
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
+endif
 
 # 
 # nozomi
@@ -312,15 +317,15 @@ IN_MYPLC += www-register-wizard
 #
 monitor-MODULES := Monitor
 monitor-SPEC := Monitor.spec
-ALL += monitor
-IN_BOOTSTRAPFS += monitor
+###xxx-tmp-off ALL += monitor
+###xxx-tmp-off IN_BOOTSTRAPFS += monitor
 
 #
 # PLC RT
 #
 plcrt-MODULES := PLCRT
 plcrt-SPEC := plcrt.spec
-ALL += plcrt
+###xxx-tmp-off ALL += plcrt
 
 #
 # zabbix
@@ -328,7 +333,7 @@ ALL += plcrt
 zabbix-MODULES := Monitor
 zabbix-SPEC := zabbix.spec
 zabbix-BUILD-FROM-SRPM := yes
-ALL += zabbix
+###xxx-tmp-off ALL += zabbix
 
 #
 # pyopenssl
@@ -340,7 +345,7 @@ ALL += pyopenssl
 
 
 #
-# sfa - Slice Facility Architecture - fka geniwrapper
+# sfa - Slice Facility Architecture
 #
 sfa-MODULES := sfa
 sfa-SPEC := sfa.spec