* tentative merge of the onelab build, be sure to run

[build.git] / onelab-tags-rc2.mk

diff --git a/onelab-tags-rc2.mk b/onelab-tags-rc2.mk
index 2498e11..82aefe1 100644 (file)
--- a/onelab-tags-rc2.mk
+++ b/onelab-tags-rc2.mk
@@ -21,7 +21,7 @@ kernel-x86_64-TAG :=          planetlab-4_0-rc2
 kernel-i586-TAG :=             planetlab-4_0-rc2
 # end
 vnet-TAG :=                    planetlab-4_0-rc2
-madwifi-ng-TAG :=              planetlab-4_0-rc2
+madwifi-ng-SVNPATH :=          svn+ssh://build@svn.one-lab.org/svn/madwifi-ng/tags/0.9.3
 wireless-tools-SVNPATH :=      svn+ssh://build@svn.one-lab.org/svn/wireless-tools/tags/29pre14
 ivtv-TAG :=                    planetlab-4_0-rc2
 util-vserver-TAG :=            planetlab-4_0-rc2
@@ -52,6 +52,9 @@ new_plc_api-SVNPATH :=                svn+ssh://build@svn.one-lab.org/svn/new_plc_api/trunk
 vserver-reference-TAG :=       planetlab-4_0-rc2
 bootmanager-SVNPATH :=         svn+ssh://build@svn.one-lab.org/svn/bootmanager/trunk
 bootcd-SVNPATH :=              svn+ssh://build@svn.one-lab.org/svn/bootcd/trunk
+# xxx-ambiguous-xxx
+plcwww-SVNPATH :=              svn+ssh://build@svn.one-lab.org/svn/new_plc_www/trunk
+new_plc_www-SVNPATH :=                 svn+ssh://build@svn.one-lab.org/svn/new_plc_www/trunk
+# end
 myplc-SVNPATH :=               svn+ssh://build@svn.one-lab.org/svn/myplc/trunk
-new_plc_www-TAG :=             planetlab-4_0-rc2
 plc/scripts-TAG :=             planetlab-4_0-rc2