psycopg2 dependency for sfa

[build.git] / onelab.mk

diff --git a/onelab.mk b/onelab.mk
index beb57ba..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  
 #
 
@@ -25,6 +25,7 @@ kernel-RPMFLAGS:= --target i686
 else
 kernel-RPMFLAGS:= --target $(HOSTARCH)
 endif
+# this is useful for 2.6.22 but will not be needed anymore with 2.6.27
 kernel-SPECVARS := iwlwifi=1
 KERNELS += kernel
 
@@ -39,6 +40,27 @@ IN_BOOTSTRAPFS += $(KERNELS)
 # turns out myplc installs kernel-vserver
 IN_MYPLC += $(KERNELS)
 
+#
+# ipfw: root context module, and slice companion
+#
+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
 #
@@ -51,6 +73,7 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
        kernel_arch=$(kernel.rpm-arch)
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
+endif
 
 # 
 # nozomi
@@ -72,6 +95,22 @@ comgt-SPEC := comgt.spec
 IN_BOOTSTRAPFS += comgt
 ALL += comgt
 
+#
+# umts: root context stuff
+#
+umts-backend-MODULES := planetlab-umts-tools
+umts-backend-SPEC := backend.spec
+IN_BOOTSTRAPFS += umts-backend
+ALL += umts-backend
+
+#
+# umts: slice tools
+#
+umts-frontend-MODULES := planetlab-umts-tools
+umts-frontend-SPEC := frontend.spec
+IN_VSERVER += umts-frontend
+ALL += umts-frontend
+
 #
 # util-vserver
 #
@@ -224,6 +263,14 @@ endif
 IN_BOOTSTRAPFS += vsys
 ALL += vsys
 
+#
+# vsys-scripts
+#
+vsys-scripts-MODULES := vsys-scripts
+vsys-scripts-SPEC := vsys-scripts.spec
+IN_BOOTSTRAPFS += vsys-scripts
+ALL += vsys-scripts
+
 #
 # dummynet_image
 # 
@@ -270,8 +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
+###xxx-tmp-off ALL += plcrt
 
 #
 # zabbix
@@ -279,7 +333,23 @@ IN_BOOTSTRAPFS += monitor
 zabbix-MODULES := Monitor
 zabbix-SPEC := zabbix.spec
 zabbix-BUILD-FROM-SRPM := yes
-ALL += zabbix
+###xxx-tmp-off ALL += zabbix
+
+#
+# pyopenssl
+#
+pyopenssl-MODULES := pyopenssl
+pyopenssl-SPEC := pyOpenSSL.spec
+pyopenssl-BUILD-FROM-SRPM := yes
+ALL += pyopenssl
+
+
+#
+# sfa - Slice Facility Architecture
+#
+sfa-MODULES := sfa
+sfa-SPEC := sfa.spec
+ALL += sfa
 
 #
 # nodeconfig
@@ -382,7 +452,7 @@ ALL += myplc
 # myplc-docs only contains docs for PLCAPI and NMAPI, but
 # we still need to pull MyPLC, as it is where the specfile lies, 
 # together with the utility script docbook2drupal.sh
-myplc-docs-MODULES := MyPLC PLCAPI NodeManager
+myplc-docs-MODULES := MyPLC PLCAPI NodeManager Monitor
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs