From e967e491344cc265d9df5417a1241a47d5787151 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 19 Jan 2011 20:47:48 +0100 Subject: [PATCH] uses iptables from master if relevant --- onelab-k27-tags.mk | 2 +- onelab-k32-tags.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk index fa07a87e..39fb8eb3 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-33 madwifi-GITPATH := git://git.onelab.eu/madwifi.git@master -iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.9-0 +iptables-GITPATH := git://git.onelab.eu/iptables.git@master 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 785340ff..a4ca0556 100644 --- a/onelab-k32-tags.mk +++ b/onelab-k32-tags.mk @@ -4,9 +4,9 @@ linux-2.6-BRANCH := rhel6 linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-9 madwifi-GITPATH := git://git.onelab.eu/madwifi.git@master -iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.9-0 iptables-BUILD-FROM-SRPM := yes # tmp -iproute-BUILD-FROM-SRPM := yes +iptables-GITPATH := git://git.onelab.eu/iptables.git@master +iproute-BUILD-FROM-SRPM := yes iproute2-GITPATH := git://git.onelab.eu/iproute2.git@iproute2-2.6.35-0 ### ipfw-GITPATH := git://git.onelab.eu/ipfw.git@master @@ -14,7 +14,7 @@ ipfw-GITPATH := git://git.onelab.eu/ipfw.git@master comgt-SVNPATH := http://svn.onelab.eu/comgt/imports/0.3 planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools@master ### -util-vserver-BUILD-FROM-SRPM := yes # tmp +util-vserver-BUILD-FROM-SRPM := yes # tmp util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-10 libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 # as per http://svn.planet-lab.org/changeset/17973, 2.6.22 kernels shall use 0.3 branch and 2.6.27 need 0.4 -- 2.45.2