X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=4f0b3466764b9fa7c85894c817b825e12e8f13c7;hb=6d959e4728fb06f1e1013f9d46407edeffac4b5e;hp=d2c894df73dec7c17cbacad16d8353f97ab0f548;hpb=688f620cb6acd64e2d7e85df5ea1a1261146a190;p=build.git diff --git a/lxc.mk b/lxc.mk index d2c894df..4f0b3466 100644 --- a/lxc.mk +++ b/lxc.mk @@ -101,15 +101,10 @@ 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 @@ -369,18 +364,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 #