From 1846ada5d5a04c61bdbe38ba42180ac6d62c0dab Mon Sep 17 00:00:00 2001 From: agb Date: Fri, 2 Jan 2009 05:12:46 +0000 Subject: [PATCH] Add hostapd-mini to default images where applicable git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13819 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/adm5120/Makefile | 8 ++------ .../adm5120/router_le/profiles/Cellvision.mk | 16 +++++++++++++--- .../linux/adm5120/router_le/profiles/Edimax.mk | 5 ++++- target/linux/ar71xx/Makefile | 2 +- target/linux/atheros/Makefile | 6 +++--- target/linux/au1000/Makefile | 4 ++-- target/linux/au1000/profiles/InternetBox.mk | 4 ++-- target/linux/au1000/profiles/MeshCube.mk | 5 ++--- target/linux/brcm-2.4/profiles/120-Atheros.mk | 4 ++-- target/linux/brcm47xx/Makefile | 6 +++--- target/linux/brcm47xx/profiles/110-None.mk | 4 ++-- target/linux/brcm63xx/Makefile | 6 ++++-- target/linux/ifxmips/Makefile | 6 +++--- target/linux/ifxmips/profiles/000-None.mk | 4 ++-- .../linux/ixp4xx/generic/profiles/200-NSLU2.mk | 4 ++-- .../linux/ixp4xx/generic/profiles/500-USR8200.mk | 4 ++-- target/linux/ixp4xx/generic/target.mk | 2 ++ target/linux/rb532/Makefile | 2 +- target/linux/rdc/Makefile | 6 ++++-- 19 files changed, 56 insertions(+), 42 deletions(-) diff --git a/target/linux/adm5120/Makefile b/target/linux/adm5120/Makefile index 9a601e47d..4e63a0fcc 100644 --- a/target/linux/adm5120/Makefile +++ b/target/linux/adm5120/Makefile @@ -15,11 +15,7 @@ INITRAMFS_EXTRA_FILES:= include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += admswconfig -DEFAULT_PACKAGES += \ - kmod-input-core \ - kmod-input-polldev \ - kmod-input-gpio-buttons \ - kmod-button-hotplug +DEFAULT_PACKAGES += admswconfig hostapd-mini kmod-input-core \ + kmod-input-polldev kmod-input-gpio-buttons kmod-button-hotplug $(eval $(call BuildTarget)) diff --git a/target/linux/adm5120/router_le/profiles/Cellvision.mk b/target/linux/adm5120/router_le/profiles/Cellvision.mk index 9c8356a66..9fa1e0233 100644 --- a/target/linux/adm5120/router_le/profiles/Cellvision.mk +++ b/target/linux/adm5120/router_le/profiles/Cellvision.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2007,2008 OpenWrt.org +# Copyright (C) 2007-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,6 +8,7 @@ define Profile/CAS630 NAME:=Cellvision CAS-630 IP camera (Experimental) # TODO: add default packages + PACKAGES:=-hostapd-mini endef define Profile/CAS630/Description @@ -17,6 +18,7 @@ endef define Profile/CAS630W NAME:=Cellvision CAS-630W IP camera (Experimental) # TODO: add default packages + PACKAGES:=-hostapd-mini endef define Profile/CAS630W/Description @@ -26,6 +28,7 @@ endef define Profile/CAS670 NAME:=Cellvision CAS-670 IP camera (Experimental) # TODO: add default packages + PACKAGES:=-hostapd-mini endef define Profile/CAS670/Description @@ -35,6 +38,7 @@ endef define Profile/CAS670W NAME:=Cellvision CAS-670W IP camera (Experimental) # TODO: add default packages + PACKAGES:=-hostapd-mini endef define Profile/CAS670W/Description @@ -44,6 +48,7 @@ endef define Profile/CAS700 NAME:=Cellvision CAS-700 IP camera (Experimental) # TODO: add default packages + PACKAGES:=-hostapd-mini endef define Profile/CAS700/Description @@ -53,6 +58,7 @@ endef define Profile/CAS700W NAME:=Cellvision CAS-700W IP camera (Experimental) # TODO: add default packages + PACKAGES:=-hostapd-mini endef define Profile/CAS700W/Description @@ -61,7 +67,7 @@ endef define Profile/CAS771 NAME:=Cellvision CAS-771 IP camera (Experimental) - PACKAGES:=kmod-video-cpia2 kmod-usb-ohci kmod-usb2 kmod-usb-audio + PACKAGES:=-hostapd-mini kmod-video-cpia2 kmod-usb-ohci kmod-usb2 kmod-usb-audio endef define Profile/CAS771/Description @@ -70,7 +76,7 @@ endef define Profile/CAS771W NAME:=Cellvision CAS-771W IP camera (Experimental) - PACKAGES:=kmod-video-cpia2 kmod-usb-ohci kmod-usb2 kmod-usb-audio kmod-rt2500-pci + PACKAGES:=-hostapd-mini kmod-video-cpia2 kmod-usb-ohci kmod-usb2 kmod-usb-audio kmod-rt2500-pci endef define Profile/CAS771W/Description @@ -80,6 +86,7 @@ endef define Profile/CAS790 NAME:=Cellvision CAS-790 IP camera (Experimental) # TODO: add default packages + PACKAGES:=-hostapd-mini endef define Profile/CAS790/Description @@ -89,6 +96,7 @@ endef define Profile/CAS861 NAME:=Cellvision CAS-861 IP camera (Experimental) # TODO: add default packages + PACKAGES:=-hostapd-mini endef define Profile/CAS861/Description @@ -106,6 +114,7 @@ endef define Profile/NFS101U NAME:=Cellvision NFS-101U Network File Server (Experimental) + PACKAGES:=-hostapd-mini endef define Profile/NFS101U/Description @@ -114,6 +123,7 @@ endef define Profile/NFS101WU NAME:=Cellvision NFS-101WU Network File Server (Experimental) + PACKAGES:=-hostapd-mini endef define Profile/NFS101WU/Description diff --git a/target/linux/adm5120/router_le/profiles/Edimax.mk b/target/linux/adm5120/router_le/profiles/Edimax.mk index e4c427f57..70b26534e 100644 --- a/target/linux/adm5120/router_le/profiles/Edimax.mk +++ b/target/linux/adm5120/router_le/profiles/Edimax.mk @@ -7,6 +7,7 @@ define Profile/BR6104K NAME:=Edimax BR-6104K (Unofficial) + PACKAGES:=-hostapd-mini endef define Profile/BR6104K/Description @@ -15,7 +16,7 @@ endef define Profile/BR6104KP NAME:=Edimax BR-6104KP (Unofficial) - PACKAGES:=kmod-usb-core kmod-usb-adm5120 + PACKAGES:=-hostapd-mini kmod-usb-core kmod-usb-adm5120 endef define Profile/BR6104KP/Description @@ -24,6 +25,7 @@ endef define Profile/BR6104WG NAME:=Edimax BR-6104Wg (Unofficial, No WiFi) + PACKAGES:=-hostapd-mini endef define Profile/BR6104WG/Description @@ -32,6 +34,7 @@ endef define Profile/BR6114WG NAME:=Edimax BR-6114WG (Unofficial, No WiFi) + PACKAGES:=-hostapd-mini endef define Profile/BR6114WG/Description diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index fe32e86e4..4aae711e2 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -15,7 +15,7 @@ LINUX_VERSION:=2.6.26.8 include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += kmod-madwifi +DEFAULT_PACKAGES += hostapd-mini kmod-madwifi define Target/Description Build firmware images for Atheros AR71xx based boards diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile index 339940545..4d7c316ce 100644 --- a/target/linux/atheros/Makefile +++ b/target/linux/atheros/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -15,7 +15,7 @@ LINUX_VERSION:=2.6.26.8 include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += kmod-madwifi gpioctl +DEFAULT_PACKAGES += hostapd-mini kmod-madwifi gpioctl define Target/Description Build firmware images for Atheros SoC boards diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile index 113f5520d..ed31eb70d 100644 --- a/target/linux/au1000/Makefile +++ b/target/linux/au1000/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -14,7 +14,7 @@ FEATURES:=jffs2 usb pci LINUX_VERSION:=2.6.27.10 include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += yamonenv +DEFAULT_PACKAGES += hostapd-mini yamonenv define Target/Description Build firmware for AMD Alchemy 1500 boards diff --git a/target/linux/au1000/profiles/InternetBox.mk b/target/linux/au1000/profiles/InternetBox.mk index 642f0e21d..ee32ddb13 100644 --- a/target/linux/au1000/profiles/InternetBox.mk +++ b/target/linux/au1000/profiles/InternetBox.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ define Profile/InternetBox NAME:=T-Mobile "InternetBox" PACKAGES:=kmod-madwifi \ ldconfig ldd \ - hostapd hostapd-utils ip tc wpa-supplicant wpa-cli + ip tc wpa-supplicant wpa-cli endef define Profile/InternetBox/Description diff --git a/target/linux/au1000/profiles/MeshCube.mk b/target/linux/au1000/profiles/MeshCube.mk index 257f8d063..ddfae679d 100644 --- a/target/linux/au1000/profiles/MeshCube.mk +++ b/target/linux/au1000/profiles/MeshCube.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 OpenWrt.org +# Copyright (C) 2007-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,8 +9,7 @@ define Profile/MeshCube NAME:=MeshCube MTX-1 PACKAGES:=kmod-madwifi kmod-hostap kmod-hostap-pci kmod-net-prism54 \ kmod-usb-core kmod-usb-ohci kmod-usb-storage kmod-fs-ext3 kmod-fs-vfat \ - ldconfig ldd \ - hostap-utils hostapd hostapd-utils ip tc wpa-supplicant wpa-cli + ldconfig ldd hostap-utils ip tc wpa-supplicant wpa-cli endef define Profile/MeshCube/Description diff --git a/target/linux/brcm-2.4/profiles/120-Atheros.mk b/target/linux/brcm-2.4/profiles/120-Atheros.mk index d721abb13..c31f9a0db 100644 --- a/target/linux/brcm-2.4/profiles/120-Atheros.mk +++ b/target/linux/brcm-2.4/profiles/120-Atheros.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,7 +7,7 @@ define Profile/Atheros NAME:=Generic, Atheros WiFi - PACKAGES:=kmod-madwifi + PACKAGES:=hostapd-mini kmod-madwifi endef define Profile/Atheros/Description diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile index a3482364e..2481e7f72 100644 --- a/target/linux/brcm47xx/Makefile +++ b/target/linux/brcm47xx/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -14,7 +14,7 @@ FEATURES:=squashfs usb LINUX_VERSION:=2.6.25.20 include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += kmod-switch kmod-diag +DEFAULT_PACKAGES += hostapd-mini kmod-switch kmod-diag define Target/Description Build firmware images for Broadcom based routers diff --git a/target/linux/brcm47xx/profiles/110-None.mk b/target/linux/brcm47xx/profiles/110-None.mk index 2fcfacde9..513366dd7 100644 --- a/target/linux/brcm47xx/profiles/110-None.mk +++ b/target/linux/brcm47xx/profiles/110-None.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,7 +7,7 @@ define Profile/None NAME:=No WiFi - PACKAGES:= + PACKAGES:=-hostapd-mini endef define Profile/None/Description diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile index c8862f030..eecfd9bcf 100644 --- a/target/linux/brcm63xx/Makefile +++ b/target/linux/brcm63xx/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -14,6 +14,8 @@ LINUX_VERSION:=2.6.27.10 include $(INCLUDE_DIR)/target.mk +DEFAULT_PACKAGES += hostapd-mini + define Target/Description Build firmware images for Broadcom based xDSL/routers currently supports BCM6348 and BCM6358 based devices. diff --git a/target/linux/ifxmips/Makefile b/target/linux/ifxmips/Makefile index c05f709b5..e590eee09 100644 --- a/target/linux/ifxmips/Makefile +++ b/target/linux/ifxmips/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2007 OpenWrt.org +# +# Copyright (C) 2007-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -15,7 +15,7 @@ LINUX_VERSION:=2.6.26.8 #LINUX_VERSION:=2.6.27.10 include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES+=uboot-ifxmips +DEFAULT_PACKAGES+=uboot-ifxmips hostapd-mini define Target/Description Build firmware images for Infineon Mips Controllers diff --git a/target/linux/ifxmips/profiles/000-None.mk b/target/linux/ifxmips/profiles/000-None.mk index 5bfea2f7b..18c5c0cd9 100644 --- a/target/linux/ifxmips/profiles/000-None.mk +++ b/target/linux/ifxmips/profiles/000-None.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,7 +7,7 @@ define Profile/None NAME:=Generic, No WiFi - PACKAGES:= + PACKAGES:=-hostapd-mini endef define Profile/None/Description diff --git a/target/linux/ixp4xx/generic/profiles/200-NSLU2.mk b/target/linux/ixp4xx/generic/profiles/200-NSLU2.mk index 17e48a549..596710fa3 100644 --- a/target/linux/ixp4xx/generic/profiles/200-NSLU2.mk +++ b/target/linux/ixp4xx/generic/profiles/200-NSLU2.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,7 +7,7 @@ define Profile/NSLU2 NAME:=Linksys NSLU2 - PACKAGES:=kmod-scsi-core \ + PACKAGES:=-hostapd-mini kmod-scsi-core \ kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-storage \ kmod-fs-ext2 kmod-fs-ext3 endef diff --git a/target/linux/ixp4xx/generic/profiles/500-USR8200.mk b/target/linux/ixp4xx/generic/profiles/500-USR8200.mk index 9306f7958..2ef0784c8 100644 --- a/target/linux/ixp4xx/generic/profiles/500-USR8200.mk +++ b/target/linux/ixp4xx/generic/profiles/500-USR8200.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,7 +7,7 @@ define Profile/USR8200 NAME:=USRobotics USR8200 - PACKAGES:=kmod-scsi-core \ + PACKAGES:=-hostapd-mini kmod-scsi-core \ kmod-usb-core kmod-usb-uhci kmod-usb2 kmod-usb-storage \ kmod-fs-ext2 kmod-fs-ext3 \ kmod-ieee1394 kmod-ohci1394 kmod-sbp2 diff --git a/target/linux/ixp4xx/generic/target.mk b/target/linux/ixp4xx/generic/target.mk index 21fd5d469..e89cfc4f2 100644 --- a/target/linux/ixp4xx/generic/target.mk +++ b/target/linux/ixp4xx/generic/target.mk @@ -1,5 +1,7 @@ BOARDNAME:=Generic +DEFAULT_PACKAGES+= hostapd-mini + define Target/Description Build firmware images for ixp4xx based boards that boot from internal flash (e.g : Linksys NSLU2, ...) diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile index af5469e6f..e35b81c7f 100644 --- a/target/linux/rb532/Makefile +++ b/target/linux/rb532/Makefile @@ -14,6 +14,6 @@ FEATURES:=jffs2 pci tgz LINUX_VERSION:=2.6.24.7 include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += kmod-madwifi +DEFAULT_PACKAGES += hostapd-mini kmod-madwifi $(eval $(call BuildTarget)) diff --git a/target/linux/rdc/Makefile b/target/linux/rdc/Makefile index 86265c38a..55600f910 100644 --- a/target/linux/rdc/Makefile +++ b/target/linux/rdc/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -15,6 +15,8 @@ LINUX_VERSION:=2.6.24.7 include $(INCLUDE_DIR)/target.mk +DEFAULT_PACKAGES += hostapd-mini + define Target/Description Build firmware images for RDC321x based routers (e.g. Airlink101 AR525W, Linksys WRT54GR, Sitecom WL-153) -- 2.35.1