Move pyplnet to the right place.

diff --git a/onelab-tags-4.2.mk b/onelab-tags-4.2.mk
index c69590f..8e53b86 100644 (file)
--- a/onelab-tags-4.2.mk
+++ b/onelab-tags-4.2.mk
@@ -16,6 +16,8 @@ NodeUpdate-SVNPATH            := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 NodeManager-SVNBRANCH          := 1.7
 NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.7-38
+pyplnet-SVNBRANCH              := 4.2
+pyplnet-SVNPATH                        := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.2-0
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
 CoDemux-SVNPATH                        := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-13
 fprobe-ulog-SVNBRANCH          := 1.1.2

diff --git a/onelab.mk b/onelab.mk
index c940b8e..fce0e74 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -287,6 +287,16 @@ pypcilib-SPEC := pypcilib.spec
 ALL += pypcilib
 IN_BOOTCD += pypcilib
 
+#
+# pyplnet
+#
+pyplnet-MODULES := pyplnet
+pyplnet-SPEC := pyplnet.spec
+ALL += pyplnet
+IN_BOOTSTRAPFS += pyplnet
+IN_MYPLC += pyplnet
+IN_BOOTCD += pyplnet
+
 #
 # bootcd
 #

diff --git a/planetlab.mk b/planetlab.mk
index 529a9f4..1d96470 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -242,6 +242,16 @@ pypcilib-SPEC := pypcilib.spec
 ALL += pypcilib
 IN_BOOTCD += pypcilib
 
+#
+# pyplnet
+#
+pyplnet-MODULES := pyplnet
+pyplnet-SPEC := pyplnet.spec
+ALL += pyplnet
+IN_BOOTSTRAPFS += pyplnet
+IN_MYPLC += pyplnet
+IN_BOOTCD += pyplnet
+
 #
 # bootcd
 #
@@ -326,13 +336,3 @@ ALL += myplc-native
 myplc-docs-MODULES := MyPLC PLCAPI NodeManager
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs
-
-#
-# pyplnet
-#
-pyplnet-MODULES := pyplnet
-pyplnet-SPEC := pyplnet.spec
-ALL += pyplnet
-IN_BOOTSTRAPFS += pyplnet
-IN_MYPLC += pyplnet
-IN_BOOTCD += pyplnet