X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=edac14f4dcc450bbae9c924079ac212e33cf0168;hb=61908f1c343871575276cc196ce9cab0b2ffedde;hp=e7f9425d0c9624f623595796d1c20df2479802f6;hpb=4a80c37df7dd11b16aed28a93956fac031f5f510;p=build.git

diff --git a/onelab.mk b/onelab.mk
index e7f9425d..edac14f4 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -5,8 +5,6 @@
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 # rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
 #
-# $Id$
-#
 # see doc in Makefile  
 #
 
@@ -26,7 +24,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,21 +36,20 @@ 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-MODULES := ipfw
 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
+IN_BOOTSTRAPFS += ipfwroot
 
-ipfwslice-MODULES := ipfwsrc
+ipfwslice-MODULES := ipfw
 ipfwslice-SPEC := planetlab/ipfwslice.spec
 ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
         kernel_release=$(kernel.rpm-release) \
@@ -60,7 +58,7 @@ 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"
+#ifneq "$(DISTRONAME)" "f12"
 #
 # madwifi
 #
@@ -73,7 +71,7 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 	kernel_arch=$(kernel.rpm-arch)
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
-endif
+#endif
 
 # 
 # nozomi
@@ -111,6 +109,28 @@ umts-frontend-SPEC := frontend.spec
 IN_VSERVER += umts-frontend
 ALL += umts-frontend
 
+#
+# iptables
+#
+iptables-MODULES := iptables
+iptables-SPEC := iptables.spec
+ifeq "$(PLDISTROTAGS)" "onelab-k27-tags.mk"
+iptables-BUILD-FROM-SRPM := yes
+endif
+iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
+ALL += iptables
+IN_BOOTSTRAPFS += iptables
+
+#
+# iproute
+#
+iproute-MODULES := iproute2
+iproute-SPEC := iproute.spec
+ALL += iproute
+IN_BOOTSTRAPFS += iproute
+IN_VSERVER += iproute
+IN_BOOTCD += iproute
+
 #
 # util-vserver
 #
@@ -189,7 +209,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
 
@@ -201,6 +221,15 @@ fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
 IN_BOOTSTRAPFS += fprobe-ulog
 
+#
+# DistributedRateLimiting
+#
+DistributedRateLimiting-MODULES := DistributedRateLimiting
+DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
+ALL += DistributedRateLimiting
+IN_NODEREPO += DistributedRateLimiting
+
+
 #
 # pf2slice
 #
@@ -216,25 +245,6 @@ mom-SPEC := pl_mom.spec
 ALL += mom
 IN_BOOTSTRAPFS += mom
 
-#
-# iptables
-#
-iptables-MODULES := iptables
-iptables-SPEC := iptables.spec
-iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
-ALL += iptables
-IN_BOOTSTRAPFS += iptables
-
-#
-# iproute
-#
-iproute-MODULES := iproute2
-iproute-SPEC := iproute.spec
-ALL += iproute
-IN_BOOTSTRAPFS += iproute
-IN_VSERVER += iproute
-IN_BOOTCD += iproute
-
 #
 # inotify-tools - local import
 # rebuild this on centos5 (not found) - see kexcludes in build.common
@@ -272,20 +282,12 @@ 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
+IN_MYPLC += plcapi
 
 #
 # drupal
@@ -299,7 +301,7 @@ IN_MYPLC += drupal
 #
 # use the plewww module instead
 #
-plewww-MODULES := PLEWWW
+plewww-MODULES := plewww
 plewww-SPEC := plewww.spec
 ALL += plewww
 IN_MYPLC += plewww
@@ -312,6 +314,13 @@ 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
 #
@@ -320,13 +329,6 @@ monitor-SPEC := Monitor.spec
 ALL += monitor
 IN_BOOTSTRAPFS += monitor
 
-#
-# PLC RT
-#
-plcrt-MODULES := PLCRT
-plcrt-SPEC := plcrt.spec
-ALL += plcrt
-
 #
 # zabbix
 #
@@ -335,6 +337,13 @@ zabbix-SPEC := zabbix.spec
 zabbix-BUILD-FROM-SRPM := yes
 ALL += zabbix
 
+#
+# PLC RT
+#
+plcrt-MODULES := PLCRT
+plcrt-SPEC := plcrt.spec
+ALL += plcrt
+
 #
 # pyopenssl
 #
@@ -343,18 +352,41 @@ 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
 
+#
+# ejabberd
+#
+ejabberd-MODULES := ejabberd
+ejabberd-SPEC := ejabberd.spec
+ejabberd-BUILD-FROM-SRPM := yes
+ALL += ejabberd
+
+# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
+build_sfa=true
+ifeq "$(DISTRONAME)" "centos5"
+build_sfa=false
+endif
+
+ifeq "$(build_sfa)" "true"
 #
 # sfa - Slice Facility Architecture
 #
 sfa-MODULES := sfa
 sfa-SPEC := sfa.spec
 ALL += sfa
+endif
 
 #
 # nodeconfig
 #
-nodeconfig-MODULES := nodeconfig build
+nodeconfig-MODULES := nodeconfig
 nodeconfig-SPEC := nodeconfig.spec
 ALL += nodeconfig
 IN_MYPLC += nodeconfig
@@ -385,12 +417,27 @@ 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
+
+#
+# OMF exp controller
+#
+omf-expctl-MODULES := omf
+omf-expctl-SPEC := omf-expctl.spec
+ALL += omf-expctl
+
 #
 # 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
@@ -413,7 +460,7 @@ 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
@@ -424,16 +471,16 @@ IN_MYPLC += bootstrapfs
 # noderepo
 #
 # all rpms resulting from packages marked as being in bootstrapfs and vserver
-NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_VSERVER),$($(package).rpms))
+NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER),$($(package).rpms))
 # replace space with +++ (specvars cannot deal with spaces)
 SPACE=$(subst x, ,x)
 NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
 
 noderepo-MODULES := BootstrapFS 
 noderepo-SPEC := noderepo.spec
-noderepo-RPMBUILD := sudo bash ./rpmbuild.sh
-# package requires all regular packages
-noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
+noderepo-RPMBUILD := bash ./rpmbuild.sh
+# package requires all embedded packages
+noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER)
 noderepo-DEPEND-FILES := RPMS/yumgroups.xml
 #export rpm list to the specfile
 noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
@@ -441,10 +488,30 @@ noderepo-RPMDATE := yes
 ALL += noderepo
 IN_MYPLC += noderepo
 
+#
+# slicerepo
+#
+# all rpms resulting from packages marked as being in vserver
+SLICEREPO_RPMS = $(foreach package,$(IN_VSERVER),$($(package).rpms))
+# replace space with +++ (specvars cannot deal with spaces)
+SPACE=$(subst x, ,x)
+SLICEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(SLICEREPO_RPMS))
+
+slicerepo-MODULES := BootstrapFS 
+slicerepo-SPEC := slicerepo.spec
+slicerepo-RPMBUILD := bash ./rpmbuild.sh
+# package requires all embedded packages
+slicerepo-DEPEND-PACKAGES := $(IN_VSERVER)
+slicerepo-DEPEND-FILES := RPMS/yumgroups.xml
+#export rpm list to the specfile
+slicerepo-SPECVARS = slice_rpms_plus=$(SLICEREPO_RPMS_3PLUS)
+slicerepo-RPMDATE := yes
+ALL += slicerepo
+
 #
 # 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
@@ -452,7 +519,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 Monitor
+myplc-docs-MODULES := MyPLC plcapi NodeManager Monitor
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs