From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 28 Jun 2012 09:18:55 +0000 (+0200)
Subject: attempt to add madwifi in the mix
X-Git-Tag: 5.0-rc28~36
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=bb084449dcd73b8abefc1322f9330061dbcdb52b;p=build.git

attempt to add madwifi in the mix
---

diff --git a/config.lxc/nodeimage.pkgs b/config.lxc/nodeimage.pkgs
index 538dfd55..10a2a84d 100644
--- a/config.lxc/nodeimage.pkgs
+++ b/config.lxc/nodeimage.pkgs
@@ -111,7 +111,7 @@ package>=f10: cronie
 #
 # planetlab
 #
-#package: madwifi
+package: madwifi
 package: wireless-tools
 package: nodemanager-lxc
 package: NodeUpdate
diff --git a/lxc-tags.mk b/lxc-tags.mk
index d491b905..9efdd156 100644
--- a/lxc-tags.mk
+++ b/lxc-tags.mk
@@ -3,6 +3,7 @@
 transforward-GITPATH		:= git://git.onelab.eu/transforward.git@master
 procprotect-GITPATH		:= git://git.onelab.eu/procprotect.git@master
 ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@ipfw-20120610-1
+madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@master
 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/lxc.mk b/lxc.mk
index f54ae753..3db83f33 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -34,11 +34,18 @@ IN_NODEIMAGE += ipfwroot
 
 ipfwslice-MODULES := ipfw
 ipfwslice-SPEC := planetlab/ipfwslice.spec
-ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
-        kernel_release=$(kernel.rpm-release) \
-        kernel_arch=$(kernel.rpm-arch)
 ALL += ipfwslice
 
+#
+# madwifi
+#
+madwifi-MODULES := madwifi
+madwifi-SPEC := madwifi.spec
+madwifi-BUILD-FROM-SRPM := yes
+madwifi-DEPEND-DEVEL-RPMS += kernel-devel
+ALL += madwifi
+IN_NODEIMAGE += madwifi
+
 #
 # NodeUpdate
 #