From: Thierry Parmentelat Date: Tue, 10 Jun 2008 08:04:23 +0000 (+0000) Subject: keeping track of modules that got branched X-Git-Tag: 4.2-rc7~8 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=dd97a6367e73a672a2f264e053ea2ab6775e10fd;p=build.git keeping track of modules that got branched this has no impact on the build contents it is only for convenience, so as to keep module-diff accurate --- diff --git a/modules.list b/modules.list index f36b544d..9231cb1c 100644 --- a/modules.list +++ b/modules.list @@ -1,5 +1,5 @@ BootCD -BootManager +BootManager:3.2 BootstrapFS CoDemux Mom:2.2 @@ -19,7 +19,7 @@ iptables libnl linux-2.6 madwifi -nodeconfig +nodeconfig:4.2 pf2slice pl_sshd pypcilib diff --git a/onelab-tags-4.2.mk b/onelab-tags-4.2.mk index 55096b75..658aac7b 100644 --- a/onelab-tags-4.2.mk +++ b/onelab-tags-4.2.mk @@ -32,7 +32,9 @@ PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-dummynet-4 PLCWWW-SVNBRANCH := onelab.4.2 PLCWWW-SVNPATH := http://svn.planet-lab.org/svn/PLCWWW/tags/PLCWWW-onelab.4.2-11 Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-1.0-2 +nodeconfig-SVNBRANCH := 4.2 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.2-4 +BootManager-SVNBRANCH := 3.2 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-3.2-7 pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-1 BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-3 diff --git a/planetlab-tags-4.2.mk b/planetlab-tags-4.2.mk index 8772f129..e713a5d2 100644 --- a/planetlab-tags-4.2.mk +++ b/planetlab-tags-4.2.mk @@ -25,7 +25,9 @@ PLCAPI-SVNBRANCH := 4.2 PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.2-8 PLCWWW-SVNPATH := http://svn.planet-lab.org/svn/PLCWWW/tags/PLCWWW-4.2-3 Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-1.0-2 +nodeconfig-SVNBRANCH := 4.2 nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.2-4 +BootManager-SVNBRANCH := 3.2 BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-3.2-7 pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-1 BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-3