git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include DistributedRateLimiting into noderepo rpm
[build.git]
/
planetlab.mk
diff --git
a/planetlab.mk
b/planetlab.mk
index
8527013
..
16bfc16
100644
(file)
--- a/
planetlab.mk
+++ b/
planetlab.mk
@@
-1,3
+1,5
@@
+# $Id$
+# $URL$
#
# declare the packages to be built and their dependencies
# initial version from Mark Huang
#
# declare the packages to be built and their dependencies
# initial version from Mark Huang
@@
-5,8
+7,6
@@
# Copyright (C) 2003-2006 The Trustees of Princeton University
# rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
#
# Copyright (C) 2003-2006 The Trustees of Princeton University
# rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
#
-# $Id$
-#
# see doc in Makefile
#
# see doc in Makefile
#
@@
-141,6
+141,14
@@
fprobe-ulog-SPEC := fprobe-ulog.spec
ALL += fprobe-ulog
IN_BOOTSTRAPFS += fprobe-ulog
ALL += fprobe-ulog
IN_BOOTSTRAPFS += fprobe-ulog
+#
+# DistributedRateLimiting
+#
+DistributedRateLimiting-MODULES := DistributedRateLimiting
+DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
+ALL += DistributedRateLimiting
+IN_NODEREPO += DistributedRateLimiting
+
#
# pf2slice
#
#
# pf2slice
#
@@
-244,6
+252,13
@@
www-register-wizard-SPEC := www-register-wizard.spec
ALL += www-register-wizard
IN_MYPLC += www-register-wizard
ALL += www-register-wizard
IN_MYPLC += www-register-wizard
+#
+# pcucontrol
+#
+pcucontrol-MODULES := pcucontrol
+pcucontrol-SPEC := pcucontrol.spec
+ALL += pcucontrol
+
#
# monitor
#
#
# monitor
#
@@
-277,7
+292,7
@@
ALL += pyopenssl
#
#
-# sfa - Slice Facility Architecture
- fka geniwrapper
+# sfa - Slice Facility Architecture
#
sfa-MODULES := sfa
sfa-SPEC := sfa.spec
#
sfa-MODULES := sfa
sfa-SPEC := sfa.spec
@@
-286,6
+301,8
@@
ALL += sfa
#
# nodeconfig
#
#
# nodeconfig
#
+# xxx needed when upgrading to 5.0
+#nodeconfig-MODULES := nodeconfig
nodeconfig-MODULES := nodeconfig build
nodeconfig-SPEC := nodeconfig.spec
ALL += nodeconfig
nodeconfig-MODULES := nodeconfig build
nodeconfig-SPEC := nodeconfig.spec
ALL += nodeconfig
@@
-356,7
+373,7
@@
IN_MYPLC += bootstrapfs
# noderepo
#
# all rpms resulting from packages marked as being in bootstrapfs and vserver
# 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))
# replace space with +++ (specvars cannot deal with spaces)
SPACE=$(subst x, ,x)
NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
@@
-376,6
+393,8
@@
IN_MYPLC += noderepo
#
# MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
#
#
# 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
myplc-MODULES := MyPLC build
myplc-SPEC := myplc.spec
myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
@@
-393,3
+412,4
@@
release-MODULES := MyPLC
release-SPEC := myplc-release.spec
release-RPMDATE := yes
ALL += release
release-SPEC := myplc-release.spec
release-RPMDATE := yes
ALL += release
+