From: Daniel Dickinson <crazycshore@gmail.com>
Date: Wed, 8 Dec 2010 00:40:24 +0000 (+0000)
Subject: Profiles: Move wpad-mini to the profiles that use it, rather than default for all... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c6ef9a072080fb37f566759659fb35b448fcce31;p=openwrt%2Fstaging%2Fldir.git

Profiles: Move wpad-mini to the profiles that use it, rather than default for all profiles (because -wpad-mini means it's not selectable, which isn't what we always want for the No WiFi profile

SVN-Revision: 24314
---

diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile
index 5bdc10384d..9b9043269f 100644
--- a/target/linux/brcm63xx/Makefile
+++ b/target/linux/brcm63xx/Makefile
@@ -14,7 +14,7 @@ LINUX_VERSION:=2.6.35.9
 
 include $(INCLUDE_DIR)/target.mk
 
-DEFAULT_PACKAGES += wpad-mini kmod-switch gpioctl
+DEFAULT_PACKAGES += kmod-switch gpioctl
 
 define Target/Description
 	Build firmware images for Broadcom based xDSL/routers
diff --git a/target/linux/brcm63xx/profiles/100-Broadcom.mk b/target/linux/brcm63xx/profiles/100-Broadcom.mk
index b7e1f46ec5..bc68f14937 100644
--- a/target/linux/brcm63xx/profiles/100-Broadcom.mk
+++ b/target/linux/brcm63xx/profiles/100-Broadcom.mk
@@ -7,7 +7,7 @@
 
 define Profile/Broadcom
   NAME:=Broadcom WiFi (default)
-  PACKAGES:=kmod-b43
+  PACKAGES:=kmod-b43 wpad-mini
 endef
 
 define Profile/Broadcom/Description
diff --git a/target/linux/brcm63xx/profiles/101-Broadcom-wl.mk b/target/linux/brcm63xx/profiles/101-Broadcom-wl.mk
index d67298cc9d..4f2d605eb7 100644
--- a/target/linux/brcm63xx/profiles/101-Broadcom-wl.mk
+++ b/target/linux/brcm63xx/profiles/101-Broadcom-wl.mk
@@ -7,7 +7,7 @@
 
 define Profile/Broadcom-wl
   NAME:=Broadcom BCM43xx WiFi (wl, proprietary)
-  PACKAGES:=-wpad-mini kmod-brcm-wl wlc nas
+  PACKAGES:= kmod-brcm-wl wlc nas
 endef
 
 define Profile/Broadcom-wl/Description
diff --git a/target/linux/brcm63xx/profiles/102-Atheros.mk b/target/linux/brcm63xx/profiles/102-Atheros.mk
index 029586848f..c6d2da636e 100644
--- a/target/linux/brcm63xx/profiles/102-Atheros.mk
+++ b/target/linux/brcm63xx/profiles/102-Atheros.mk
@@ -7,7 +7,7 @@
 
 define Profile/Atheros
   NAME:=Atheros WiFi (default)
-  PACKAGES:=kmod-madwifi
+  PACKAGES:=kmod-madwifi wpad-mini
 endef
 
 define Profile/Atheros/Description
diff --git a/target/linux/brcm63xx/profiles/103-Ralink.mk b/target/linux/brcm63xx/profiles/103-Ralink.mk
index 0d78ae4a5a..412c5a45ad 100644
--- a/target/linux/brcm63xx/profiles/103-Ralink.mk
+++ b/target/linux/brcm63xx/profiles/103-Ralink.mk
@@ -7,7 +7,7 @@
 
 define Profile/Ralink
   NAME:=Ralink WiFi
-  PACKAGES:=kmod-rt61-pci
+  PACKAGES:=kmod-rt61-pci wpad-mini
 endef
 $(eval $(call Profile,Ralink))