package/wpa_supplicant: fix libwpa_client.so build
PATCH 1/1 package/wpa_supplicant: fix libwpa_client.so build
Build target libwpa_client.so is not built regardless of whether the option CONFIG_BUILD_WPA_CLIENT_SO is set or not. Add patch that fixes wpa_supplicant build regression.
Fixes:
http://autobuild.buildroot.net/results/001981339f3b895ecd9208a747a0e47d07c9583a/
http://autobuild.buildroot.net/results/318f9ecd4060d34cc8385891b56d0a0e6275f2c9/
---
Hi all,
Note that the patch has been posted to hostapd mailing list and discussed, but not yet accepted:
https://patchwork.ozlabs.org/project/hostap/patch/[email protected]/
Regards,
Sergey
...le-options-for-libwpa_client.so-and-.patch | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch
package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch new file +68 -0
@@ -0,0 +1,68 @@ +From e6a6a4e3df52cc60425fcd037d3ec68a38f948ce Mon Sep 17 00:00:00 2001 +From: Sergey Matyukevich <[email protected]> +Date: Sun, 20 Feb 2022 10:12:28 +0300 +Subject: [PATCH] build: re-enable options for libwpa_client.so and wpa_passphrase + +Commit a41a29192e5d ("build: Pull common fragments into a build.rules +file") introduced regression into wpa_supplicant build process. Build +target libwpa_client.so is not built regardless of whether the option +CONFIG_BUILD_WPA_CLIENT_SO is set or not. This happens because config +option is used before it is imported from the configuration file. +Moving its usage after including build.rules does not help: variable +ALL is processed by build.rules and further changes are not applied. +Similarly, option CONFIG_NO_WPA_PASSPHRASE also does not work as +expected: wpa_passphrase is always built regardless of whether the +option is set or not. + +This commit re-enables options adding both build targets to _all +dependencies. + +Signed-off-by: Sergey Matyukevich <[email protected]> +--- + wpa_supplicant/Makefile | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile +index cb66defac..e384cc6b8 100644 +--- a/wpa_supplicant/Makefile ++++ b/wpa_supplicant/Makefile +@@ -1,24 +1,29 @@ + BINALL=wpa_supplicant wpa_cli + +-ifndef CONFIG_NO_WPA_PASSPHRASE +-BINALL += wpa_passphrase +-endif +- + ALL = $(BINALL) + ALL += systemd/wpa_supplicant.service + ALL += systemd/[email protected] + ALL += systemd/[email protected] + ALL += systemd/[email protected] + ALL += dbus/fi.w1.wpa_supplicant1.service +-ifdef CONFIG_BUILD_WPA_CLIENT_SO +-ALL += libwpa_client.so +-endif + + EXTRA_TARGETS=dynamic_eap_methods + + CONFIG_FILE=.config + include ../src/build.rules + ++ifdef CONFIG_BUILD_WPA_CLIENT_SO ++# add the dependency this way to allow CONFIG_BUILD_WPA_CLIENT_SO ++# being set in the config which is read by build.rules ++_all: libwpa_client.so ++endif ++ ++ifndef CONFIG_NO_WPA_PASSPHRASE ++# add the dependency this way to allow CONFIGNO_WPA_PASSPHRASE ++# being set in the config which is read by build.rules ++_all: wpa_passphrase ++endif ++ + ifdef LIBS + # If LIBS is set with some global build system defaults, clone those for + # LIBS_c and LIBS_p to cover wpa_passphrase and wpa_cli as well. +-- +2.35.1 +
Signature · 6 lines
2.35.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Hi Sergey, all,
Quoted 10 lines · Sergey Matyukevich
Build target libwpa_client.so is not built regardless of whether the option
CONFIG_BUILD_WPA_CLIENT_SOis set or not. Add patch that fixeswpa_supplicantbuild regression.Fixes:
http://autobuild.buildroot.net/results/001981339f3b895ecd9208a747a0e47d07c9583a/
http://autobuild.buildroot.net/results/318f9ecd4060d34cc8385891b56d0a0e6275f2c9/Signed-off-by Sergey Matyukevich <[email protected]>
The patch was already merged upstream.
Yegor
Quoted 91 lines
---
Hi all,
Note that the patch has been posted to hostapd mailing list and discussed, but not yet accepted:
https://patchwork.ozlabs.org/project/hostap/patch/[email protected]/
Regards,
Sergey...le-options-for-libwpa_client.so-and-.patch | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patchpackage/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch new file +68
-1@@ -0,0 +1,68 @@ +From e6a6a4e3df52cc60425fcd037d3ec68a38f948ce Mon Sep 17 00:00:00 2001 +From: Sergey Matyukevich <[email protected]> +Date: Sun, 20 Feb 2022 10:12:28 +0300 +Subject: [PATCH] build: re-enable options for libwpa_client.so and wpa_passphrase + +Commit a41a29192e5d ("build: Pull common fragments into a build.rules +file") introduced regression into wpa_supplicant build process. Build +target libwpa_client.so is not built regardless of whether the option +CONFIG_BUILD_WPA_CLIENT_SO is set or not. This happens because config +option is used before it is imported from the configuration file. +Moving its usage after including build.rules does not help: variable +ALL is processed by build.rules and further changes are not applied. +Similarly, option CONFIG_NO_WPA_PASSPHRASE also does not work as +expected: wpa_passphrase is always built regardless of whether the +option is set or not. + +This commit re-enables options adding both build targets to _all +dependencies. + +Signed-off-by: Sergey Matyukevich <[email protected]> +--- + wpa_supplicant/Makefile | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile +index cb66defac..e384cc6b8 100644 +--- a/wpa_supplicant/Makefile ++++ b/wpa_supplicant/Makefile +@@ -1,24 +1,29 @@ + BINALL=wpa_supplicant wpa_cli + +-ifndef CONFIG_NO_WPA_PASSPHRASE +-BINALL += wpa_passphrase +-endif +- + ALL = $(BINALL) + ALL += systemd/wpa_supplicant.service + ALL += systemd/[email protected] + ALL += systemd/[email protected] + ALL += systemd/[email protected] + ALL += dbus/fi.w1.wpa_supplicant1.service +-ifdef CONFIG_BUILD_WPA_CLIENT_SO +-ALL += libwpa_client.so +-endif + + EXTRA_TARGETS=dynamic_eap_methods + + CONFIG_FILE=.config + include ../src/build.rules + ++ifdef CONFIG_BUILD_WPA_CLIENT_SO ++# add the dependency this way to allow CONFIG_BUILD_WPA_CLIENT_SO ++# being set in the config which is read by build.rules ++_all: libwpa_client.so ++endif ++ ++ifndef CONFIG_NO_WPA_PASSPHRASE ++# add the dependency this way to allow CONFIGNO_WPA_PASSPHRASE ++# being set in the config which is read by build.rules ++_all: wpa_passphrase ++endif ++ + ifdef LIBS + # If LIBS is set with some global build system defaults, clone those for + # LIBS_c and LIBS_p to cover wpa_passphrase and wpa_cli as well. +-- +2.35.1 + --
Quoted 2 lines
2.35.1
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Sergey" == Sergey Matyukevich <[email protected]> writes:
Build target libwpa_client.so is not built regardless of whether the option
CONFIG_BUILD_WPA_CLIENT_SOis set or not. Add patch that fixeswpa_supplicantbuild regression.Fixes:
http://autobuild.buildroot.net/results/001981339f3b895ecd9208a747a0e47d07c9583a/
http://autobuild.buildroot.net/results/318f9ecd4060d34cc8385891b56d0a0e6275f2c9/Signed-off-by Sergey Matyukevich <[email protected]>
Quoted 8 lines
---
Hi all,
Note that the patch has been posted to hostapd mailing list and discussed, but not yet accepted:
https://patchwork.ozlabs.org/project/hostap/patch/[email protected]/
I see that in the mean time it has been applied, great!
Committed, thanks.
Signature · 5 lines
Bye, Peter Korsgaard _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot