From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 1 Feb 2011 16:23:42 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build
X-Git-Tag: 5.0-rc18~11
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=90dd7fb971bdcc3b8a49b2f7cd3d70270d611669;hp=3a6f482df724b102cf8dad909bcd66265ea4929b;p=build.git

Merge branch 'master' of ssh://git.onelab.eu/git/build
---

diff --git a/modules.list b/modules.list
index ab06d692..dda0ae9f 100644
--- a/modules.list
+++ b/modules.list
@@ -18,6 +18,7 @@ linux-2.6:22
 linux-2.6:rhel6
 madwifi
 madwifi:0.9.4
+mkinitrd
 Mom
 Monitor
 myplc
@@ -26,6 +27,8 @@ nodemanager
 nodeupdate
 nozomi
 omf
+oml
+openvswitch
 pcucontrol
 pf2slice
 PingOfDeath
diff --git a/modules.update b/modules.update
index 12ebce31..af05d62d 100755
--- a/modules.update
+++ b/modules.update
@@ -11,7 +11,7 @@ fcdistros="centos5 f12"
     make stage1=true PLDISTRO=planetlab PLDISTROTAGS=planetlab-tags.mk DISTRONAME=${fcdistro} module-tools ;
     make stage1=true PLDISTRO=planetlab PLDISTROTAGS=planetlab-k27-tags.mk DISTRONAME=${fcdistro} module-tools ;
     make stage1=true PLDISTRO=planetlab PLDISTROTAGS=planetlab-k32-tags.mk DISTRONAME=${fcdistro} module-tools ;
-    make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-tags.mk DISTRONAME=${fcdistro} module-tools ;
+    make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k22-tags.mk DISTRONAME=${fcdistro} module-tools ;
     make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k27-tags.mk DISTRONAME=${fcdistro} module-tools ;
     make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k32-tags.mk DISTRONAME=${fcdistro} module-tools ;
   done 2>/dev/null ;