OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 5... Line 5...
5 # 5 #
Line 6... Line 6...
6   6  
Line 7... Line 7...
7 include $(TOPDIR)/rules.mk 7 include $(TOPDIR)/rules.mk
8   8  
Line 9... Line 9...
9 PKG_NAME:=hostapd 9 PKG_NAME:=hostapd
10 PKG_RELEASE:=2 10 PKG_RELEASE:=5
11   11  
12 PKG_SOURCE_URL:=http://w1.fi/hostap.git 12 PKG_SOURCE_URL:=http://w1.fi/hostap.git
13 PKG_SOURCE_PROTO:=git 13 PKG_SOURCE_PROTO:=git
Line 14... Line 14...
14 PKG_SOURCE_DATE:=2018-12-02 14 PKG_SOURCE_DATE:=2018-04-09
15 PKG_SOURCE_VERSION:=c2c6c01bb8b6fafc2074b46a53c4eab2c145ac6f 15 PKG_SOURCE_VERSION:=fa617ee6a0b2d39e6372c93ef9437caa3bd9065a
16 PKG_MIRROR_HASH:=d381123fe42059b553d96122a03c35e7d1709153c3aaf10fa4e74fe59be243dd 16 PKG_MIRROR_HASH:=5e6f20153c3405ac905f89fea8a614a57e9ba19583b2de2777179381a74aa7b1
Line 24... Line 24...
24 PKG_CONFIG_DEPENDS:= \ 24 PKG_CONFIG_DEPENDS:= \
25 CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK \ 25 CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK \
26 CONFIG_PACKAGE_kmod-ath9k \ 26 CONFIG_PACKAGE_kmod-ath9k \
27 CONFIG_PACKAGE_kmod-cfg80211 \ 27 CONFIG_PACKAGE_kmod-cfg80211 \
28 CONFIG_PACKAGE_hostapd \ 28 CONFIG_PACKAGE_hostapd \
29 CONFIG_PACKAGE_hostapd-basic \ -  
30 CONFIG_PACKAGE_hostapd-mini \ 29 CONFIG_PACKAGE_hostapd-mini \
31 CONFIG_WPA_RFKILL_SUPPORT \ 30 CONFIG_WPA_RFKILL_SUPPORT \
32 CONFIG_DRIVER_WEXT_SUPPORT \ 31 CONFIG_DRIVER_WEXT_SUPPORT \
33 CONFIG_DRIVER_11N_SUPPORT \ 32 CONFIG_DRIVER_11N_SUPPORT \
34 CONFIG_DRIVER_11AC_SUPPORT \ 33 CONFIG_DRIVER_11AC_SUPPORT
35   -  
36 EAPOL_TEST_PROVIDERS:=eapol-test eapol-test-openssl eapol-test-wolfssl -  
37   -  
38 SUPPLICANT_PROVIDERS:= -  
39 HOSTAPD_PROVIDERS:= -  
Line 40... Line 34...
40   34  
41 LOCAL_TYPE=$(strip \ 35 LOCAL_TYPE=$(strip \
42 $(if $(findstring wpad,$(BUILD_VARIANT)),wpad, \ 36 $(if $(findstring wpad,$(BUILD_VARIANT)),wpad, \
43 $(if $(findstring supplicant,$(BUILD_VARIANT)),supplicant, \ 37 $(if $(findstring supplicant,$(BUILD_VARIANT)),supplicant, \
44 hostapd \ 38 hostapd \
45 ))) -  
46   -  
47 LOCAL_AND_LIB_VARIANT=$(patsubst hostapd-%,%,\ -  
48 $(patsubst wpad-%,%,\ -  
49 $(patsubst supplicant-%,%,\ -  
50 $(BUILD_VARIANT)\ -  
51 ))) -  
52   39 )))
53 LOCAL_VARIANT=$(patsubst %-internal,%,\ -  
54 $(patsubst %-openssl,%,\ -  
55 $(patsubst %-wolfssl,%,\ -  
56 $(LOCAL_AND_LIB_VARIANT)\ -  
57 ))) -  
58   -  
59 SSL_VARIANT=$(strip \ -  
60 $(if $(findstring openssl,$(LOCAL_AND_LIB_VARIANT)),openssl,\ -  
61 $(if $(findstring wolfssl,$(LOCAL_AND_LIB_VARIANT)),wolfssl,\ -  
62 internal\ -  
63 ))) -  
64   40 LOCAL_VARIANT=$(patsubst wpad-%,%,$(patsubst supplicant-%,%,$(BUILD_VARIANT)))
65 CONFIG_VARIANT:=$(LOCAL_VARIANT) 41 CONFIG_VARIANT:=$(LOCAL_VARIANT)
66 ifeq ($(LOCAL_VARIANT),mesh) 42 ifeq ($(LOCAL_VARIANT),mesh)
67 CONFIG_VARIANT:=full 43 CONFIG_VARIANT:=full
Line -... Line 44...
-   44 endif
-   45  
-   46 ifneq ($(LOCAL_TYPE),hostapd)
-   47 ifeq ($(LOCAL_VARIANT),full)
-   48 PKG_CONFIG_DEPENDS += \
-   49 CONFIG_WPA_SUPPLICANT_INTERNAL \
-   50 CONFIG_WPA_SUPPLICANT_OPENSSL
-   51 endif
68 endif 52 endif
Line 69... Line 53...
69   53  
Line 70... Line 54...
70 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) 54 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
Line 71... Line -...
71   -  
72 include $(INCLUDE_DIR)/package.mk 55  
73   56 include $(INCLUDE_DIR)/package.mk
74 STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(CONFIG_WPA_MSG_MIN_PRIORITY) 57  
Line 75... Line 58...
75   58 STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(CONFIG_WPA_MSG_MIN_PRIORITY)
Line 87... Line 70...
87 CONFIG_DRIVER_NL80211=$(CONFIG_PACKAGE_kmod-cfg80211) \ 70 CONFIG_DRIVER_NL80211=$(CONFIG_PACKAGE_kmod-cfg80211) \
88 CONFIG_IEEE80211N=$(HOSTAPD_IEEE80211N) \ 71 CONFIG_IEEE80211N=$(HOSTAPD_IEEE80211N) \
89 CONFIG_IEEE80211AC=$(HOSTAPD_IEEE80211AC) \ 72 CONFIG_IEEE80211AC=$(HOSTAPD_IEEE80211AC) \
90 CONFIG_DRIVER_WEXT=$(CONFIG_DRIVER_WEXT_SUPPORT) \ 73 CONFIG_DRIVER_WEXT=$(CONFIG_DRIVER_WEXT_SUPPORT) \
Line 91... Line -...
91   -  
92 space := -  
93 space += -  
94   74  
95 ifeq ($(LOCAL_VARIANT),full) 75 ifeq ($(LOCAL_VARIANT),full)
96 DRIVER_MAKEOPTS += CONFIG_IEEE80211W=$(CONFIG_DRIVER_11W_SUPPORT) 76 DRIVER_MAKEOPTS += CONFIG_IEEE80211W=$(CONFIG_DRIVER_11W_SUPPORT)
Line 97... Line -...
97 endif -  
98   -  
99 ifeq ($(LOCAL_VARIANT),basic) -  
100 DRIVER_MAKEOPTS += CONFIG_IEEE80211W=$(CONFIG_DRIVER_11W_SUPPORT) -  
101 endif -  
102   -  
103 ifeq ($(LOCAL_VARIANT),full) -  
104 ifeq ($(SSL_VARIANT),openssl) -  
105 DRIVER_MAKEOPTS += CONFIG_TLS=openssl CONFIG_SAE=y CONFIG_OWE=y CONFIG_SUITEB192=y -  
106 TARGET_LDFLAGS += -lcrypto -lssl -  
107 endif -  
108 ifeq ($(SSL_VARIANT),wolfssl) -  
109 DRIVER_MAKEOPTS += CONFIG_TLS=wolfssl CONFIG_WPS_NFC=1 CONFIG_SAE=y CONFIG_OWE=y CONFIG_SUITEB192=y -  
110 TARGET_LDFLAGS += -lwolfssl -  
111 endif -  
112 endif 77 endif
113   78  
114 ifneq ($(LOCAL_TYPE),hostapd) 79 ifneq ($(LOCAL_TYPE),hostapd)
115 ifeq ($(LOCAL_VARIANT),mesh) 80 ifdef CONFIG_WPA_SUPPLICANT_OPENSSL
116 ifeq ($(SSL_VARIANT),openssl) 81 ifeq ($(LOCAL_VARIANT),full)
117 DRIVER_MAKEOPTS += CONFIG_TLS=openssl CONFIG_AP=y CONFIG_SAE=y CONFIG_MESH=y 82 DRIVER_MAKEOPTS += CONFIG_TLS=openssl
118 TARGET_LDFLAGS += -lcrypto -lssl -  
119 endif -  
120 ifeq ($(SSL_VARIANT),wolfssl) -  
121 DRIVER_MAKEOPTS += CONFIG_TLS=wolfssl CONFIG_WPS_NFC=1 CONFIG_AP=y CONFIG_SAE=y CONFIG_MESH=y -  
122 TARGET_LDFLAGS += -lwolfssl 83 TARGET_LDFLAGS += -lcrypto -lssl
-   84 endif
-   85 endif
-   86 ifeq ($(LOCAL_VARIANT),mesh)
123 endif 87 DRIVER_MAKEOPTS += CONFIG_TLS=openssl CONFIG_AP=y CONFIG_SAE=y CONFIG_MESH=y
124 endif 88 TARGET_LDFLAGS += -lcrypto -lssl
125   89 endif
126 ifdef CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK 90 ifdef CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
127 TARGET_CFLAGS += -DNO_TIMESTAMP_CHECK 91 TARGET_CFLAGS += -DNO_TIMESTAMP_CHECK
128 endif 92 endif
Line 138... Line 102...
138 TARGET_LDFLAGS_C += -lrt 102 TARGET_LDFLAGS_C += -lrt
139 endif 103 endif
Line 140... Line 104...
140   104  
Line 141... Line -...
141 DRV_DEPENDS:=+PACKAGE_kmod-cfg80211:libnl-tiny -  
142   105 DRV_DEPENDS:=+PACKAGE_kmod-cfg80211:libnl-tiny
143   106  
144 define Package/hostapd/Default 107 define Package/hostapd/Default
145 SECTION:=net 108 SECTION:=net
146 CATEGORY:=Network 109 CATEGORY:=Network
147 TITLE:=IEEE 802.1x Authenticator 110 TITLE:=IEEE 802.1x Authenticator
148 URL:=http://hostap.epitest.fi/ -  
149 DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus -  
150 PROVIDES:=hostapd -  
151 CONFLICTS:=$(HOSTAPD_PROVIDERS) 111 URL:=http://hostap.epitest.fi/
Line 152... Line 112...
152 HOSTAPD_PROVIDERS+=$(1) 112 DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus
153 endef 113 endef
154   114  
155 define Package/hostapd 115 define Package/hostapd
-   116 $(call Package/hostapd/Default)
156 $(call Package/hostapd/Default,$(1)) 117 TITLE+= (full)
Line 157... Line 118...
157 TITLE+= (full) 118 VARIANT:=full
158 VARIANT:=full-internal 119 CONFLICTS:=wpad wpad-mini wpad-mesh
159 endef 120 endef
160   121  
Line 161... Line -...
161 define Package/hostapd/description -  
162 This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS -  
163 Authenticator. -  
164 endef -  
165   -  
166 define Package/hostapd-openssl -  
167 $(call Package/hostapd/Default,$(1)) -  
168 TITLE+= (full) -  
169 VARIANT:=full-openssl -  
170 DEPENDS+=+libopenssl -  
171 endef -  
172   -  
173 Package/hostapd-openssl/description = $(Package/hostapd/description) -  
174   -  
175 define Package/hostapd-wolfssl -  
176 $(call Package/hostapd/Default,$(1)) -  
177 TITLE+= (full) -  
178 VARIANT:=full-wolfssl -  
179 DEPENDS+=+libwolfssl -  
180 endef -  
181   -  
182 Package/hostapd-wolfssl/description = $(Package/hostapd/description) -  
183   -  
184 define Package/hostapd-basic -  
185 $(call Package/hostapd/Default,$(1)) -  
186 TITLE+= (WPA-PSK, 11r and 11w) -  
187 VARIANT:=basic -  
188 endef -  
189   122 define Package/hostapd/description
190 define Package/hostapd-basic/description 123 This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS
191 This package contains a basic IEEE 802.1x/WPA Authenticator with WPA-PSK, 802.11r and 802.11w support. 124 Authenticator.
192 endef 125 endef
-   126  
193   127 define Package/hostapd-mini
Line 194... Line 128...
194 define Package/hostapd-mini 128 $(call Package/hostapd/Default)
195 $(call Package/hostapd/Default,$(1)) 129 TITLE+= (WPA-PSK only)
196 TITLE+= (WPA-PSK only) 130 VARIANT:=mini
Line -... Line 131...
-   131 CONFLICTS:=wpad wpad-mini wpad-mesh
-   132 endef
-   133  
-   134 define Package/hostapd-mini/description
-   135 This package contains a minimal IEEE 802.1x/WPA Authenticator (WPA-PSK only).
-   136 endef
-   137  
-   138 define Package/hostapd-utils
-   139 $(call Package/hostapd/Default)
-   140 TITLE+= (utils)
Line 197... Line 141...
197 VARIANT:=mini 141 DEPENDS:=@PACKAGE_hostapd||PACKAGE_hostapd-mini||PACKAGE_wpad||PACKAGE_wpad-mesh||PACKAGE_wpad-mini
198 endef 142 endef
199   143  
200 define Package/hostapd-mini/description 144 define Package/hostapd-utils/description
201 This package contains a minimal IEEE 802.1x/WPA Authenticator (WPA-PSK only). 145 This package contains a command line utility to control the
202 endef 146 IEEE 802.1x/WPA/EAP/RADIUS Authenticator.
203   -  
204   -  
205 define Package/wpad/Default -  
206 SECTION:=net -  
207 CATEGORY:=Network 147 endef
Line 208... Line 148...
208 TITLE:=IEEE 802.1x Authenticator/Supplicant 148  
209 DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus 149 define Package/wpad/Default
210 URL:=http://hostap.epitest.fi/ 150 SECTION:=net
-   151 CATEGORY:=Network
211 PROVIDES:=hostapd wpa-supplicant 152 TITLE:=IEEE 802.1x Authenticator/Supplicant
212 CONFLICTS:=$(HOSTAPD_PROVIDERS) $(SUPPLICANT_PROVIDERS) 153 DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus
Line 213... Line 154...
213 HOSTAPD_PROVIDERS+=$(1) 154 URL:=http://hostap.epitest.fi/
214 SUPPLICANT_PROVIDERS+=$(1) 155 endef
215 endef 156  
216   157 define Package/wpad
Line 217... Line -...
217 define Package/wpad -  
218 $(call Package/wpad/Default,$(1)) -  
219 TITLE+= (full) -  
220 VARIANT:=wpad-full-internal -  
221 endef -  
222   -  
223 define Package/wpad/description -  
224 This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS -  
225 Authenticator and Supplicant -  
226 endef -  
227   -  
228 define Package/wpad-openssl -  
229 $(call Package/wpad/Default,$(1)) -  
230 TITLE+= (full) -  
231 VARIANT:=wpad-full-openssl -  
232 DEPENDS+=+libopenssl -  
233 endef -  
234   -  
235 Package/wpad-openssl/description = $(Package/wpad/description) -  
236   -  
237 define Package/wpad-wolfssl -  
238 $(call Package/wpad/Default,$(1)) -  
239 TITLE+= (full) -  
240 VARIANT:=wpad-full-wolfssl -  
241 DEPENDS+=+libwolfssl -  
242 endef -  
243   -  
244 Package/wpad-wolfssl/description = $(Package/wpad/description) -  
245   158 $(call Package/wpad/Default)
246 define Package/wpad-basic 159 TITLE+= (full)
247 $(call Package/wpad/Default,$(1)) 160 DEPENDS+=+WPA_SUPPLICANT_OPENSSL:libopenssl
248 TITLE+= (WPA-PSK, 11r and 11w) 161 VARIANT:=wpad-full
249 VARIANT:=wpad-basic 162 endef
Line 250... Line 163...
250 endef 163  
251   164 define Package/wpad/description
252 define Package/wpad-basic/description 165 This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS
Line 253... Line 166...
253 This package contains a basic IEEE 802.1x/WPA Authenticator and Supplicant with WPA-PSK, 802.11r and 802.11w support. 166 Authenticator and Supplicant
254 endef 167 endef
255   168  
256 define Package/wpad-mini 169 define Package/wpad-mini
257 $(call Package/wpad/Default,$(1)) 170 $(call Package/wpad/Default)
258 TITLE+= (WPA-PSK only) 171 TITLE+= (WPA-PSK only)
Line 259... Line 172...
259 VARIANT:=wpad-mini 172 VARIANT:=wpad-mini
260 endef 173 endef
261   174  
Line 262... Line -...
262 define Package/wpad-mini/description -  
263 This package contains a minimal IEEE 802.1x/WPA Authenticator and Supplicant (WPA-PSK only). -  
264 endef -  
265   -  
266 define Package/wpad-mesh -  
267 $(call Package/wpad/Default,$(1)) -  
268 TITLE+= (with 802.11s mesh and SAE support) -  
269 DEPENDS+=@PACKAGE_kmod-cfg80211 @(!TARGET_uml||BROKEN) -  
270 PROVIDES+=wpa-supplicant-mesh wpad-mesh -  
271 endef -  
272   -  
273 define Package/wpad-mesh/description -  
274 This package contains a minimal IEEE 802.1x/WPA Authenticator and Supplicant (with 802.11s mesh and SAE support). -  
275 endef -  
276   -  
277 define Package/wpad-mesh-openssl -  
278 $(call Package/wpad-mesh,$(1)) -  
279 DEPENDS+=+libopenssl 175 define Package/wpad-mini/description
280 VARIANT:=wpad-mesh-openssl 176 This package contains a minimal IEEE 802.1x/WPA Authenticator and Supplicant (WPA-PSK only).
281 endef 177 endef
282   178  
283 Package/wpad-mesh-openssl/description = $(Package/wpad-mesh/description) 179 define Package/wpad-mesh
284   180 $(call Package/wpad/Default)
285 define Package/wpad-mesh-wolfssl -  
286 $(call Package/wpad-mesh,$(1)) 181 TITLE+= (with 802.11s mesh and SAE support)
287 DEPENDS+=+libwolfssl -  
288 VARIANT:=wpad-mesh-wolfssl -  
289 endef -  
290   -  
291 Package/wpad-mesh-wolfssl/description = $(Package/wpad-mesh/description) -  
292   -  
293   -  
294 define Package/wpa-supplicant/Default -  
295 SECTION:=net -  
296 CATEGORY:=Network -  
297 TITLE:=WPA Supplicant -  
298 URL:=http://hostap.epitest.fi/wpa_supplicant/ -  
299 DEPENDS:=$(DRV_DEPENDS) +hostapd-common +libubus -  
300 PROVIDES:=wpa-supplicant -  
301 CONFLICTS:=$(SUPPLICANT_PROVIDERS) -  
302 SUPPLICANT_PROVIDERS+=$(1) -  
303 endef 182 DEPENDS:=$(DRV_DEPENDS) +libubus +PACKAGE_wpad-mesh:libopenssl @PACKAGE_kmod-cfg80211 @(!TARGET_uml||BROKEN)
304   -  
305 define Package/wpa-supplicant 183 VARIANT:=wpad-mesh
Line 306... Line 184...
306 $(call Package/wpa-supplicant/Default,$(1)) 184 endef
307 VARIANT:=supplicant-full-internal 185  
308 endef 186 define Package/wpad-mesh/description
Line 309... Line 187...
309   187 This package contains a minimal IEEE 802.1x/WPA Authenticator and Supplicant (with 802.11s mesh and SAE support).
310 define Package/wpa-supplicant-openssl 188 endef
311 $(call Package/wpa-supplicant/Default,$(1)) 189  
312 VARIANT:=supplicant-full-openssl 190 define Package/wpa-supplicant
313 DEPENDS+=+libopenssl 191 SECTION:=net
314 endef -  
315   -  
316 define Package/wpa-supplicant-wolfssl -  
317 $(call Package/wpa-supplicant/Default,$(1)) -  
318 VARIANT:=supplicant-full-wolfssl -  
319 DEPENDS+=+libwolfssl -  
320 endef 192 CATEGORY:=Network
321   193 TITLE:=WPA Supplicant
Line 322... Line 194...
322 define Package/wpa-supplicant/config 194 URL:=http://hostap.epitest.fi/wpa_supplicant/
323 source "$(SOURCE)/Config.in" 195 DEPENDS:=$(DRV_DEPENDS) +WPA_SUPPLICANT_OPENSSL:libopenssl
324 endef 196 CONFLICTS:=wpad wpad-mini wpad-mesh
325   -  
326 define Package/wpa-supplicant-p2p -  
327 $(call Package/wpa-supplicant/Default,$(1)) -  
328 TITLE+= (with Wi-Fi P2P support) -  
329 DEPENDS+=@PACKAGE_kmod-cfg80211 197 VARIANT:=supplicant-full
330 VARIANT:=supplicant-p2p-internal 198 endef
331 endef -  
332   -  
333 define Package/wpa-supplicant-mesh/Default -  
334 $(call Package/wpa-supplicant/Default,$(1)) -  
335 TITLE+= (with 802.11s and SAE) -  
336 DEPENDS+=@PACKAGE_kmod-cfg80211 @(!TARGET_uml||BROKEN) -  
337 PROVIDES+=wpa-supplicant-mesh 199  
338 endef 200 define Package/wpa-supplicant/config
Line 339... Line 201...
339   201 source "$(SOURCE)/Config.in"
340 define Package/wpa-supplicant-mesh-openssl 202 endef
341 $(call Package/wpa-supplicant-mesh/Default,$(1)) 203  
-   204 define Package/wpa-supplicant-p2p
-   205 $(Package/wpa-supplicant)
342 VARIANT:=supplicant-mesh-openssl 206 TITLE:=WPA Supplicant (with Wi-Fi P2P support)
343 DEPENDS+=+libopenssl 207 DEPENDS:=$(DRV_DEPENDS) @PACKAGE_kmod-cfg80211
Line 344... Line -...
344 endef -  
345   -  
346 define Package/wpa-supplicant-mesh-wolfssl -  
347 $(call Package/wpa-supplicant-mesh/Default,$(1)) -  
348 VARIANT:=supplicant-mesh-wolfssl -  
349 DEPENDS+=+libwolfssl -  
350 endef -  
351   -  
352 define Package/wpa-supplicant-basic -  
353 $(call Package/wpa-supplicant/Default,$(1)) -  
354 TITLE+= (with 11r and 11w) -  
355 VARIANT:=supplicant-basic -  
356 endef -  
357   -  
358 define Package/wpa-supplicant-mini -  
359 $(call Package/wpa-supplicant/Default,$(1)) -  
360 TITLE+= (minimal version) -  
361 VARIANT:=supplicant-mini -  
362 endef -  
363   -  
364   208 CONFLICTS:=wpad wpad-mini wpad-mesh
365 define Package/hostapd-common 209 VARIANT:=supplicant-p2p
366 TITLE:=hostapd/wpa_supplicant common support files 210 endef
367 SECTION:=net 211  
368 CATEGORY:=Network 212 define Package/wpa-supplicant-mesh
369 endef 213 $(Package/wpa-supplicant)
Line 370... Line 214...
370   214 TITLE:=WPA Supplicant (with 802.11s and SAE)
371 define Package/hostapd-utils -  
372 SECTION:=net -  
373 CATEGORY:=Network -  
374 TITLE:=IEEE 802.1x Authenticator (utils) -  
375 URL:=http://hostap.epitest.fi/ -  
376 DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(HOSTAPD_PROVIDERS),PACKAGE_$(pkg))) -  
377 endef -  
378   -  
379 define Package/hostapd-utils/description 215 DEPENDS:=$(DRV_DEPENDS) +PACKAGE_wpa-supplicant-mesh:libopenssl @PACKAGE_kmod-cfg80211 @(!TARGET_uml||BROKEN)
380 This package contains a command line utility to control the 216 CONFLICTS:=wpad wpad-mesh wpad-mesh
381 IEEE 802.1x/WPA/EAP/RADIUS Authenticator. 217 VARIANT:=supplicant-mesh
382 endef -  
383   -  
384 define Package/wpa-cli -  
385 SECTION:=net -  
386 CATEGORY:=Network 218 endef
Line 387... Line 219...
387 DEPENDS:=@$(subst $(space),||,$(foreach pkg,$(SUPPLICANT_PROVIDERS),PACKAGE_$(pkg))) 219  
388 TITLE:=WPA Supplicant command line control utility 220 define Package/wpa-supplicant-mini
389 endef 221 $(Package/wpa-supplicant)
390   222 TITLE:=WPA Supplicant (minimal version)
391 define Package/eapol-test 223 DEPENDS:=$(DRV_DEPENDS)
392 TITLE:=802.1x authentication test utility -  
393 SECTION:=net 224 CONFLICTS:=wpad wpad-mini wpad-mesh
394 CATEGORY:=Network -  
395 VARIANT:=supplicant-full-internal 225 VARIANT:=supplicant-mini
Line 396... Line 226...
396 DEPENDS:=$(DRV_DEPENDS) +libubus 226 endef
397 endef 227  
Line 441... Line 271...
441 $(TARGET_CPPFLAGS) \ 271 $(TARGET_CPPFLAGS) \
442 -DCONFIG_LIBNL20 \ 272 -DCONFIG_LIBNL20 \
443 -D_GNU_SOURCE \ 273 -D_GNU_SOURCE \
444 $(if $(CONFIG_WPA_MSG_MIN_PRIORITY),-DCONFIG_MSG_MIN_PRIORITY=$(CONFIG_WPA_MSG_MIN_PRIORITY)) 274 $(if $(CONFIG_WPA_MSG_MIN_PRIORITY),-DCONFIG_MSG_MIN_PRIORITY=$(CONFIG_WPA_MSG_MIN_PRIORITY))
Line 445... Line 275...
445   275  
446 TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto 276 TARGET_CFLAGS += -ffunction-sections -fdata-sections
-   277 TARGET_LDFLAGS += -Wl,--gc-sections
-   278 ifeq ($(findstring supplicant,$(BUILD_VARIANT)),)
-   279 TARGET_LDFLAGS += -lubox -lubus
Line 447... Line 280...
447 TARGET_LDFLAGS += -Wl,--gc-sections -flto=jobserver -fuse-linker-plugin -lubox -lubus 280 endif
448   281  
449 ifdef CONFIG_PACKAGE_kmod-cfg80211 282 ifdef CONFIG_PACKAGE_kmod-cfg80211
Line 455... Line 288...
455 $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(1) \ 288 $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(1) \
456 $(TARGET_CONFIGURE_OPTS) \ 289 $(TARGET_CONFIGURE_OPTS) \
457 $(DRIVER_MAKEOPTS) \ 290 $(DRIVER_MAKEOPTS) \
458 LIBS="$(TARGET_LDFLAGS)" \ 291 LIBS="$(TARGET_LDFLAGS)" \
459 LIBS_c="$(TARGET_LDFLAGS_C)" \ 292 LIBS_c="$(TARGET_LDFLAGS_C)" \
460 AR="$(TARGET_CROSS)gcc-ar" \ -  
461 BCHECK= \ 293 BCHECK= \
462 $(2) 294 $(2)
463 endef 295 endef
Line 464... Line 296...
464   296  
Line 477... Line 309...
477 +$(call Build/RunMake,wpa_supplicant, \ 309 +$(call Build/RunMake,wpa_supplicant, \
478 CFLAGS="$$$$(cat $(PKG_BUILD_DIR)/.cflags)" \ 310 CFLAGS="$$$$(cat $(PKG_BUILD_DIR)/.cflags)" \
479 MULTICALL=1 \ 311 MULTICALL=1 \
480 wpa_cli wpa_supplicant_multi.a \ 312 wpa_cli wpa_supplicant_multi.a \
481 ) 313 )
482 +export MAKEFLAGS="$(MAKE_JOBSERVER)"; $(TARGET_CC) -o $(PKG_BUILD_DIR)/wpad \ 314 $(TARGET_CC) -o $(PKG_BUILD_DIR)/wpad \
483 $(TARGET_CFLAGS) \ 315 $(TARGET_CFLAGS) \
484 ./files/multicall.c \ 316 ./files/multicall.c \
485 $(PKG_BUILD_DIR)/hostapd/hostapd_multi.a \ 317 $(PKG_BUILD_DIR)/hostapd/hostapd_multi.a \
486 $(PKG_BUILD_DIR)/wpa_supplicant/wpa_supplicant_multi.a \ 318 $(PKG_BUILD_DIR)/wpa_supplicant/wpa_supplicant_multi.a \
487 $(TARGET_LDFLAGS) 319 $(TARGET_LDFLAGS)
Line 497... Line 329...
497 +$(call Build/RunMake,wpa_supplicant, \ 329 +$(call Build/RunMake,wpa_supplicant, \
498 wpa_cli wpa_supplicant \ 330 wpa_cli wpa_supplicant \
499 ) 331 )
500 endef 332 endef
Line 501... Line -...
501   -  
502 define Build/Compile/supplicant-full-internal -  
503 +$(call Build/RunMake,wpa_supplicant, \ -  
504 eapol_test \ -  
505 ) -  
506 endef -  
507   333  
508 define Build/Compile/supplicant-full-openssl -  
509 +$(call Build/RunMake,wpa_supplicant, \ -  
510 eapol_test \ -  
511 ) -  
512 endef -  
513   -  
514 define Build/Compile/supplicant-full-wolfssl 334 define Build/Compile/supplicant-full
515 +$(call Build/RunMake,wpa_supplicant, \ 335 +$(call Build/RunMake,wpa_supplicant, \
516 eapol_test \ 336 eapol_test \
517 ) 337 )
Line 529... Line 349...
529 define Install/supplicant 349 define Install/supplicant
530 $(INSTALL_DIR) $(1)/usr/sbin 350 $(INSTALL_DIR) $(1)/usr/sbin
531 endef 351 endef
Line 532... Line 352...
532   352  
533 define Package/hostapd-common/install 353 define Package/hostapd-common/install
534 $(INSTALL_DIR) $(1)/lib/netifd $(1)/etc/rc.button 354 $(INSTALL_DIR) $(1)/lib/netifd
535 $(INSTALL_DATA) ./files/hostapd.sh $(1)/lib/netifd/hostapd.sh -  
536 $(INSTALL_BIN) ./files/wps-hotplug.sh $(1)/etc/rc.button/wps 355 $(INSTALL_DATA) ./files/hostapd.sh $(1)/lib/netifd/hostapd.sh
Line 537... Line 356...
537 endef 356 endef
538   357  
539 define Package/hostapd/install 358 define Package/hostapd/install
540 $(call Install/hostapd,$(1)) 359 $(call Install/hostapd,$(1))
541 $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd $(1)/usr/sbin/ -  
542 endef 360 $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd $(1)/usr/sbin/
543 Package/hostapd-basic/install = $(Package/hostapd/install) -  
544 Package/hostapd-mini/install = $(Package/hostapd/install) -  
Line 545... Line 361...
545 Package/hostapd-openssl/install = $(Package/hostapd/install) 361 endef
546 Package/hostapd-wolfssl/install = $(Package/hostapd/install) 362 Package/hostapd-mini/install = $(Package/hostapd/install)
547   363  
548 ifneq ($(LOCAL_TYPE),supplicant) 364 ifneq ($(LOCAL_TYPE),supplicant)
-   365 define Package/hostapd-utils/install
549 define Package/hostapd-utils/install 366 $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/rc.button
550 $(INSTALL_DIR) $(1)/usr/sbin 367 $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd_cli $(1)/usr/sbin/
Line 551... Line 368...
551 $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd_cli $(1)/usr/sbin/ 368 $(INSTALL_BIN) ./files/wps-hotplug.sh $(1)/etc/rc.button/wps
552 endef 369 endef
553 endif 370 endif
554   371  
555 define Package/wpad/install 372 define Package/wpad/install
556 $(call Install/hostapd,$(1)) 373 $(call Install/hostapd,$(1))
557 $(call Install/supplicant,$(1)) 374 $(call Install/supplicant,$(1))
558 $(INSTALL_BIN) $(PKG_BUILD_DIR)/wpad $(1)/usr/sbin/ -  
559 $(LN) wpad $(1)/usr/sbin/hostapd 375 $(INSTALL_BIN) $(PKG_BUILD_DIR)/wpad $(1)/usr/sbin/
560 $(LN) wpad $(1)/usr/sbin/wpa_supplicant 376 $(LN) wpad $(1)/usr/sbin/hostapd
561 endef -  
562 Package/wpad-basic/install = $(Package/wpad/install) -  
563 Package/wpad-mini/install = $(Package/wpad/install) -  
Line 564... Line 377...
564 Package/wpad-openssl/install = $(Package/wpad/install) 377 $(LN) wpad $(1)/usr/sbin/wpa_supplicant
565 Package/wpad-wolfssl/install = $(Package/wpad/install) 378 endef
566 Package/wpad-mesh-openssl/install = $(Package/wpad/install) 379 Package/wpad-mini/install = $(Package/wpad/install)
567 Package/wpad-mesh-wolfssl/install = $(Package/wpad/install) 380 Package/wpad-mesh/install = $(Package/wpad/install)
568   -  
569 define Package/wpa-supplicant/install 381  
570 $(call Install/supplicant,$(1)) 382 define Package/wpa-supplicant/install
571 $(INSTALL_BIN) $(PKG_BUILD_DIR)/wpa_supplicant/wpa_supplicant $(1)/usr/sbin/ 383 $(call Install/supplicant,$(1))
572 endef -  
573 Package/wpa-supplicant-basic/install = $(Package/wpa-supplicant/install) -  
574 Package/wpa-supplicant-mini/install = $(Package/wpa-supplicant/install) -  
Line 575... Line 384...
575 Package/wpa-supplicant-p2p/install = $(Package/wpa-supplicant/install) 384 $(INSTALL_BIN) $(PKG_BUILD_DIR)/wpa_supplicant/wpa_supplicant $(1)/usr/sbin/
576 Package/wpa-supplicant-openssl/install = $(Package/wpa-supplicant/install) 385 endef
577 Package/wpa-supplicant-wolfssl/install = $(Package/wpa-supplicant/install) 386 Package/wpa-supplicant-mini/install = $(Package/wpa-supplicant/install)
578 Package/wpa-supplicant-mesh-openssl/install = $(Package/wpa-supplicant/install) 387 Package/wpa-supplicant-p2p/install = $(Package/wpa-supplicant/install)
579 Package/wpa-supplicant-mesh-wolfssl/install = $(Package/wpa-supplicant/install) 388 Package/wpa-supplicant-mesh/install = $(Package/wpa-supplicant/install)
580   389  
Line 581... Line 390...
581 ifneq ($(LOCAL_TYPE),hostapd) 390 ifneq ($(LOCAL_TYPE),hostapd)
582 define Package/wpa-cli/install 391 define Package/wpa-cli/install
583 $(INSTALL_DIR) $(1)/usr/sbin 392 $(INSTALL_DIR) $(1)/usr/sbin
584 $(CP) $(PKG_BUILD_DIR)/wpa_supplicant/wpa_cli $(1)/usr/sbin/ 393 $(CP) $(PKG_BUILD_DIR)/wpa_supplicant/wpa_cli $(1)/usr/sbin/
585 endef 394 endef
586 endif 395 endif
Line 587... Line -...
587   -  
588 ifeq ($(BUILD_VARIANT),supplicant-full-internal) -  
589 define Package/eapol-test/install -  
590 $(INSTALL_DIR) $(1)/usr/sbin -  
591 $(CP) $(PKG_BUILD_DIR)/wpa_supplicant/eapol_test $(1)/usr/sbin/ -  
592 endef -  
593 endif -  
594   -  
595 ifeq ($(BUILD_VARIANT),supplicant-full-openssl) -  
596 define Package/eapol-test-openssl/install -  
597 $(INSTALL_DIR) $(1)/usr/sbin -  
598 $(CP) $(PKG_BUILD_DIR)/wpa_supplicant/eapol_test $(1)/usr/sbin/ -  
599 endef -  
600 endif -  
601   396  
602 ifeq ($(BUILD_VARIANT),supplicant-full-wolfssl) -  
603 define Package/eapol-test-wolfssl/install 397 ifeq ($(BUILD_VARIANT),supplicant-full)
604 $(INSTALL_DIR) $(1)/usr/sbin -  
605 $(CP) $(PKG_BUILD_DIR)/wpa_supplicant/eapol_test $(1)/usr/sbin/ -  
606 endef 398 define Package/eapol-test/install
607 endif -  
608   -  
609 $(eval $(call BuildPackage,hostapd)) 399 $(INSTALL_DIR) $(1)/usr/sbin
610 $(eval $(call BuildPackage,hostapd-basic)) 400 $(CP) $(PKG_BUILD_DIR)/wpa_supplicant/eapol_test $(1)/usr/sbin/
611 $(eval $(call BuildPackage,hostapd-mini)) -  
612 $(eval $(call BuildPackage,hostapd-openssl)) -  
613 $(eval $(call BuildPackage,hostapd-wolfssl)) 401 endef
614 $(eval $(call BuildPackage,wpad)) -  
615 $(eval $(call BuildPackage,wpad-mesh-openssl)) -  
616 $(eval $(call BuildPackage,wpad-mesh-wolfssl)) 402 endif
617 $(eval $(call BuildPackage,wpad-basic)) 403  
618 $(eval $(call BuildPackage,wpad-mini)) 404 $(eval $(call BuildPackage,hostapd))
619 $(eval $(call BuildPackage,wpad-openssl)) -  
620 $(eval $(call BuildPackage,wpad-wolfssl)) -  
621 $(eval $(call BuildPackage,wpa-supplicant)) 405 $(eval $(call BuildPackage,hostapd-mini))
622 $(eval $(call BuildPackage,wpa-supplicant-mesh-openssl)) 406 $(eval $(call BuildPackage,wpad))
623 $(eval $(call BuildPackage,wpa-supplicant-mesh-wolfssl)) 407 $(eval $(call BuildPackage,wpad-mesh))
624 $(eval $(call BuildPackage,wpa-supplicant-basic)) 408 $(eval $(call BuildPackage,wpad-mini))
625 $(eval $(call BuildPackage,wpa-supplicant-mini)) -  
626 $(eval $(call BuildPackage,wpa-supplicant-p2p)) -