Merge branch 'master' of ssh://git.onelab.eu/git/build

diff --git a/coblitz-latest-tags.mk b/coblitz-latest-tags.mk
index ca9b1de..032290d 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-11
+linux-2.6-GITPATH               := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-12
 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
@@ -18,7 +18,7 @@ fprobe-ulog-SVNPATH           := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ul
 pf2slice-SVNPATH               := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
 Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-2
 iptables-BUILD-FROM-SRPM        := yes # tmp
-iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-2
+iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-3
 iproute-BUILD-FROM-SRPM         := yes # tmp
 iproute2-GITPATH                := git://git.planet-lab.org/iproute2.git@iproute2-2.6.35-0
 inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2

diff --git a/coblitz.mk b/coblitz.mk
index cb2336e..c4f0a03 100644 (file)
--- a/coblitz.mk
+++ b/coblitz.mk
@@ -14,7 +14,7 @@
 
 # mkinitrd
 #
-ifeq "$(PLDISTROTAGS)" "coblitz-unstable-tags.mk"
+ifeq "$(PLDISTROTAGS)" "coblitz-latest-tags.mk"
 ifeq "$(DISTRONAME)" "centos5"
 mkinitrd-MODULES := mkinitrd
 mkinitrd-SPEC := mkinitrd.spec

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 46aa353..e86d411 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -3,7 +3,7 @@
 ###
 linux-2.6-GITPATH              := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-34
 madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@madwifi-4132-2
-iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.10-2
+iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.10-3
 iptables-BUILD-FROM-SRPM        := yes # tmp
 iproute-BUILD-FROM-SRPM := yes 
 iproute2-GITPATH               := git://git.onelab.eu/iproute2.git@iproute2-2.6.35-0

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index c56772c..688bff7 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-11
+linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-12
 # 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-k27-tags.mk b/planetlab-k27-tags.mk
index a124f8b..bd23b2c 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -2,7 +2,7 @@
 
 linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-27-34
 madwifi-GITPATH                        := git://git.planet-lab.org/madwifi.git@madwifi-4132-2
-iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-2
+iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-3
 iptables-BUILD-FROM-SRPM := yes        # tmp
 iproute-BUILD-FROM-SRPM := yes 
 iproute2-GITPATH               := git://git.planet-lab.org/iproute2.git@iproute2-2.6.35-0

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 054aa02..ed0919d 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -2,14 +2,14 @@
 
 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-11
+linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-12
 # 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
 endif
 kernel-DEVEL-RPMS              += elfutils-libelf-devel
 madwifi-GITPATH                 := git://git.planet-lab.org/madwifi.git@madwifi-4132-2
-iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-2
+iptables-GITPATH                := git://git.planet-lab.org/iptables.git@iptables-1.4.10-3
 iptables-BUILD-FROM-SRPM := yes        # tmp
 iproute-BUILD-FROM-SRPM := yes 
 iproute2-GITPATH               := git://git.planet-lab.org/iproute2.git@iproute2-2.6.35-0