X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=a66c33d3d139a830458854286e0461c3dbf037b2;hb=0ab3547143e1276f6a291cc89659a202e81ac60d;hp=96b3f58ad66f9278ec6f0630a7e56a03f63648f4;hpb=67acb5261cf32904ae1deca96c0b290891b7bd48;p=build.git

diff --git a/planetlab.mk b/planetlab.mk
index 96b3f58a..a66c33d3 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -95,7 +95,7 @@ IN_BOOTSTRAPFS += util-vserver-pl
 #
 # NodeUpdate
 #
-nodeupdate-MODULES := NodeUpdate
+nodeupdate-MODULES := nodeupdate
 nodeupdate-SPEC := NodeUpdate.spec
 ALL += nodeupdate
 IN_BOOTSTRAPFS += nodeupdate
@@ -305,15 +305,26 @@ ALL += pyaspects
 ejabberd-MODULES := ejabberd
 ejabberd-SPEC := ejabberd.spec
 ejabberd-BUILD-FROM-SRPM := yes
+# not needed anymore on f12 and above, that come with 2.1.5, and we had 2.1.3
+# so, this is relevant on f8 and centos5 only
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
 ALL += ejabberd
+endif
 
+# 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