refine strategy to spot ip address, keep on calling guest_ipv4

[build.git] / onelab.mk

diff --git a/onelab.mk b/onelab.mk
index 851ae3b..b13ca19 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -194,15 +194,10 @@ IN_NODEIMAGE += plnode-utils
 #
 # nodemanager
 #
-nodemanager-lib-MODULES := nodemanager
-nodemanager-lib-SPEC := nodemanager-lib.spec
-ALL += nodemanager-lib
-IN_NODEIMAGE += nodemanager-lib
-
-nodemanager-vs-MODULES := nodemanager
-nodemanager-vs-SPEC := nodemanager-vs.spec
-ALL += nodemanager-vs
-IN_NODEIMAGE += nodemanager-vs
+nodemanager-MODULES := nodemanager
+nodemanager-SPEC := nodemanager.spec
+ALL += nodemanager
+IN_NODEIMAGE += nodemanager
 
 #
 # pl_sshd
@@ -463,7 +458,8 @@ IN_BOOTCD += pyplnet
 rvm-ruby-MODULES := rvm-ruby
 rvm-ruby-SPEC := rpm/rvm-ruby.spec
 rvm-ruby-STOCK-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel
-ALL += rvm-ruby
+# July 2016 : this is not working on fedora14 anymore....
+#ALL += rvm-ruby
 
 #
 # OML measurement library
@@ -471,7 +467,8 @@ ALL += rvm-ruby
 oml-MODULES := oml
 oml-STOCK-DEVEL-RPMS += sqlite-devel 
 oml-SPEC := liboml.spec
-ALL += oml
+# July 2016 : not use for this one either then
+# ALL += oml
 
 #
 # bootcd
@@ -576,13 +573,6 @@ release-RPMDATE := yes
 ALL += release
 
 ##############################
-# sfa requires python-2.7
-build_sfa=true
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)"
-build_sfa=false
-endif
-
-ifeq "$(build_sfa)" "true"
 #
 # sfa - Slice Facility Architecture
 #
@@ -590,22 +580,3 @@ sfa-MODULES := sfa
 sfa-SPEC := sfa.spec
 ALL += sfa
 
-#sface-MODULES := sface
-#sface-SPEC := sface.spec
-#ALL += sface
-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
-myslice-STOCK-DEVEL-DEBS := python-django python-django-south
-#ALL += myslice
-
-manifold-MODULES := manifold
-manifold-SPEC := manifold.spec
-#ALL += manifold