lxc build will pull myslice from onelab branch, not master

turn off support for manifold/myslice on f14 (onelab)

diff --git a/lxc-tags.mk b/lxc-tags.mk
index 0b86d4d..3cab0fd 100644 (file)
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -53,7 +53,7 @@ sfa-BRANCH                    := geni-v3
 sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-3.1-2
 #sface-GITPATH                   := git://git.planet-lab.org/sface.git@sface-0.9-9
 #
-myslice-GITPATH                        := git://git.onelab.eu/myslice.git@master
+myslice-GITPATH                        := git://git.onelab.eu/myslice.git@onelab
 manifold-GITPATH               := git://git.onelab.eu/manifold.git@devel
 #
 tests-GITPATH                   := git://git.onelab.eu/tests.git@master

diff --git a/onelab-tags.mk b/onelab-tags.mk
index c6b4e68..ae3f520 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -55,7 +55,5 @@ sfa-BRANCH                    := geni-v3
 sfa-GITPATH                     := git://git.planet-lab.org/sfa.git@sfa-3.1-2
 #sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.9-9
 #
-myslice-GITPATH                        := git://git.onelab.eu/myslice.git@master
-manifold-GITPATH               := git://git.onelab.eu/manifold.git@devel
 # locating the right test directory - see make tests_gitpath
 tests-GITPATH                   := git://git.onelab.eu/tests.git@master

diff --git a/onelab.mk b/onelab.mk
index 833cf6d..851ae3b 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -597,6 +597,9 @@ endif
 
 ##############################
 # don't build these by default, we have separate builds for that
+# corresponding tags are removed from onelab-tags.mk as well
+# as this is not supported on f14 anymore
+# and we target debians and ubuntus anyway
 myslice-MODULES := myslice
 myslice-SPEC := myslice.spec
 myslice-STOCK-DEVEL-RPMS := python-django