From 1e912acfd2bf1df227122d2e6f9dd404ea8d53ff Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 22 Apr 2013 17:05:55 +0200 Subject: [PATCH] add manifold, and move sfa towards the end as it gets packaged separately anyway --- onelab-tags.mk | 7 +++++-- onelab.mk | 47 +++++++++++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/onelab-tags.mk b/onelab-tags.mk index 121d6377..f8be5c66 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -47,8 +47,6 @@ pyaspects-GITPATH := git://git.onelab.eu/pyaspects.git@pyaspects-0 omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-11 oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.6.1-1 ### -sfa-GITPATH := git://git.onelab.eu/sfa.git@sfa-2.1-25 -sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.9-9 nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@master bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.2-1 pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-11 @@ -59,6 +57,11 @@ nodeimage-GITPATH := git://git.onelab.eu/nodeimage.git@nodeimage-5 myplc-GITPATH := git://git.onelab.eu/myplc.git@master DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1 +# +sfa-GITPATH := git://git.onelab.eu/sfa.git@sfa-2.1-25 +sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.9-9 +# myslice-GITPATH := git://git.onelab.eu/myslice-django.git@master +manifold-GITPATH := git://git.top-hat.info/tophat/repositories/tophat.git@packaging # locating the right test directory - see make tests_gitpath tests-GITPATH := git://git.planet-lab.org/tests.git@master diff --git a/onelab.mk b/onelab.mk index 2592eab9..6b8ab5d2 100644 --- a/onelab.mk +++ b/onelab.mk @@ -405,26 +405,6 @@ pyaspects-SPEC := pyaspects.spec pyaspects-BUILD-FROM-SRPM := yes ALL += pyaspects -# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__ -# In addition we now use sqlalchemy and 0.5 as per f12 is not compatible with our model -build_sfa=true -ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)" -build_sfa=false -endif - -ifeq "$(build_sfa)" "true" -# -# sfa - Slice Facility Architecture -# -sfa-MODULES := sfa -sfa-SPEC := sfa.spec -ALL += sfa - -sface-MODULES := sface -sface-SPEC := sface.spec -ALL += sface -endif - # # nodeconfig # @@ -584,6 +564,33 @@ release-SPEC := myplc-release.spec release-RPMDATE := yes ALL += release +############################## +# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__ +# In addition we now use sqlalchemy and 0.5 as per f12 is not compatible with our model +build_sfa=true +ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)" +build_sfa=false +endif + +ifeq "$(build_sfa)" "true" +# +# sfa - Slice Facility Architecture +# +sfa-MODULES := sfa +sfa-SPEC := sfa.spec +ALL += sfa + +sface-MODULES := sface +sface-SPEC := sface.spec +ALL += sface +endif + +############################## myslice-MODULES := myslice myslice-SPEC := myslice.spec ALL += myslice + +manifold-MODULES := manifold +manifold-SPEC := manifold.spec +# not yet though +#ALL += manifold -- 2.43.0