X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=a0fc8e8316e5076ecf2412a50660b0848c3b6c13;hb=80f2f26589cb0da90a629d062037a549ade31925;hp=2380dcc5ed5bb5649d1a5b7a87fd4c4eb06f3c4f;hpb=69f10fd3078addcf8bb27672f4e5c32ef01a1132;p=build.git

diff --git a/planetlab.mk b/planetlab.mk
index 2380dcc5..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
@@ -95,7 +114,7 @@ IN_BOOTSTRAPFS += util-vserver-pl
 #
 # NodeUpdate
 #
-nodeupdate-MODULES := NodeUpdate
+nodeupdate-MODULES := nodeupdate
 nodeupdate-SPEC := NodeUpdate.spec
 ALL += nodeupdate
 IN_BOOTSTRAPFS += nodeupdate
@@ -111,7 +130,7 @@ IN_BOOTSTRAPFS += ipod
 #
 # NodeManager
 #
-nodemanager-MODULES := NodeManager
+nodemanager-MODULES := nodemanager
 nodemanager-SPEC := NodeManager.spec
 ALL += nodemanager
 IN_BOOTSTRAPFS += nodemanager
@@ -127,7 +146,7 @@ IN_BOOTSTRAPFS += sshd
 #
 # codemux: Port 80 demux
 #
-codemux-MODULES := CoDemux
+codemux-MODULES := codemux
 codemux-SPEC   := codemux.spec
 codemux-RPMBUILD := sudo bash ./rpmbuild.sh
 ALL += codemux
@@ -169,9 +188,6 @@ IN_BOOTSTRAPFS += mom
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
-ifeq "$(PLDISTROTAGS)" "planetlab-k27-tags.mk"
-iptables-BUILD-FROM-SRPM := yes
-endif
 iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
 ALL += iptables
 IN_BOOTSTRAPFS += iptables
@@ -203,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
 #
@@ -225,10 +249,10 @@ ALL += vsys-scripts
 #
 # 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
@@ -242,7 +266,7 @@ IN_MYPLC += drupal
 #
 # use the plewww module instead
 #
-plewww-MODULES := PLEWWW
+plewww-MODULES := plewww
 plewww-SPEC := plewww.spec
 ALL += plewww
 IN_MYPLC += plewww
@@ -294,19 +318,47 @@ 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
+# 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
 #
 # xxx needed when upgrading to 5.0
 #nodeconfig-MODULES := nodeconfig
-nodeconfig-MODULES := nodeconfig build
+nodeconfig-MODULES := nodeconfig
 nodeconfig-SPEC := nodeconfig.spec
 ALL += nodeconfig
 IN_MYPLC += nodeconfig
@@ -314,7 +366,7 @@ IN_MYPLC += nodeconfig
 #
 # bootmanager
 #
-bootmanager-MODULES := BootManager
+bootmanager-MODULES := bootmanager
 bootmanager-SPEC := bootmanager.spec
 ALL += bootmanager
 IN_MYPLC += bootmanager
@@ -337,10 +389,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-MODULES := bootcd build
 bootcd-SPEC := bootcd.spec
 bootcd-RPMBUILD := sudo bash ./rpmbuild.sh
 bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
@@ -352,7 +421,7 @@ IN_MYPLC += bootcd
 #
 # vserver : reference image for slices
 #
-vserver-MODULES := VserverReference build
+vserver-MODULES := vserver-reference build
 vserver-SPEC := vserver-reference.spec
 vserver-DEPEND-PACKAGES := $(IN_VSERVER)
 vserver-DEPEND-FILES := RPMS/yumgroups.xml
@@ -363,7 +432,7 @@ IN_BOOTSTRAPFS += vserver
 #
 # bootstrapfs
 #
-bootstrapfs-MODULES := BootstrapFS build
+bootstrapfs-MODULES := bootstrapfs build
 bootstrapfs-SPEC := bootstrapfs.spec
 bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh
 bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
@@ -381,7 +450,7 @@ NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER)
 SPACE=$(subst x, ,x)
 NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
 
-noderepo-MODULES := BootstrapFS 
+noderepo-MODULES := bootstrapfs
 noderepo-SPEC := noderepo.spec
 noderepo-RPMBUILD := sudo bash ./rpmbuild.sh
 # package requires all regular packages
@@ -396,9 +465,7 @@ IN_MYPLC += noderepo
 #
 # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
 #
-# xxx needed when upgrading to 5.0
-#myplc-MODULES := MyPLC
-myplc-MODULES := MyPLC build 
+myplc-MODULES := myplc
 myplc-SPEC := myplc.spec
 myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
 ALL += myplc
@@ -406,12 +473,12 @@ 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
 
 # using some other name than myplc-release, as this is a make target already
-release-MODULES := MyPLC
+release-MODULES := myplc
 release-SPEC := myplc-release.spec
 release-RPMDATE := yes
 ALL += release