From 61908f1c343871575276cc196ce9cab0b2ffedde Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 1 Jul 2010 11:24:09 +0200
Subject: [PATCH] switch to git for plcapi -- refresh module names for
module-tools -a & the pending diffs page
---
Makefile | 4 ++--
modules.list | 4 ++--
modules.update | 2 +-
onelab-k27-tags.mk | 4 ++--
onelab-tags.mk | 7 ++++---
onelab.mk | 6 +++---
planetlab-k27-tags.mk | 4 ++--
planetlab-k32-tags.mk | 4 ++--
planetlab-tags.mk | 6 ++++--
planetlab.mk | 12 ++++++------
10 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/Makefile b/Makefile
index ccdb09f1..c9bd923c 100644
--- a/Makefile
+++ b/Makefile
@@ -771,8 +771,8 @@ module-tools:
@$(foreach module,$(ALL.modules), \
$(if $($(module)-GITPATH), \
$(if $($(module)-BRANCH), \
- echo git:$(module):$($(module)-BRANCH); , \
- echo git:$(module); ), \
+ echo $(module):$($(module)-BRANCH); , \
+ echo $(module); ), \
$(if $($(module)-BRANCH), \
echo $(module):$($(module)-BRANCH); , \
echo $(module); )))
diff --git a/modules.list b/modules.list
index 149430e8..70e5c4da 100644
--- a/modules.list
+++ b/modules.list
@@ -8,9 +8,7 @@ Monitor
MyPLC
NodeManager
NodeUpdate
-PLCAPI
PLCRT
-PLEWWW
PingOfDeath
VserverReference
comgt
@@ -34,6 +32,8 @@ pcucontrol
pf2slice
pl_sshd
planetlab-umts-tools
+plcapi
+plewww
pyaspects
pyopenssl
pypcilib
diff --git a/modules.update b/modules.update
index 63806ff2..14f41faa 100755
--- a/modules.update
+++ b/modules.update
@@ -12,4 +12,4 @@ fcdistro=centos5
make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-tags.mk DISTRONAME=${fcdistro} module-tools ; \
make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k27-tags.mk DISTRONAME=${fcdistro} module-tools ; \
echo tests
-) | sort -u | grep -v '^build$' | grep -v 'git:'
+) | sort -u | grep -v '^build$'
diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 8c1b7392..7ba73ebe 100644
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -29,9 +29,9 @@ inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
vsys-BRANCH := 0.9
vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-18
-PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-12
+plcapi-GITPATH := git://git.onelab.eu/plcapi@PLCAPI-5.0-12
drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13
-PLEWWW-GITPATH := git://git.onelab.eu/plewww@plewww-4.3-46
+plewww-GITPATH := git://git.onelab.eu/plewww@plewww-4.3-46
www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3
pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-6
Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
diff --git a/onelab-tags.mk b/onelab-tags.mk
index 9be998f5..c3fc51a0 100644
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -16,7 +16,8 @@ planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools@planetl
util-vserver-BRANCH := scholz
util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6
libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
-# as per http://svn.planet-lab.org/changeset/17973, 2.6.22 kernels shall use 0.3 branch and 2.6.27 need 0.4 (trunk).
+# 2.6.22 kernels need 0.3 branch and 2.6.27 need 0.4 (trunk).
+util-vserver-pl-BRANCH := 0.3
util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-31
NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6
PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
@@ -30,9 +31,9 @@ inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
vsys-BRANCH := 0.9
vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-18
-PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-12
+plcapi-GITPATH := git://git.onelab.eu/plcapi@PLCAPI-5.0-12
drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13
-PLEWWW-GITPATH := git://git.onelab.eu/plewww@plewww-4.3-46
+plewww-GITPATH := git://git.onelab.eu/plewww@plewww-4.3-46
www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3
pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-6
Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
diff --git a/onelab.mk b/onelab.mk
index 593f6773..edac14f4 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -284,7 +284,7 @@ ALL += vsys-scripts
#
# plcapi
#
-plcapi-MODULES := PLCAPI
+plcapi-MODULES := plcapi
plcapi-SPEC := PLCAPI.spec
ALL += plcapi
IN_MYPLC += plcapi
@@ -301,7 +301,7 @@ IN_MYPLC += drupal
#
# use the plewww module instead
#
-plewww-MODULES := PLEWWW
+plewww-MODULES := plewww
plewww-SPEC := plewww.spec
ALL += plewww
IN_MYPLC += plewww
@@ -519,7 +519,7 @@ ALL += myplc
# myplc-docs only contains docs for PLCAPI and NMAPI, but
# we still need to pull MyPLC, as it is where the specfile lies,
# together with the utility script docbook2drupal.sh
-myplc-docs-MODULES := MyPLC PLCAPI NodeManager Monitor
+myplc-docs-MODULES := MyPLC plcapi NodeManager Monitor
myplc-docs-SPEC := myplc-docs.spec
ALL += myplc-docs
diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index 1b8f1a99..25009232 100644
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -26,9 +26,9 @@ inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
vsys-BRANCH := 0.9
vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-18
-PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-12
+plcapi-GITPATH := git://git.onelab.eu/plcapi@PLCAPI-5.0-12
drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13
-PLEWWW-GITPATH := git://git.onelab.eu/plewww@plewww-4.3-46
+plewww-GITPATH := git://git.onelab.eu/plewww@plewww-4.3-46
www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3
pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-6
Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index c0f19937..15d87123 100644
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -25,9 +25,9 @@ inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
vsys-BRANCH := 0.9
vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-18
-PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-12
+plcapi-GITPATH := git://git.onelab.eu/plcapi@PLCAPI-5.0-12
drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13
-PLEWWW-GITPATH := git://git.onelab.eu/plewww@plewww-4.3-46
+plewww-GITPATH := git://git.onelab.eu/plewww@plewww-4.3-46
www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3
pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-6
Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index c45ede6e..fe1c79cf 100644
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -10,6 +10,8 @@ iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16
util-vserver-BRANCH := scholz
util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6
libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
+# 2.6.22 kernels need 0.3 branch and 2.6.27 need 0.4 (trunk).
+util-vserver-pl-BRANCH := 0.3
util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-31
NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6
PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
@@ -24,9 +26,9 @@ inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
vsys-BRANCH := 0.9
vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-18
-PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-12
+plcapi-GITPATH := git://git.onelab.eu/plcapi@PLCAPI-5.0-12
drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13
-PLEWWW-GITPATH := git://git.onelab.eu/plewww@plewww-4.3-46
+plewww-GITPATH := git://git.onelab.eu/plewww@plewww-4.3-46
www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3
pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-6
Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
diff --git a/planetlab.mk b/planetlab.mk
index 77333b09..b8bad61c 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -222,10 +222,10 @@ ALL += vsys-scripts
#
# PLCAPI
#
-PLCAPI-MODULES := PLCAPI
-PLCAPI-SPEC := PLCAPI.spec
-ALL += PLCAPI
-IN_MYPLC += PLCAPI
+plcapi-MODULES := plcapi
+plcapi-SPEC := PLCAPI.spec
+ALL += plcapi
+IN_MYPLC += plcapi
#
# drupal
@@ -239,7 +239,7 @@ IN_MYPLC += drupal
#
# use the plewww module instead
#
-plewww-MODULES := PLEWWW
+plewww-MODULES := plewww
plewww-SPEC := plewww.spec
ALL += plewww
IN_MYPLC += plewww
@@ -435,7 +435,7 @@ ALL += myplc
# myplc-docs only contains docs for PLCAPI and NMAPI, but
# we still need to pull MyPLC, as it is where the specfile lies,
# together with the utility script docbook2drupal.sh
-myplc-docs-MODULES := MyPLC PLCAPI NodeManager Monitor
+myplc-docs-MODULES := MyPLC plcapi NodeManager Monitor
myplc-docs-SPEC := myplc-docs.spec
ALL += myplc-docs
--
2.47.0