X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=5bcc4b11d77412b1ef4b24158314c91670bacc43;hb=88d4d4900aa8e362c58c932e4ec987e173347b73;hp=f9f50fb4e958af6432e9c2153426c1f50db94583;hpb=1d6bd81bddc9b19677f06bf96e2d696292d94f23;p=build.git

diff --git a/onelab.mk b/onelab.mk
index f9f50fb4..5bcc4b11 100644
--- 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  
 #
 
@@ -26,7 +26,8 @@ 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
+kernel-SPECVARS += iwlwifi=1 
+kernel-SPECVARS += kernelconfig=planetlab
 KERNELS += kernel
 
 kernels: $(KERNELS)
@@ -37,9 +38,28 @@ ALL += $(KERNELS)
 IN_BOOTCD += $(KERNELS)
 IN_VSERVER += $(KERNELS)
 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
 #
@@ -52,6 +72,7 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 	kernel_arch=$(kernel.rpm-arch)
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
+#endif
 
 # 
 # nozomi
@@ -73,6 +94,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
 #
@@ -151,7 +188,7 @@ IN_BOOTSTRAPFS += sshd
 #
 codemux-MODULES := CoDemux
 codemux-SPEC   := codemux.spec
-codemux-RPMBUILD := sudo bash ./rpmbuild.sh
+#codemux-RPMBUILD := bash ./rpmbuild.sh
 ALL += codemux
 IN_BOOTSTRAPFS += codemux
 
@@ -234,20 +271,11 @@ IN_BOOTSTRAPFS += vsys-scripts
 ALL += vsys-scripts
 
 #
-# dummynet_image
-# 
-dummynet_image-MODULES := dummynet_image
-dummynet_image-SPEC := dummynet_image.spec
-IN_MYPLC += dummynet_image
-ALL += dummynet_image
-
-#
-# PLCAPI
+# plcapi
 #
-PLCAPI-MODULES := PLCAPI
-PLCAPI-SPEC := PLCAPI.spec
-ALL += PLCAPI
-IN_MYPLC += PLCAPI
+plcapi-MODULES := PLCAPI
+plcapi-SPEC := PLCAPI.spec
+ALL += plcapi
 
 #
 # drupal
@@ -256,7 +284,6 @@ drupal-MODULES := drupal
 drupal-SPEC := drupal.spec
 drupal-BUILD-FROM-SRPM := yes
 ALL += drupal
-IN_MYPLC += drupal
 
 #
 # use the plewww module instead
@@ -264,7 +291,6 @@ IN_MYPLC += drupal
 plewww-MODULES := PLEWWW
 plewww-SPEC := plewww.spec
 ALL += plewww
-IN_MYPLC += plewww
 
 #
 # www-register-wizard
@@ -272,7 +298,13 @@ IN_MYPLC += plewww
 www-register-wizard-MODULES := www-register-wizard
 www-register-wizard-SPEC := www-register-wizard.spec
 ALL += www-register-wizard
-IN_MYPLC += www-register-wizard
+
+#
+# pcucontrol
+#
+pcucontrol-MODULES := pcucontrol
+pcucontrol-SPEC := pcucontrol.spec
+ALL += pcucontrol
 
 #
 # monitor
@@ -282,6 +314,13 @@ monitor-SPEC := Monitor.spec
 ALL += monitor
 IN_BOOTSTRAPFS += monitor
 
+#
+# PLC RT
+#
+plcrt-MODULES := PLCRT
+plcrt-SPEC := plcrt.spec
+ALL += plcrt
+
 #
 # zabbix
 #
@@ -290,13 +329,36 @@ zabbix-SPEC := zabbix.spec
 zabbix-BUILD-FROM-SRPM := yes
 ALL += zabbix
 
+#
+# pyopenssl
+#
+pyopenssl-MODULES := pyopenssl
+pyopenssl-SPEC := pyOpenSSL.spec
+pyopenssl-BUILD-FROM-SRPM := yes
+ALL += pyopenssl
+
+#
+# pyaspects
+#
+pyaspects-MODULES := pyaspects
+pyaspects-SPEC := pyaspects.spec
+pyaspects-BUILD-FROM-SRPM := yes
+ALL += pyaspects
+
+
+#
+# sfa - Slice Facility Architecture
+#
+sfa-MODULES := sfa
+sfa-SPEC := sfa.spec
+ALL += sfa
+
 #
 # nodeconfig
 #
-nodeconfig-MODULES := nodeconfig build
+nodeconfig-MODULES := nodeconfig
 nodeconfig-SPEC := nodeconfig.spec
 ALL += nodeconfig
-IN_MYPLC += nodeconfig
 
 #
 # bootmanager
@@ -304,7 +366,6 @@ IN_MYPLC += nodeconfig
 bootmanager-MODULES := BootManager
 bootmanager-SPEC := bootmanager.spec
 ALL += bootmanager
-IN_MYPLC += bootmanager
 
 #
 # pypcilib : used in bootcd
@@ -321,20 +382,26 @@ pyplnet-MODULES := pyplnet
 pyplnet-SPEC := pyplnet.spec
 ALL += pyplnet
 IN_BOOTSTRAPFS += pyplnet
-IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
+#
+# OMF resource controller
+#
+omf-resctl-MODULES := omf
+omf-resctl-SPEC := omf-resctl.spec
+ALL += omf-resctl
+IN_VSERVER += omf-resctl
+
 #
 # bootcd
 #
 bootcd-MODULES := BootCD build
 bootcd-SPEC := bootcd.spec
-bootcd-RPMBUILD := sudo bash ./rpmbuild.sh
+bootcd-RPMBUILD := bash ./rpmbuild.sh
 bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
 bootcd-DEPEND-FILES := RPMS/yumgroups.xml
 bootcd-RPMDATE := yes
 ALL += bootcd
-IN_MYPLC += bootcd
 
 #
 # vserver : reference image for slices
@@ -352,12 +419,11 @@ IN_BOOTSTRAPFS += vserver
 #
 bootstrapfs-MODULES := BootstrapFS build
 bootstrapfs-SPEC := bootstrapfs.spec
-bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh
+bootstrapfs-RPMBUILD := bash ./rpmbuild.sh
 bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
 bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
 bootstrapfs-RPMDATE := yes
 ALL += bootstrapfs
-IN_MYPLC += bootstrapfs
 
 #
 # noderepo
@@ -370,7 +436,7 @@ NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
 
 noderepo-MODULES := BootstrapFS 
 noderepo-SPEC := noderepo.spec
-noderepo-RPMBUILD := sudo bash ./rpmbuild.sh
+noderepo-RPMBUILD := bash ./rpmbuild.sh
 # package requires all regular packages
 noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
 noderepo-DEPEND-FILES := RPMS/yumgroups.xml
@@ -378,12 +444,11 @@ noderepo-DEPEND-FILES := RPMS/yumgroups.xml
 noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
 noderepo-RPMDATE := yes
 ALL += noderepo
-IN_MYPLC += noderepo
 
 #
 # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
 #
-myplc-MODULES := MyPLC build 
+myplc-MODULES := MyPLC
 myplc-SPEC := myplc.spec
 myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
 ALL += myplc
@@ -391,7 +456,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