building liboml

diff --git a/onelab-k22-tags.mk b/onelab-k22-tags.mk
index 68cdf90..fa44131 100644 (file)
--- a/onelab-k22-tags.mk
+++ b/onelab-k22-tags.mk
@@ -42,7 +42,8 @@ pyopenssl-SVNPATH             := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9
 ###
 pyaspects-GITPATH              := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-1
 ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-2
-omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-9
+omf-GITPATH                     := git://git.onelab.eu/omf.git@master
+oml-GITPATH                     := git://git.onelab.eu/oml.git@master
 ###
 sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-1.0-12
 sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.1-4

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index b970ec7..9bfba41 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -41,7 +41,8 @@ pyopenssl-SVNPATH             := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9
 ###
 pyaspects-GITPATH              := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-1
 ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-2
-omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-9
+omf-GITPATH                     := git://git.onelab.eu/omf.git@master
+oml-GITPATH                     := git://git.onelab.eu/oml.git@master
 ###
 sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-1.0-12
 sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.1-4

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index 682c96f..4d23a7d 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -46,6 +46,7 @@ pyopenssl-SVNPATH             := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9
 pyaspects-GITPATH              := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-1
 ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.6-2
 omf-GITPATH                     := git://git.onelab.eu/omf.git@master
+oml-GITPATH                     := git://git.onelab.eu/oml.git@master
 ###
 sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-1.0-12
 sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.1-4

diff --git a/onelab.mk b/onelab.mk
index cb2f108..bc2376f 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -446,6 +446,14 @@ omf-expctl-MODULES := omf
 omf-expctl-SPEC := omf-expctl.spec
 ALL += omf-expctl
 
+#
+# OML measurement library
+#
+oml-MODULES := oml
+oml-DEVEL-RPMS += sqlite-devel libpcap-devel check
+oml-SPEC := liboml.spec
+ALL += oml
+
 #
 # bootcd
 #