fix build problems

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index bc98bfe..08c97bf 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -56,6 +56,9 @@ IN_BOOTSTRAPFS += madwifi
 #
 util-vserver-MODULES := util-vserver
 util-vserver-SPEC := util-vserver.spec
+ifeq "$(PLDISTROTAGS)" "planetlab-k27-tags.mk"
+util-vserver-BUILD-FROM-SRPM := yes
+endif
 util-vserver-RPMFLAGS:= --without dietlibc
 ALL += util-vserver
 IN_BOOTSTRAPFS += util-vserver
@@ -141,6 +144,14 @@ 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
 #
@@ -161,6 +172,9 @@ 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
@@ -283,6 +297,23 @@ 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 - Slice Facility Architecture
 #
@@ -293,7 +324,9 @@ ALL += sfa
 #
 # nodeconfig
 #
-nodeconfig-MODULES := nodeconfig build
+# xxx needed when upgrading to 5.0
+#nodeconfig-MODULES := nodeconfig
+nodeconfig-MODULES := nodeconfig
 nodeconfig-SPEC := nodeconfig.spec
 ALL += nodeconfig
 IN_MYPLC += nodeconfig
@@ -324,6 +357,23 @@ 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
 #
@@ -363,7 +413,7 @@ 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))
@@ -372,7 +422,7 @@ 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-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)
@@ -383,6 +433,8 @@ 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-SPEC := myplc.spec
 myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml