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
use pending master heads - updated modules.list to point to vsys's
[build.git]
/
planetlab.mk
diff --git
a/planetlab.mk
b/planetlab.mk
index
fb98396
..
a66c33d
100644
(file)
--- a/
planetlab.mk
+++ b/
planetlab.mk
@@
-95,7
+95,7
@@
IN_BOOTSTRAPFS += util-vserver-pl
#
# NodeUpdate
#
#
# NodeUpdate
#
-nodeupdate-MODULES :=
NodeU
pdate
+nodeupdate-MODULES :=
nodeu
pdate
nodeupdate-SPEC := NodeUpdate.spec
ALL += nodeupdate
IN_BOOTSTRAPFS += nodeupdate
nodeupdate-SPEC := NodeUpdate.spec
ALL += nodeupdate
IN_BOOTSTRAPFS += nodeupdate
@@
-305,15
+305,26
@@
ALL += pyaspects
ejabberd-MODULES := ejabberd
ejabberd-SPEC := ejabberd.spec
ejabberd-BUILD-FROM-SRPM := yes
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
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
#
# sfa - Slice Facility Architecture
#
sfa-MODULES := sfa
sfa-SPEC := sfa.spec
ALL += sfa
+endif
#
# nodeconfig
#
# nodeconfig
@@
-435,12
+446,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 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
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
release-SPEC := myplc-release.spec
release-RPMDATE := yes
ALL += release