From: John Crispin Date: Fri, 28 Sep 2012 21:54:31 +0000 (+0000) Subject: dont explicitly select wireless-tools. rely on the drivers that need them to have... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f3cab53f273a1e89a46c84465c2fbdf02adbd52b;p=openwrt%2Fstaging%2Flinusw.git dont explicitly select wireless-tools. rely on the drivers that need them to have the right dependency SVN-Revision: 33593 --- diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index e490fbb6f0..36598bde09 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -55,7 +55,7 @@ endef define KernelPackage/cfg80211 $(call KernelPackage/mac80211/Default) TITLE:=cfg80211 - wireless configuration API - DEPENDS+= +wireless-tools +iw + DEPENDS+= +iw FILES:= \ $(PKG_BUILD_DIR)/compat/compat.ko \ $(PKG_BUILD_DIR)/net/wireless/cfg80211.ko diff --git a/target/linux/at91/9260/profiles/001-flexibity-xwrt.mk b/target/linux/at91/9260/profiles/001-flexibity-xwrt.mk index 5e2c95e80f..b1c5269292 100644 --- a/target/linux/at91/9260/profiles/001-flexibity-xwrt.mk +++ b/target/linux/at91/9260/profiles/001-flexibity-xwrt.mk @@ -7,7 +7,7 @@ define Profile/flexibity-xwrt NAME:=Flexibity Connect (XWrt) - PACKAGES:=bridge wireless-tools block-mount modprobe dnsmasq hotplug2 udev webif webif-applications webif-flexibity \ + PACKAGES:=bridge block-mount modprobe dnsmasq hotplug2 udev webif webif-applications webif-flexibity \ syslog-ng sudo transmission-web miniupnpd nmap-ssl ip ntpclient ntpdate chat crda e169-stats genl hostapd-utils \ iw madwimax netcat portmap ppp ppp-mod-pppoe pptp tcpdump usb-modem usb-modem-huawei-e175x usb-modem-huawei-eg162 \ usb-modem-nokia-5800 wpa-cli wpa-supplicant motion badblocks blkid cifsmount disktype dosfsck dosfslabel e2fsprogs \ diff --git a/target/linux/at91/9260/profiles/002-flexibity-luci.mk b/target/linux/at91/9260/profiles/002-flexibity-luci.mk index 8904140f17..433239be65 100644 --- a/target/linux/at91/9260/profiles/002-flexibity-luci.mk +++ b/target/linux/at91/9260/profiles/002-flexibity-luci.mk @@ -7,7 +7,7 @@ define Profile/flexibity-luci NAME:=Flexibity Connect (LuCI) - PACKAGES:=bridge wireless-tools block-mount modprobe dnsmasq hotplug2 udev luci-flexibity \ + PACKAGES:=bridge block-mount modprobe dnsmasq hotplug2 udev luci-flexibity \ syslog-ng sudo transmission-web miniupnpd nmap-ssl ip ntpclient ntpdate chat crda e169-stats genl hostapd-utils \ iw madwimax netcat portmap ppp ppp-mod-pppoe pptp tcpdump usb-modem usb-modem-huawei-e175x usb-modem-huawei-eg162 \ usb-modem-nokia-5800 wpa-cli wpa-supplicant motion badblocks blkid cifsmount disktype dosfsck dosfslabel e2fsprogs \ diff --git a/target/linux/ixp4xx/generic/profiles/300-NAS100d.mk b/target/linux/ixp4xx/generic/profiles/300-NAS100d.mk index 2458bdb6dd..36a544b21a 100644 --- a/target/linux/ixp4xx/generic/profiles/300-NAS100d.mk +++ b/target/linux/ixp4xx/generic/profiles/300-NAS100d.mk @@ -7,7 +7,7 @@ define Profile/NAS100d NAME:=Iomega NAS 100d - PACKAGES:=kmod-ath5k wireless-tools \ + PACKAGES:=kmod-ath5k \ kmod-scsi-core \ kmod-ata-core kmod-ata-artop \ kmod-usb-core kmod-usb2 kmod-usb-storage \ diff --git a/target/linux/ixp4xx/generic/profiles/400-DSMG600RevA.mk b/target/linux/ixp4xx/generic/profiles/400-DSMG600RevA.mk index 5397681142..6e6afba486 100644 --- a/target/linux/ixp4xx/generic/profiles/400-DSMG600RevA.mk +++ b/target/linux/ixp4xx/generic/profiles/400-DSMG600RevA.mk @@ -8,7 +8,7 @@ define Profile/DSMG600RevA NAME:=DSM-G600 Rev A PACKAGES:=kmod-via-velocity \ - kmod-ath5k wireless-tools \ + kmod-ath5k \ kmod-scsi-core \ kmod-ata-core kmod-ata-artop \ kmod-usb-core kmod-usb-uhci kmod-usb2 kmod-usb-storage \ diff --git a/target/linux/ixp4xx/harddisk/profiles/100-FSG3.mk b/target/linux/ixp4xx/harddisk/profiles/100-FSG3.mk index ed011154a3..4c25178845 100644 --- a/target/linux/ixp4xx/harddisk/profiles/100-FSG3.mk +++ b/target/linux/ixp4xx/harddisk/profiles/100-FSG3.mk @@ -8,7 +8,7 @@ define Profile/FSG3 NAME:=Freecom FSG-3 PACKAGES:= \ - kmod-ath5k wireless-tools \ + kmod-ath5k \ kmod-usb-core kmod-usb-uhci kmod-usb2 kmod-usb-storage \ kmod-fs-ext2 kmod-fs-ext3 kmod-fs-reiserfs endef diff --git a/target/linux/omap24xx/profiles/100-n810.mk b/target/linux/omap24xx/profiles/100-n810.mk index a25148fc72..36f30866d0 100644 --- a/target/linux/omap24xx/profiles/100-n810.mk +++ b/target/linux/omap24xx/profiles/100-n810.mk @@ -10,7 +10,7 @@ define Profile/n810-base PACKAGES:= \ block-mount \ gpsd \ - ip iw wireless-tools kmod-p54-spi wpa-supplicant \ + ip iw kmod-p54-spi wpa-supplicant \ dnsmasq dropbear \ pwrtray-backend \ kmod-fs-vfat kmod-fs-msdos \ diff --git a/target/linux/omap35xx/gumstix/profiles/000-hegw.mk b/target/linux/omap35xx/gumstix/profiles/000-hegw.mk index d65372c52c..ee312b53db 100644 --- a/target/linux/omap35xx/gumstix/profiles/000-hegw.mk +++ b/target/linux/omap35xx/gumstix/profiles/000-hegw.mk @@ -10,7 +10,7 @@ define Profile/Gumstix PACKAGES:=-iptables -ppp -ppp-mod-pppoe -kmod-ipt-nathelper \ -firewall -mtd -hotplug2 -udevtrigger -dropbear \ usb udev kmod-bluetooth ntpclient wpa-supplicant \ - wireless-tools wpa-cli \ + wpa-cli \ bluez-utils bluez-hcidump usbutils \ kmod-usb-serial kmod-usb-serial-cp210x kmod-usb-serial-ftdi \ kmod-usb-serial-pl2303 kmod-usb-uhci kmod-cfg80211 \ diff --git a/target/linux/omap35xx/gumstix/profiles/001-vpp.mk b/target/linux/omap35xx/gumstix/profiles/001-vpp.mk index fbaf7ea603..7361ce9b71 100644 --- a/target/linux/omap35xx/gumstix/profiles/001-vpp.mk +++ b/target/linux/omap35xx/gumstix/profiles/001-vpp.mk @@ -10,7 +10,7 @@ define Profile/Vpp PACKAGES:=-iptables -ppp -ppp-mod-pppoe -kmod-ipt-nathelper \ -firewall -mtd -hotplug2 -udevtrigger -dropbear \ usb udev kmod-bluetooth ntpclient wpa-supplicant \ - wireless-tools wpa-cli \ + wpa-cli \ bluez-utils bluez-hcidump usbutils \ kmod-usb-serial kmod-usb-serial-cp210x kmod-usb-serial-ftdi \ kmod-usb-serial-pl2303 kmod-usb-uhci kmod-cfg80211 \ diff --git a/target/linux/omap35xx/gumstix/profiles/002-es.mk b/target/linux/omap35xx/gumstix/profiles/002-es.mk index 78386f62e1..cd8c4640eb 100644 --- a/target/linux/omap35xx/gumstix/profiles/002-es.mk +++ b/target/linux/omap35xx/gumstix/profiles/002-es.mk @@ -10,7 +10,7 @@ define Profile/Es PACKAGES:=-iptables -ppp -ppp-mod-pppoe -kmod-ipt-nathelper \ -firewall -mtd -hotplug2 -udevtrigger -dropbear \ usb udev kmod-bluetooth ntpclient wpa-supplicant \ - wireless-tools wpa-cli \ + wpa-cli \ bluez-utils bluez-hcidump usbutils \ kmod-usb-serial kmod-usb-serial-cp210x kmod-usb-serial-ftdi \ kmod-usb-serial-pl2303 kmod-usb-uhci kmod-cfg80211 \ diff --git a/target/linux/s3c24xx/openmoko-gta02/profiles/101-gta02-full.mk b/target/linux/s3c24xx/openmoko-gta02/profiles/101-gta02-full.mk index 966dbd1d29..7811fc9062 100644 --- a/target/linux/s3c24xx/openmoko-gta02/profiles/101-gta02-full.mk +++ b/target/linux/s3c24xx/openmoko-gta02/profiles/101-gta02-full.mk @@ -7,7 +7,7 @@ define Profile/openmoko-gta02-full NAME:=Openmoko GTA-02 (full) - PACKAGES:=xserver-xorg xf86-video-glamo xf86-input-tslib enlightenment fso-gsm0710muxd python fso-frameworkd fso-gpsd paroli wireless-tools + PACKAGES:=xserver-xorg xf86-video-glamo xf86-input-tslib enlightenment fso-gsm0710muxd python fso-frameworkd fso-gpsd paroli endef define Profile/openmoko-gta02-full/Description