X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=edac14f4dcc450bbae9c924079ac212e33cf0168;hb=61908f1c343871575276cc196ce9cab0b2ffedde;hp=442586b3ce872b9163b721e0de3cb213345e824d;hpb=19e15346223e1d3b1d5d04b1993c44035e8b9387;p=build.git

diff --git a/onelab.mk b/onelab.mk
index 442586b3..edac14f4 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -1,5 +1,3 @@
-# $Id$
-# $URL$
 #
 # declare the packages to be built and their dependencies
 # initial version from Mark Huang
@@ -49,6 +47,7 @@ ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
         kernel_release=$(kernel.rpm-release) \
         kernel_arch=$(kernel.rpm-arch)
 ALL += ipfwroot
+IN_BOOTSTRAPFS += ipfwroot
 
 ipfwslice-MODULES := ipfw
 ipfwslice-SPEC := planetlab/ipfwslice.spec
@@ -115,6 +114,9 @@ ALL += umts-frontend
 #
 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
@@ -282,9 +284,10 @@ ALL += vsys-scripts
 #
 # plcapi
 #
-plcapi-MODULES := PLCAPI
+plcapi-MODULES := plcapi
 plcapi-SPEC := PLCAPI.spec
 ALL += plcapi
+IN_MYPLC += plcapi
 
 #
 # drupal
@@ -293,13 +296,15 @@ drupal-MODULES := drupal
 drupal-SPEC := drupal.spec
 drupal-BUILD-FROM-SRPM := yes
 ALL += drupal
+IN_MYPLC += drupal
 
 #
 # use the plewww module instead
 #
-plewww-MODULES := PLEWWW
+plewww-MODULES := plewww
 plewww-SPEC := plewww.spec
 ALL += plewww
+IN_MYPLC += plewww
 
 #
 # www-register-wizard
@@ -307,6 +312,7 @@ ALL += 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
@@ -362,12 +368,20 @@ 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
@@ -375,6 +389,7 @@ ALL += sfa
 nodeconfig-MODULES := nodeconfig
 nodeconfig-SPEC := nodeconfig.spec
 ALL += nodeconfig
+IN_MYPLC += nodeconfig
 
 #
 # bootmanager
@@ -382,6 +397,7 @@ ALL += nodeconfig
 bootmanager-MODULES := BootManager
 bootmanager-SPEC := bootmanager.spec
 ALL += bootmanager
+IN_MYPLC += bootmanager
 
 #
 # pypcilib : used in bootcd
@@ -398,6 +414,7 @@ pyplnet-MODULES := pyplnet
 pyplnet-SPEC := pyplnet.spec
 ALL += pyplnet
 IN_BOOTSTRAPFS += pyplnet
+IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
 #
@@ -425,6 +442,7 @@ bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
 bootcd-DEPEND-FILES := RPMS/yumgroups.xml
 bootcd-RPMDATE := yes
 ALL += bootcd
+IN_MYPLC += bootcd
 
 #
 # vserver : reference image for slices
@@ -447,6 +465,7 @@ bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
 bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
 bootstrapfs-RPMDATE := yes
 ALL += bootstrapfs
+IN_MYPLC += bootstrapfs
 
 #
 # noderepo
@@ -467,6 +486,7 @@ noderepo-DEPEND-FILES := RPMS/yumgroups.xml
 noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
 noderepo-RPMDATE := yes
 ALL += noderepo
+IN_MYPLC += noderepo
 
 #
 # slicerepo
@@ -499,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