onelab-k22 adopting tag 44

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index bc98bfe..329a70e 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -141,6 +141,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
 #
@@ -293,6 +301,8 @@ ALL += sfa
 #
 # nodeconfig
 #
+# xxx needed when upgrading to 5.0
+#nodeconfig-MODULES := nodeconfig
 nodeconfig-MODULES := nodeconfig build
 nodeconfig-SPEC := nodeconfig.spec
 ALL += nodeconfig
@@ -363,7 +373,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 +382,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 +393,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