revert 11932 - madwifi back on

diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index 759e409..4cb3a8e 100644 (file)
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -96,7 +96,7 @@ package+centos5: util-linux
 #
 # planetlab
 #
-# tmp-xxx-tmp package: madwifi
+package: madwifi
 package: wireless-tools
 package: util-vserver
 package: util-vserver-build

diff --git a/planetlab.mk b/planetlab.mk
index b0ca83f..60dc73c 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -41,15 +41,15 @@ IN_MYPLC += $(KERNELS)
 #
 # madwifi
 #
-# tmp-xxx-tmp madwifi-MODULES := madwifi
-# tmp-xxx-tmp madwifi-SPEC := madwifi.spec
-# tmp-xxx-tmp madwifi-BUILD-FROM-SRPM := yes
-# tmp-xxx-tmp madwifi-DEPEND-DEVEL-RPMS := kernel-devel
-# tmp-xxx-tmp madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
-# tmp-xxx-tmp  kernel_release=$(kernel.rpm-release) \
-# tmp-xxx-tmp  kernel_arch=$(kernel.rpm-arch)
-# tmp-xxx-tmp ALL += madwifi
-# tmp-xxx-tmp IN_BOOTSTRAPFS += madwifi
+madwifi-MODULES := madwifi
+madwifi-SPEC := madwifi.spec
+madwifi-BUILD-FROM-SRPM := yes
+madwifi-DEPEND-DEVEL-RPMS := kernel-devel
+madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
+       kernel_release=$(kernel.rpm-release) \
+       kernel_arch=$(kernel.rpm-arch)
+ALL += madwifi
+IN_BOOTSTRAPFS += madwifi
 
 #
 # util-vserver