hostapd: fix compilation of wpa_supplicant
Ubus patch as it seems have been broken by some rebase in the past as the location of line that adds ubus object file was in condition for CONFIG_MACSEC. That condition was adding object files that are not touched by ubus patch. This means ubus.o does not have to be included in that case. When it has to be and when build fails is when CONFIG_AP is set. All files included in wpa_supplicant that are touched by this patch are in this condition. This means that this is for sure the original place for it. Signed-off-by: Karel Kočí <karel.koci@nic.cz>
This commit is contained in:
parent
b933f9cf0c
commit
a4248577a0
|
@ -284,16 +284,16 @@
|
||||||
ifdef CONFIG_CODE_COVERAGE
|
ifdef CONFIG_CODE_COVERAGE
|
||||||
CFLAGS += -O0 -fprofile-arcs -ftest-coverage
|
CFLAGS += -O0 -fprofile-arcs -ftest-coverage
|
||||||
LIBS += -lgcov
|
LIBS += -lgcov
|
||||||
@@ -887,6 +893,9 @@ OBJS += ../src/pae/ieee802_1x_secy_ops.o
|
@@ -956,6 +962,9 @@ ifdef CONFIG_CTRL_IFACE_MIB
|
||||||
ifdef CONFIG_AP
|
CFLAGS += -DCONFIG_CTRL_IFACE_MIB
|
||||||
OBJS += ../src/ap/wpa_auth_kay.o
|
|
||||||
endif
|
endif
|
||||||
|
OBJS += ../src/ap/ctrl_iface_ap.o
|
||||||
+ifdef CONFIG_UBUS
|
+ifdef CONFIG_UBUS
|
||||||
+OBJS += ../src/ap/ubus.o
|
+OBJS += ../src/ap/ubus.o
|
||||||
+endif
|
+endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef CONFIG_IEEE8021X_EAPOL
|
CFLAGS += -DEAP_SERVER -DEAP_SERVER_IDENTITY
|
||||||
--- a/wpa_supplicant/wpa_supplicant.c
|
--- a/wpa_supplicant/wpa_supplicant.c
|
||||||
+++ b/wpa_supplicant/wpa_supplicant.c
|
+++ b/wpa_supplicant/wpa_supplicant.c
|
||||||
@@ -6797,6 +6797,8 @@ struct wpa_supplicant * wpa_supplicant_a
|
@@ -6797,6 +6797,8 @@ struct wpa_supplicant * wpa_supplicant_a
|
||||||
|
|
Loading…
Reference in New Issue