Gitiles
Code Review Sign In
git01.mediatek.com / openwrt / feeds / mtk-openwrt-feeds / refs/heads/master / . / autobuild_mac80211_release / 0002-wifi7-hostapd-makefile-for-utils.patch
blob: 2e11490ad04ed9a22e78e83171319a3c11473a06 [file] [log] [blame]
developer24684862023-08-02 08:10:38 +0800[diff] [blame]1diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
developerb93158e2024-03-27 05:44:06 +0800[diff] [blame]2index 2b072bd..5c5c1af 100644
developer24684862023-08-02 08:10:38 +0800[diff] [blame]3--- a/package/network/services/hostapd/Makefile
4+++ b/package/network/services/hostapd/Makefile
developer93607dd2023-08-30 04:53:00 +0800[diff] [blame]5@@ -80,7 +80,7 @@ ifneq ($(CONFIG_DRIVER_11AX_SUPPORT),)
6 endif
7
developer869dfb12023-11-21 10:09:22 +0800[diff] [blame]8 CORE_DEPENDS = +ucode +libubus +libucode +ucode-mod-fs +ucode-mod-nl80211 +ucode-mod-rtnl +ucode-mod-ubus +ucode-mod-uloop +libblobmsg-json +libudebug
developer93607dd2023-08-30 04:53:00 +0800[diff] [blame]9-OPENSSL_DEPENDS = +PACKAGE_$(1):libopenssl +PACKAGE_$(1):libopenssl-legacy
10+OPENSSL_DEPENDS = +PACKAGE_$(1):libopenssl
11
12 DRIVER_MAKEOPTS= \
13 CONFIG_ACS=y CONFIG_DRIVER_NL80211=y \
developerb93158e2024-03-27 05:44:06 +0800[diff] [blame]14@@ -150,7 +150,7 @@ define Package/hostapd/Default
15 TITLE:=IEEE 802.1x Authenticator
16 URL:=http://hostap.epitest.fi/
17 DEPENDS:=$(DRV_DEPENDS) +hostapd-common $(CORE_DEPENDS)
18- EXTRA_DEPENDS:=hostapd-common (=$(PKG_VERSION)-r$(PKG_RELEASE))
19+ EXTRA_DEPENDS:=hostapd-common (=$(PKG_VERSION)-$(PKG_RELEASE))
20 USERID:=network=101:network=101
21 PROVIDES:=hostapd
22 CONFLICTS:=$(HOSTAPD_PROVIDERS)
23@@ -255,7 +255,7 @@ define Package/wpad/Default
24 SUBMENU:=WirelessAPD
25 TITLE:=IEEE 802.1x Auth/Supplicant
26 DEPENDS:=$(DRV_DEPENDS) +hostapd-common $(CORE_DEPENDS)
27- EXTRA_DEPENDS:=hostapd-common (=$(PKG_VERSION)-r$(PKG_RELEASE))
28+ EXTRA_DEPENDS:=hostapd-common (=$(PKG_VERSION)-$(PKG_RELEASE))
29 USERID:=network=101:network=101
30 URL:=http://hostap.epitest.fi/
31 PROVIDES:=hostapd wpa-supplicant
32@@ -400,7 +400,7 @@ define Package/wpa-supplicant/Default
33 TITLE:=WPA Supplicant
34 URL:=http://hostap.epitest.fi/wpa_supplicant/
35 DEPENDS:=$(DRV_DEPENDS) +hostapd-common $(CORE_DEPENDS)
36- EXTRA_DEPENDS:=hostapd-common (=$(PKG_VERSION)-r$(PKG_RELEASE))
37+ EXTRA_DEPENDS:=hostapd-common (=$(PKG_VERSION)-$(PKG_RELEASE))
38 USERID:=network=101:network=101
39 PROVIDES:=wpa-supplicant
40 CONFLICTS:=$(SUPPLICANT_PROVIDERS)
developer93607dd2023-08-30 04:53:00 +0800[diff] [blame]41@@ -498,7 +498,6 @@ define Package/hostapd-utils
developer20d67712022-03-02 14:09:32 +0800[diff] [blame]42 TITLE:=IEEE 802.1x Authenticator (utils)
43 URL:=http://hostap.epitest.fi/
44 DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(HOSTAPD_PROVIDERS),PACKAGE_$(pkg)))
45- VARIANT:=*
46 endef
47
48 define Package/hostapd-utils/description
developer93607dd2023-08-30 04:53:00 +0800[diff] [blame]49@@ -512,7 +511,6 @@ define Package/wpa-cli
developer20d67712022-03-02 14:09:32 +0800[diff] [blame]50 SUBMENU:=WirelessAPD
51 DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(SUPPLICANT_PROVIDERS),PACKAGE_$(pkg)))
52 TITLE:=WPA Supplicant command line control utility
53- VARIANT:=*
54 endef
55
56 define Package/eapol-test/Default
developerb93158e2024-03-27 05:44:06 +0800[diff] [blame]57@@ -716,6 +714,9 @@ define Package/hostapd-common/install
58 $(INSTALL_BIN) ./files/wps-hotplug.sh $(1)/etc/rc.button/wps
59 $(INSTALL_DATA) ./files/wpad_acl.json $(1)/usr/share/acl.d
developer20d67712022-03-02 14:09:32 +0800[diff] [blame]60 $(INSTALL_DATA) ./files/wpad.json $(1)/etc/capabilities
developer20d67712022-03-02 14:09:32 +0800[diff] [blame]61+ [ ! -d $(STAGING_DIR)/usr/include/wpa_ctrl.h ] && $(CP) -f $(PKG_BUILD_DIR)/src/common/wpa_ctrl.h $(STAGING_DIR)/usr/include
62+ [ ! -d $(STAGING_DIR)/usr/lib/wpa_ctrl.o ] && $(CP) -f $(PKG_BUILD_DIR)/build/hostapd/src/common/wpa_ctrl.o $(STAGING_DIR)/usr/lib
63+ [ ! -d $(STAGING_DIR)/usr/lib/os_unix.o ] && $(CP) -f $(PKG_BUILD_DIR)/build/hostapd/src/utils/os_unix.o $(STAGING_DIR)/usr/lib
64 endef
65
66 define Package/hostapd/install
developerb93158e2024-03-27 05:44:06 +0800[diff] [blame]67