@$(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); )))
MyPLC
NodeManager
NodeUpdate
-PLCAPI
PLCRT
-PLEWWW
PingOfDeath
VserverReference
comgt
pf2slice
pl_sshd
planetlab-umts-tools
+plcapi
+plewww
pyaspects
pyopenssl
pypcilib
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$'
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
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
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
#
# plcapi
#
-plcapi-MODULES := PLCAPI
+plcapi-MODULES := plcapi
plcapi-SPEC := PLCAPI.spec
ALL += plcapi
IN_MYPLC += plcapi
#
# use the plewww module instead
#
-plewww-MODULES := PLEWWW
+plewww-MODULES := plewww
plewww-SPEC := plewww.spec
ALL += plewww
IN_MYPLC += plewww
# 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
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
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
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
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
#
# 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
#
# use the plewww module instead
#
-plewww-MODULES := PLEWWW
+plewww-MODULES := plewww
plewww-SPEC := plewww.spec
ALL += plewww
IN_MYPLC += plewww
# 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