git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drop older omf-resctl (and expctl in the same shot) and install rvm-ruby instead
[build.git]
/
onelab.mk
diff --git
a/onelab.mk
b/onelab.mk
index
6b8ab5d
..
4ccb77b
100644
(file)
--- a/
onelab.mk
+++ b/
onelab.mk
@@
-322,6
+322,9
@@
autoconf-BUILD-FROM-SRPM := yes
ALL += autoconf
endif
ALL += autoconf
endif
+#
+# sliver-openvswitch
+#
sliver-openvswitch-MODULES := sliver-openvswitch
sliver-openvswitch-SPEC := sliver-openvswitch.spec
ifeq "$(DISTRONAME)" "f12"
sliver-openvswitch-MODULES := sliver-openvswitch
sliver-openvswitch-SPEC := sliver-openvswitch.spec
ifeq "$(DISTRONAME)" "f12"
@@
-440,19
+443,12
@@
IN_MYPLC += pyplnet
IN_BOOTCD += pyplnet
#
IN_BOOTCD += pyplnet
#
-# OMF resource controller
-#
-omf-resctl-MODULES := omf
-omf-resctl-SPEC := omf-resctl.spec
-ALL += omf-resctl
-IN_SLICEIMAGE += omf-resctl
-
-#
-# OMF exp controller
+# for OMF resource controller as a gem : rvm-ruby has right version of ruby and related gem stuff
#
#
-omf-expctl-MODULES := omf
-omf-expctl-SPEC := omf-expctl.spec
-ALL += omf-expctl
+rvm-ruby-MODULES := rvm-ruby
+rvm-ruby-SPEC := rpm/rvm-ruby.spec
+rvm-ruby-DEVEL-RPMS := chrpath libyaml-devel libffi-devel
+ALL += rvm-ruby
#
# OML measurement library
#
# OML measurement library
@@
-565,8
+561,7
@@
release-RPMDATE := yes
ALL += release
##############################
ALL += release
##############################
-# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
-# In addition we now use sqlalchemy and 0.5 as per f12 is not compatible with our model
+# sfa requires python-2.7
build_sfa=true
ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)"
build_sfa=false
build_sfa=true
ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)"
build_sfa=false
@@
-586,11
+581,11
@@
ALL += sface
endif
##############################
endif
##############################
+# don't build these by default, we have separate builds for that
myslice-MODULES := myslice
myslice-SPEC := myslice.spec
myslice-MODULES := myslice
myslice-SPEC := myslice.spec
-ALL += myslice
+
#
ALL += myslice
manifold-MODULES := manifold
manifold-SPEC := manifold.spec
manifold-MODULES := manifold
manifold-SPEC := manifold.spec
-# not yet though
#ALL += manifold
#ALL += manifold