trying out latest code for dummynet/ipfw after Luigi at last exposed this in a git...

this is advertised to be compatible with f20's version of the kernel

diff --git a/lxc-tags.mk b/lxc-tags.mk
index f269395..1e92914 100644 (file)
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -1,7 +1,9 @@
 lxc-userspace-GITPATH           := git://git.onelab.eu/lxc-userspace.git@lxc-userspace-1.0-12
 transforward-GITPATH            := git://git.onelab.eu/transforward.git@master
 procprotect-GITPATH             := git://git.onelab.eu/procprotect.git@master
-ipfw-GITPATH                    := git://git.code.sf.net/p/dummynet/code@155b6cd31089b4763297d579e9c9945393f00c40
+ipfw-GITPATH                    := https://code.google.com/p/dummynet@master
+# this was known to work with f18 but not f20
+#ipfw-GITPATH                    := git://git.code.sf.net/p/dummynet/code@155b6cd31089b4763297d579e9c9945393f00c40
 comgt-GITPATH                  := git://git.onelab.eu/comgt.git@0.3
 planetlab-umts-tools-GITPATH    := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.7-1
 nodeupdate-GITPATH              := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-11

diff --git a/lxc.mk b/lxc.mk
index 8a4bd9b..67d607d 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -38,8 +38,6 @@ IN_NODEIMAGE += procprotect
 #
 # ipfw: root context module, and slice companion
 #
-# this module won't build yet under f20
-ifeq "$(DISTRONAME)" "f18"
 ipfwroot-MODULES := ipfw
 ipfwroot-SPEC := planetlab/ipfwroot.spec
 ALL += ipfwroot
@@ -48,7 +46,6 @@ IN_NODEIMAGE += ipfwroot
 ipfwslice-MODULES := ipfw
 ipfwslice-SPEC := planetlab/ipfwslice.spec
 ALL += ipfwslice
-endif
 
 #
 # comgt - a companion to umts tools