mac80211 has to be embedded in kernel

diff --git a/onelab-tags-4.2.mk b/onelab-tags-4.2.mk
index 75d17d8..2181c00 100644 (file)
--- a/onelab-tags-4.2.mk
+++ b/onelab-tags-4.2.mk
@@ -3,7 +3,6 @@
 build-SVNPATH                  := http://svn.planet-lab.org/svn/build/trunk
 linux-patches-SVNPATH          := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-1
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.3.3-1
-mac80211-SVNPATH               := http://svn.one-lab.org/mac80211/tags/mac80211-10.0.4-1
 iwlwifi-SVNPATH                        := http://svn.one-lab.org/iwlwifi/tags/iwlwifi-1.2.23-1
 wireless-tools-SVNPATH         := http://svn.planet-lab.org/svn/wireless-tools/tags/wireless-tools-29-0
 nozomi-SVNPATH                 := http://svn.one-lab.org/nozomi/tags/nozomi-2.21-1

diff --git a/onelab-tags.mk b/onelab-tags.mk
index e1e63e2..29f33bd 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -3,7 +3,6 @@
 build-SVNPATH                  := http://svn.planet-lab.org/svn/build/trunk
 linux-patches-SVNPATH          := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/trunk
-mac80211-SVNPATH               := http://svn.one-lab.org/mac80211/trunk
 iwlwifi-SVNPATH                        := http://svn.one-lab.org/iwlwifi/trunk
 wireless-tools-SVNPATH         := http://svn.planet-lab.org/svn/wireless-tools/trunk
 nozomi-SVNPATH                 := http://svn.one-lab.org/nozomi/trunk

diff --git a/onelab.mk b/onelab.mk
index a3fdaa9..69b4991 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -65,19 +65,6 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
-#
-# mac80211
-#
-mac80211-MODULES := mac80211
-mac80211-SPEC := mac80211.spec
-mac80211-BUILD-FROM-SRPM := yes
-mac80211-DEPEND-DEVEL-RPMS := kernel-devel
-mac80211-SPECVARS = kernel_version=$(kernel.rpm-version) \
-       kernel_release=$(kernel.rpm-release) \
-       kernel_arch=$(kernel.rpm-arch)
-#ALL += mac80211
-#IN_BOOTSTRAPFS += mac80211
-
 #
 # iwlwifi
 #