From: S.Çağlar Onur Date: Tue, 25 Jan 2011 19:51:02 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/build X-Git-Tag: 5.0-rc18~50 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9c4736723ef4d1ef229f021306c4fcc059623a62;hp=386e05e41d044d046b523a2301f2def0ccfa09bc;p=build.git Merge branch 'master' of ssh://git.planet-lab.org/git/build --- diff --git a/coblitz-unstable-tags.mk b/coblitz-unstable-tags.mk index 41946243..df1a7001 100644 --- a/coblitz-unstable-tags.mk +++ b/coblitz-unstable-tags.mk @@ -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.9-1 +iptables-GITPATH := git://git.planet-lab.org/iptables.git@iptables-1.4.10-0 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/onelab-k27-tags.mk b/onelab-k27-tags.mk index db9626aa..0b44655a 100644 --- 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.9-1 +iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.10-0 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 78de7e76..ec9c0e6b 100644 --- a/onelab-k32-tags.mk +++ b/onelab-k32-tags.mk @@ -8,7 +8,7 @@ linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@rhel6 kernel-DEVEL-RPMS += elfutils-libelf-devel madwifi-GITPATH := git://git.onelab.eu/madwifi.git@madwifi-4132-2 iptables-BUILD-FROM-SRPM := yes # tmp -iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.9-1 +iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.10-0 iproute-BUILD-FROM-SRPM := yes iproute2-GITPATH := git://git.onelab.eu/iproute2.git@iproute2-2.6.35-0 ### diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk index c1c7c539..b03e23cf 100644 --- 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.9-1 +iptables-GITPATH := git://git.planet-lab.org/iptables.git@iptables-1.4.10-0 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 5b36fc1c..65ea0531 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -5,7 +5,7 @@ linux-2.6-BRANCH := rhel6 linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-9 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.9-1 +iptables-GITPATH := git://git.planet-lab.org/iptables.git@iptables-1.4.10-0 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