X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nornet.mk;h=084721f0ee7a21c21a8d8f56493d3fda9936005b;hb=refs%2Fheads%2Fnm-one-spec;hp=fa8261fc7fd55061c9fa688a9172df7ec2b4f6fd;hpb=1860e024a5ece5339e3aca5b7592473f2e56b210;p=build.git

diff --git a/nornet.mk b/nornet.mk
index fa8261fc..084721f0 100644
--- a/nornet.mk
+++ b/nornet.mk
@@ -215,18 +215,12 @@ plnode-utils-SPEC := plnode-utils-lxc.spec
 ALL += plnode-utils
 IN_NODEIMAGE += plnode-utils
 
-#
 # nodemanager
 #
-nodemanager-lib-MODULES := nodemanager
-nodemanager-lib-SPEC := nodemanager-lib.spec
-ALL += nodemanager-lib
-IN_NODEIMAGE += nodemanager-lib
-
-nodemanager-lxc-MODULES := nodemanager
-nodemanager-lxc-SPEC := nodemanager-lxc.spec
-ALL += nodemanager-lxc
-IN_NODEIMAGE += nodemanager-lxc
+nodemanager-MODULES := nodemanager
+nodemanager-SPEC := nodemanager.spec
+ALL += nodemanager
+IN_NODEIMAGE += nodemanager
 
 #
 # pl_sshd
@@ -486,18 +480,6 @@ IN_NODEIMAGE += pyplnet
 IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
-#
-# for OMF resource controller as a gem : rvm-ruby has right version of ruby and related gem stuff
-#
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)"
-rvm-ruby-MODULES := rvm-ruby
-rvm-ruby-SPEC := rpm/rvm-ruby.spec
-rvm-ruby-STOCK-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel
-# Since Oct 22. 2013, f18 has a new release of openssl that ruby is not too happy to build against
-# turning this off for now, Christoph Dwertmann to monitor the status of this bug/incompatibility upstream
-ALL += rvm-ruby
-endif
-
 #
 # OML measurement library
 #