Merge branch 'master' of ssh://git.planet-lab.org/git/build

diff --git a/coblitz-latest-tags.mk b/coblitz-latest-tags.mk
index b060191..6228acb 100644 (file)
--- a/coblitz-latest-tags.mk
+++ b/coblitz-latest-tags.mk
@@ -2,7 +2,7 @@
 
 mkinitrd-GITPATH               := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-2
 linux-2.6-BRANCH                := rhel6
-linux-2.6-GITPATH               := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-12
+linux-2.6-GITPATH               := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-13
 madwifi-GITPATH                 := git://git.planet-lab.org/madwifi.git@madwifi-4132-2
 util-vserver-GITPATH            := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-14
 util-vserver-BUILD-FROM-SRPM   := yes     # tmp

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index 498ea4d..ba6e883 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -2,7 +2,7 @@
 
 ###
 linux-2.6-BRANCH               := rhel6
-linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-12
+linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-13
 # help out spec2make on f8 and centos5, due to a bug in rpm
 ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
 kernel-WHITELIST-RPMS  := kernel-devel,kernel-headers

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index ce8e8a6..df3956c 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -2,7 +2,7 @@
 
 mkinitrd-GITPATH               := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-2
 linux-2.6-BRANCH               := rhel6
-linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-12
+linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-13
 # help out spec2make on f8 and centos5, due to a bug in rpm
 ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
 kernel-WHITELIST-RPMS  := kernel-devel,kernel-headers