git://git.onelab.eu / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 5cb376f)
Merge commit 'origin/master'
authorroot <root@cassidy.cs.princeton.edu>
Wed, 15 Dec 2010 21:55:18 +0000 (16:55 -0500)
committerroot <root@cassidy.cs.princeton.edu>
Wed, 15 Dec 2010 21:55:18 +0000 (16:55 -0500)
coblitz-latest-tags.mk patch | blob | history
onelab-k27-tags.mk patch | blob | history
onelab-k32-tags.mk patch | blob | history
planetlab-k27-tags.mk patch | blob | history
planetlab-k32-tags.mk patch | blob | history
planetlab-tags.mk patch | blob | history

diff --git a/coblitz-latest-tags.mk b/coblitz-latest-tags.mk
index 20a973c..e6e8090 100644 (file)
--- a/coblitz-latest-tags.mk
+++ b/coblitz-latest-tags.mk
@@ -32,7 +32,7 @@ Monitor-SVNPATH                       := http://svn.planet-lab.org/svn//Monitor/tags/Monitor-3.0-30/
 pcucontrol-SVNPATH             := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-2/
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-7
 BootManager-BRANCH             := 4.3
-BootManager-GITPATH            := git://git.planet-lab.org/bootmanager@bootmanager-4.3-18
+BootManager-GITPATH            := git://git.planet-lab.org/bootmanager@bootmanager-4.3-19
 pypcilib-SVNPATH               := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9
 BootCD-SVNPATH                 := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-17
 VserverReference-SVNPATH       := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-16
diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 5c913fa..61f8f33 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -1,7 +1,7 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
 ###
-linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-32
+linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-33
 madwifi-GITPATH                        := git://git.onelab.eu/madwifi.git@madwifi-4132-1
 iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.9-0
 iptables-BUILD-FROM-SRPM        := yes # tmp
diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index 6489f0e..1863557 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -50,7 +50,7 @@ omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
 sfa-GITPATH                     := git://git.onelab.eu/sfa.git@master
 sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.1-3
 nodeconfig-GITPATH             := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-3
-bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-14
+bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-15
 pypcilib-GITPATH               := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-9
 pyplnet-GITPATH                        := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-7
 bootcd-GITPATH                  := git://git.onelab.eu/bootcd.git@bootcd-5.0-6
diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index a914029..47f66a0 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -1,7 +1,7 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
-linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-27-32
-madwifi-GITPATH                        := git://git.planet-lab.org/madwifi.git@madwifi-4099-0
+linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-27-33
+madwifi-GITPATH                        := git://git.planet-lab.org/madwifi.git@madwifi-4132-1
 iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.9-0
 iptables-BUILD-FROM-SRPM := yes        # tmp
 iproute-BUILD-FROM-SRPM := yes 
@@ -44,7 +44,7 @@ pypcilib-GITPATH              := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9
 pyplnet-GITPATH                        := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-6
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 pcucontrol-GITPATH              := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-9
-bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-14
+bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-15
 bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-6
 vserver-reference-GITPATH        := git://git.planet-lab.org/vserver-reference.git@vserver-reference-5.0-4
 bootstrapfs-GITPATH             := git://git.planet-lab.org/bootstrapfs.git@BootstrapFS-2.0-6
diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index f22de36..db2bcb7 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -1,6 +1,6 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
-linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@rhel6
+linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-2
 madwifi-GITPATH                        := git://git.planet-lab.org/madwifi.git@madwifi-4099-0
 iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.9-0
 iptables-BUILD-FROM-SRPM := yes        # tmp
@@ -16,6 +16,7 @@ nodemanager-GITPATH             := git://git.planet-lab.org/nodemanager.git@node
 # Trellis-specific NodeManager plugins
 NodeManager-topo-SVNPATH       := http://svn.planet-lab.org/svn/NodeManager-topo/trunk
 NodeManager-optin-SVNPATH      := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
+#
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
 codemux-GITPATH                        := git://git.planet-lab.org/codemux.git@CoDemux-0.1-14
 fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
@@ -29,25 +30,25 @@ plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-24
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
 plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-57
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
-pcucontrol-GITPATH              := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-9
 Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
 PLCRT-SVNPATH                  := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
 pyopenssl-SVNPATH              := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
 ###
 pyaspects-GITPATH              := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-0
 ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-2
-omf-GITPATH                     := git://git.planet-lab.org/omf.git@omf-5.3-8
+omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
 ###
 sfa-GITPATH                    := git://git.planet-lab.org/sfa.git@sfa-1.0-10
 nodeconfig-GITPATH             := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-3
-bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-14
+bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-15
 pypcilib-GITPATH               := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9
 pyplnet-GITPATH                        := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-6
+DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
+pcucontrol-GITPATH              := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-9
+bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-14
 bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-6
 vserver-reference-GITPATH        := git://git.planet-lab.org/vserver-reference.git@vserver-reference-5.0-4
 bootstrapfs-GITPATH             := git://git.planet-lab.org/bootstrapfs.git@BootstrapFS-2.0-6
 myplc-GITPATH                   := git://git.planet-lab.org/myplc.git@myplc-5.0-12
-DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
-
 # locating the right test directory - see make tests_gitpath
 tests-GITPATH                   := git://git.planet-lab.org/tests.git@tests-5.0-20
diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 8db7264..aae536b 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -41,7 +41,7 @@ omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-8
 ###
 sfa-GITPATH                    := git://git.planet-lab.org/sfa.git@sfa-1.0-10
 nodeconfig-GITPATH             := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-3
-bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-14
+bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-15
 pypcilib-GITPATH               := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9
 pyplnet-GITPATH                        := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-6
 bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-5.0-6
build