diff options
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-Install-wpa_passphrase-when-not-disabled.patch | 33 | ||||
-rw-r--r-- | meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb | 3 |
2 files changed, 35 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-Install-wpa_passphrase-when-not-disabled.patch b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-Install-wpa_passphrase-when-not-disabled.patch new file mode 100644 index 0000000000..c04c608bde --- /dev/null +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-Install-wpa_passphrase-when-not-disabled.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 57b12a1e43605f71239a21488cb9b541f0751dda Mon Sep 17 00:00:00 2001 | ||
2 | From: Alex Kiernan <alexk@zuma.ai> | ||
3 | Date: Thu, 21 Apr 2022 10:15:29 +0100 | ||
4 | Subject: [PATCH] Install wpa_passphrase when not disabled | ||
5 | |||
6 | As part of fixing CONFIG_NO_WPA_PASSPHRASE, whilst wpa_passphrase gets | ||
7 | built, its not installed during `make install`. | ||
8 | |||
9 | Fixes: cb41c214b78d ("build: Re-enable options for libwpa_client.so and wpa_passphrase") | ||
10 | Signed-off-by: Alex Kiernan <alexk@zuma.ai> | ||
11 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | ||
12 | Upstream-Status: Submitted [http://lists.infradead.org/pipermail/hostap/2022-April/040448.html] | ||
13 | --- | ||
14 | wpa_supplicant/Makefile | 3 +++ | ||
15 | 1 file changed, 3 insertions(+) | ||
16 | |||
17 | diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile | ||
18 | index 0bab313f2355..12787c0c7d0f 100644 | ||
19 | --- a/wpa_supplicant/Makefile | ||
20 | +++ b/wpa_supplicant/Makefile | ||
21 | @@ -73,6 +73,9 @@ $(DESTDIR)$(BINDIR)/%: % | ||
22 | |||
23 | install: $(addprefix $(DESTDIR)$(BINDIR)/,$(BINALL)) | ||
24 | $(MAKE) -C ../src install | ||
25 | +ifndef CONFIG_NO_WPA_PASSPHRASE | ||
26 | + install -D wpa_passphrase $(DESTDIR)/$(BINDIR)/wpa_passphrase | ||
27 | +endif | ||
28 | ifdef CONFIG_BUILD_WPA_CLIENT_SO | ||
29 | install -m 0644 -D libwpa_client.so $(DESTDIR)/$(LIBDIR)/libwpa_client.so | ||
30 | install -m 0644 -D ../src/common/wpa_ctrl.h $(DESTDIR)/$(INCDIR)/wpa_ctrl.h | ||
31 | -- | ||
32 | 2.35.1 | ||
33 | |||
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb index e83aef70d5..97cd68d863 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb +++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb | |||
@@ -17,6 +17,7 @@ SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \ | |||
17 | file://99_wpa_supplicant \ | 17 | file://99_wpa_supplicant \ |
18 | file://0001-build-Re-enable-options-for-libwpa_client.so-and-wpa.patch \ | 18 | file://0001-build-Re-enable-options-for-libwpa_client.so-and-wpa.patch \ |
19 | file://0002-Fix-removal-of-wpa_passphrase-on-make-clean.patch \ | 19 | file://0002-Fix-removal-of-wpa_passphrase-on-make-clean.patch \ |
20 | file://0001-Install-wpa_passphrase-when-not-disabled.patch \ | ||
20 | " | 21 | " |
21 | SRC_URI[sha256sum] = "20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f" | 22 | SRC_URI[sha256sum] = "20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f" |
22 | 23 | ||
@@ -104,7 +105,7 @@ ALLOW_EMPTY:${PN}-plugins = "1" | |||
104 | PACKAGES_DYNAMIC += "^${PN}-plugin-.*$" | 105 | PACKAGES_DYNAMIC += "^${PN}-plugin-.*$" |
105 | NOAUTOPACKAGEDEBUG = "1" | 106 | NOAUTOPACKAGEDEBUG = "1" |
106 | 107 | ||
107 | FILES:${PN}-passphrase = "${bindir}/wpa_passphrase" | 108 | FILES:${PN}-passphrase = "${sbindir}/wpa_passphrase" |
108 | FILES:${PN}-cli = "${sbindir}/wpa_cli" | 109 | FILES:${PN}-cli = "${sbindir}/wpa_cli" |
109 | FILES:${PN} += "${datadir}/dbus-1/system-services/* ${systemd_system_unitdir}/*" | 110 | FILES:${PN} += "${datadir}/dbus-1/system-services/* ${systemd_system_unitdir}/*" |
110 | FILES:${PN}-dbg += "${sbindir}/.debug" | 111 | FILES:${PN}-dbg += "${sbindir}/.debug" |