Setting tag ipfw-20120610-1

integrated ipfw3 as of 20120610 from upstream

diff --git a/lxc-tags.mk b/lxc-tags.mk
index d395282..4a0b503 100644 (file)
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -1,7 +1,7 @@
 # build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
 
 transforward-GITPATH           := git://git.onelab.eu/transforward.git@master
-ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@master
+ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@ipfw-20120610-1
 nodeupdate-GITPATH             := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-9
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 nodemanager-BRANCH             := lxc_devel

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index 57b8fad..cdcfcc8 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -12,7 +12,7 @@ kernel-DEVEL-RPMS             += elfutils-libelf-devel
 
 madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@madwifi-4132-5
 iptables-GITPATH                := git://git.onelab.eu/iptables.git@iptables-1.4.10-5
-ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@master
+ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@ipfw-20120610-1
 ###
 comgt-SVNPATH                  := http://svn.onelab.eu/comgt/imports/0.3
 planetlab-umts-tools-GITPATH    := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.6-6