X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=a0fc8e8316e5076ecf2412a50660b0848c3b6c13;hb=a53daf97f5919737bcf055133d4d8ec04b46b3b1;hp=7eb2a01a632e637aa0c099ab0a2de01b6a29f002;hpb=ec40dfe668bf865a84b0168dde534f1845bbbf0f;p=build.git

diff --git a/planetlab.mk b/planetlab.mk
index 7eb2a01a..a0fc8e83 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -10,6 +10,20 @@
 # see doc in Makefile  
 #
 
+# mkinitrd
+#
+ifeq "$(PLDISTROTAGS)" "planetlab-k32-tags.mk"
+ifeq "$(DISTRONAME)" "centos5"
+mkinitrd-MODULES := mkinitrd
+mkinitrd-SPEC := mkinitrd.spec
+mkinitrd-BUILD-FROM-SRPM := yes
+ALL += mkinitrd
+IN_BOOTCD += mkinitrd
+IN_VSERVER += mkinitrd 
+IN_BOOTSTRAPFS += mkinitrd
+IN_MYPLC += mkinitrd
+endif
+endif
 #
 # kernel
 #
@@ -41,6 +55,9 @@ IN_MYPLC += $(KERNELS)
 #
 # madwifi
 #
+
+ifeq "$(PLDISTROTAGS)" "planetlab-k32-tags.mk"
+ifneq "$(DISTRONAME)" "f8"
 madwifi-MODULES := madwifi
 madwifi-SPEC := madwifi.spec
 madwifi-BUILD-FROM-SRPM := yes
@@ -50,6 +67,8 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 	kernel_arch=$(kernel.rpm-arch)
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
+endif
+endif
 
 #
 # util-vserver
@@ -200,6 +219,14 @@ IN_BOOTSTRAPFS += inotify-tools
 ALL += inotify-tools
 endif
 
+#
+# openvswitch
+#
+openvswitch-MODULES := openvswitch
+openvswitch-SPEC := openvswitch.spec
+IN_BOOTSTRAPFS += openvswitch
+ALL += openvswitch
+
 #
 # vsys
 #
@@ -305,15 +332,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