diff options
author | Alex Kiernan <alex.kiernan@gmail.com> | 2022-04-12 14:03:11 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-19 14:14:11 +0100 |
commit | 12f63535bd24e5cc442b01ba007056fda9f62d35 (patch) | |
tree | 691c6ce8c74e75d021d0b8d8c393a88ea451255d /meta/recipes-connectivity/wpa-supplicant/wpa-supplicant | |
parent | 3f8f8cb1f636a3f056456accc7ab695d895e5744 (diff) | |
download | poky-12f63535bd24e5cc442b01ba007056fda9f62d35.tar.gz |
wpa-supplicant: Backport libwpa/clean build fixes
Enabling CONFIG_BUILD_WPA_CLIENT_SO or CONFIG_NO_WPA_PASSPHRASE do
nothing in the released 2.10 wpa-supplicant; backport the fixes for
this.
Also backport the fixes for `make clean` when `wpa_passphrase` is
built.
(From OE-Core rev: 179fedda2b347b0e9b17642afa4ba752587d4965)
Signed-off-by: Alex Kiernan <alexk@zuma.ai>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/wpa-supplicant/wpa-supplicant')
2 files changed, 99 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-build-Re-enable-options-for-libwpa_client.so-and-wpa.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-build-Re-enable-options-for-libwpa_client.so-and-wpa.patch new file mode 100644 index 0000000000..6e930fc98d --- /dev/null +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-build-Re-enable-options-for-libwpa_client.so-and-wpa.patch | |||
@@ -0,0 +1,73 @@ | |||
1 | From cb41c214b78d6df187a31950342e48a403dbd769 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sergey Matyukevich <geomatsi@gmail.com> | ||
3 | Date: Tue, 22 Feb 2022 11:52:19 +0300 | ||
4 | Subject: [PATCH 1/2] build: Re-enable options for libwpa_client.so and | ||
5 | wpa_passphrase | ||
6 | |||
7 | Commit a41a29192e5d ("build: Pull common fragments into a build.rules | ||
8 | file") introduced a regression into wpa_supplicant build process. The | ||
9 | build target libwpa_client.so is not built regardless of whether the | ||
10 | option CONFIG_BUILD_WPA_CLIENT_SO is set or not. This happens because | ||
11 | this config option is used before it is imported from the configuration | ||
12 | file. Moving its use after including build.rules does not help: the | ||
13 | variable ALL is processed by build.rules and further changes are not | ||
14 | applied. Similarly, option CONFIG_NO_WPA_PASSPHRASE also does not work | ||
15 | as expected: wpa_passphrase is always built regardless of whether the | ||
16 | option is set or not. | ||
17 | |||
18 | Re-enable these options by adding both build targets to _all | ||
19 | dependencies. | ||
20 | |||
21 | Fixes: a41a29192e5d ("build: Pull common fragments into a build.rules file") | ||
22 | Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com> | ||
23 | Upstream-Status: Backport | ||
24 | Signed-off-by: Alex Kiernan <alexk@zuma.ai> | ||
25 | Signed-off-by: Alex Kiernan <alexk@gmail.com> | ||
26 | --- | ||
27 | wpa_supplicant/Makefile | 19 ++++++++++++------- | ||
28 | 1 file changed, 12 insertions(+), 7 deletions(-) | ||
29 | |||
30 | diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile | ||
31 | index cb66defac7c8..c456825ae75f 100644 | ||
32 | --- a/wpa_supplicant/Makefile | ||
33 | +++ b/wpa_supplicant/Makefile | ||
34 | @@ -1,24 +1,29 @@ | ||
35 | BINALL=wpa_supplicant wpa_cli | ||
36 | |||
37 | -ifndef CONFIG_NO_WPA_PASSPHRASE | ||
38 | -BINALL += wpa_passphrase | ||
39 | -endif | ||
40 | - | ||
41 | ALL = $(BINALL) | ||
42 | ALL += systemd/wpa_supplicant.service | ||
43 | ALL += systemd/wpa_supplicant@.service | ||
44 | ALL += systemd/wpa_supplicant-nl80211@.service | ||
45 | ALL += systemd/wpa_supplicant-wired@.service | ||
46 | ALL += dbus/fi.w1.wpa_supplicant1.service | ||
47 | -ifdef CONFIG_BUILD_WPA_CLIENT_SO | ||
48 | -ALL += libwpa_client.so | ||
49 | -endif | ||
50 | |||
51 | EXTRA_TARGETS=dynamic_eap_methods | ||
52 | |||
53 | CONFIG_FILE=.config | ||
54 | include ../src/build.rules | ||
55 | |||
56 | +ifdef CONFIG_BUILD_WPA_CLIENT_SO | ||
57 | +# add the dependency this way to allow CONFIG_BUILD_WPA_CLIENT_SO | ||
58 | +# being set in the config which is read by build.rules | ||
59 | +_all: libwpa_client.so | ||
60 | +endif | ||
61 | + | ||
62 | +ifndef CONFIG_NO_WPA_PASSPHRASE | ||
63 | +# add the dependency this way to allow CONFIG_NO_WPA_PASSPHRASE | ||
64 | +# being set in the config which is read by build.rules | ||
65 | +_all: wpa_passphrase | ||
66 | +endif | ||
67 | + | ||
68 | ifdef LIBS | ||
69 | # If LIBS is set with some global build system defaults, clone those for | ||
70 | # LIBS_c and LIBS_p to cover wpa_passphrase and wpa_cli as well. | ||
71 | -- | ||
72 | 2.35.1 | ||
73 | |||
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-Fix-removal-of-wpa_passphrase-on-make-clean.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-Fix-removal-of-wpa_passphrase-on-make-clean.patch new file mode 100644 index 0000000000..53b0fcdf53 --- /dev/null +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-Fix-removal-of-wpa_passphrase-on-make-clean.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From d001b301ba7987f4b39453a211631b85c48f2ff8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jouni Malinen <quic_jouni@quicinc.com> | ||
3 | Date: Thu, 3 Mar 2022 13:26:42 +0200 | ||
4 | Subject: [PATCH 2/2] Fix removal of wpa_passphrase on 'make clean' | ||
5 | |||
6 | Fixes: 0430bc8267b4 ("build: Add a common-clean target") | ||
7 | Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com> | ||
8 | Upstream-Status: Backport | ||
9 | Signed-off-by: Alex Kiernan <alexk@zuma.ai> | ||
10 | Signed-off-by: Alex Kiernan <alexk@gmail.com> | ||
11 | --- | ||
12 | wpa_supplicant/Makefile | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile | ||
16 | index c456825ae75f..4b4688931b1d 100644 | ||
17 | --- a/wpa_supplicant/Makefile | ||
18 | +++ b/wpa_supplicant/Makefile | ||
19 | @@ -2077,3 +2077,4 @@ clean: common-clean | ||
20 | rm -f libwpa_client.a | ||
21 | rm -f libwpa_client.so | ||
22 | rm -f libwpa_test1 libwpa_test2 | ||
23 | + rm -f wpa_passphrase | ||
24 | -- | ||
25 | 2.35.1 | ||
26 | |||