aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-12-16 18:42:43 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-12-16 18:42:43 +0000
commitb6bcb7ff2d460a7c8ed28c11ea391b309926ffe1 (patch)
treeaeac968b40d077c7331c996d36f43de4c9899f29
parent5237a500893980a4764cc2caab92f60c9f2ba9ea (diff)
downloadupstream-b6bcb7ff2d460a7c8ed28c11ea391b309926ffe1.tar.gz
upstream-b6bcb7ff2d460a7c8ed28c11ea391b309926ffe1.tar.bz2
upstream-b6bcb7ff2d460a7c8ed28c11ea391b309926ffe1.zip
hostapd: move old wifi setup scripts to hostapd-common-old
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 39103
-rw-r--r--package/kernel/hostap-driver/Makefile2
-rw-r--r--package/network/services/hostapd/Makefile17
2 files changed, 14 insertions, 5 deletions
diff --git a/package/kernel/hostap-driver/Makefile b/package/kernel/hostap-driver/Makefile
index 6a95c1e1d8..87c854c203 100644
--- a/package/kernel/hostap-driver/Makefile
+++ b/package/kernel/hostap-driver/Makefile
@@ -34,7 +34,7 @@ endef
define KernelPackage/hostap
$(call KernelPackage/hostap/Default)
TITLE:=Host AP support for Prism2/2.5/3
- DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-lib80211 +wireless-tools
+ DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-lib80211 +wireless-tools +hostapd-common-old
KCONFIG:=CONFIG_HOSTAP CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y
FILES:=$(LINUX_DIR)/drivers/net/wireless/hostap/hostap.ko
AUTOLOAD:=$(call AutoProbe,hostap)
diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
index 05a74bb3b8..f00472ac53 100644
--- a/package/network/services/hostapd/Makefile
+++ b/package/network/services/hostapd/Makefile
@@ -214,6 +214,12 @@ define Package/hostapd-common
CATEGORY:=Network
endef
+define Package/hostapd-common-old
+ TITLE:=hostapd/wpa_supplicant common support files (legacy drivers)
+ SECTION:=net
+ CATEGORY:=Network
+endef
+
ifneq ($(wildcard $(PKG_BUILD_DIR)/.config_*),$(subst .configured_,.config_,$(STAMP_CONFIGURED)))
define Build/Configure/rebuild
$(FIND) $(PKG_BUILD_DIR) -name \*.o -or -name \*.a | $(XARGS) rm -f
@@ -303,14 +309,10 @@ define Build/Compile
endef
define Install/hostapd
- $(INSTALL_DIR) $(1)/lib/wifi
- $(INSTALL_DATA) ./files/hostapd.sh $(1)/lib/wifi/hostapd.sh
$(INSTALL_DIR) $(1)/usr/sbin
endef
define Install/supplicant
- $(INSTALL_DIR) $(1)/lib/wifi
- $(INSTALL_DATA) ./files/wpa_supplicant.sh $(1)/lib/wifi/wpa_supplicant.sh
$(INSTALL_DIR) $(1)/usr/sbin
endef
@@ -319,6 +321,12 @@ define Package/hostapd-common/install
$(INSTALL_DATA) ./files/netifd.sh $(1)/lib/netifd/hostapd.sh
endef
+define Package/hostapd-common-old/install
+ $(INSTALL_DIR) $(1)/lib/wifi
+ $(INSTALL_DATA) ./files/hostapd.sh $(1)/lib/wifi/hostapd.sh
+ $(INSTALL_DATA) ./files/wpa_supplicant.sh $(1)/lib/wifi/wpa_supplicant.sh
+endef
+
define Package/hostapd/install
$(call Install/hostapd,$(1))
$(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd $(1)/usr/sbin/
@@ -366,3 +374,4 @@ $(eval $(call BuildPackage,wpa-supplicant-p2p))
$(eval $(call BuildPackage,wpa-cli))
$(eval $(call BuildPackage,hostapd-utils))
$(eval $(call BuildPackage,hostapd-common))
+$(eval $(call BuildPackage,hostapd-common-old))