X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=nornet.mk;h=b2e5f3714148605f7647f3e5d553d0aacc34515c;hb=8bb93331419a8cbac3850d205f9939bfd6f5a26f;hp=fa8261fc7fd55061c9fa688a9172df7ec2b4f6fd;hpb=9f2b8b8c30baf3ec7e65ae04beae1339d09ffcf1;p=build.git diff --git a/nornet.mk b/nornet.mk index fa8261fc..b2e5f371 100644 --- a/nornet.mk +++ b/nornet.mk @@ -486,18 +486,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 #