summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2022-04-12 14:03:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-19 14:14:11 +0100
commit4f2214775da424351aee476f48a6af9d25df5bbe (patch)
treed47d7344322abe0974b7cd3d8333a84dbb37c108
parent38f46f257f5df1e00281b50e873fd59474e94d3c (diff)
downloadpoky-4f2214775da424351aee476f48a6af9d25df5bbe.tar.gz
wpa-supplicant: Simplify build/install flow
The build/install steps for wpa-supplicant support CFLAGS and an install target, so use these rather than attempting to do it manually (which was broken by upstream splitting into build.rules and lib.rules). Note that this installs wpa_passphrase into sbindir rather than bindir. (From OE-Core rev: d34e00cce8fb7489aaf404d0b2491b3bbb93a0ed) 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>
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb14
1 files changed, 3 insertions, 11 deletions
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 51ec500485..861855e485 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb
@@ -30,6 +30,8 @@ PACKAGECONFIG[openssl] = ",,openssl"
30 30
31CVE_PRODUCT = "wpa_supplicant" 31CVE_PRODUCT = "wpa_supplicant"
32 32
33EXTRA_OEMAKE = "'LIBDIR=${libdir}' 'INCDIR=${includedir}' 'BINDIR=${sbindir}'"
34
33do_configure () { 35do_configure () {
34 ${MAKE} -C wpa_supplicant clean 36 ${MAKE} -C wpa_supplicant clean
35 sed -e '/CONFIG_TLS=/d' <wpa_supplicant/defconfig >wpa_supplicant/.config 37 sed -e '/CONFIG_TLS=/d' <wpa_supplicant/defconfig >wpa_supplicant/.config
@@ -44,12 +46,7 @@ do_configure () {
44 rm -f wpa_supplicant/*.d wpa_supplicant/dbus/*.d 46 rm -f wpa_supplicant/*.d wpa_supplicant/dbus/*.d
45} 47}
46 48
47export EXTRA_CFLAGS = "${CFLAGS}"
48export BINDIR = "${sbindir}"
49
50do_compile () { 49do_compile () {
51 unset CFLAGS CPPFLAGS CXXFLAGS
52 sed -e "s:CFLAGS\ =.*:& \$(EXTRA_CFLAGS):g" -i ${S}/src/lib.rules
53 oe_runmake -C wpa_supplicant 50 oe_runmake -C wpa_supplicant
54 if [ -z "${DISABLE_STATIC}" ]; then 51 if [ -z "${DISABLE_STATIC}" ]; then
55 oe_runmake -C wpa_supplicant libwpa_client.a 52 oe_runmake -C wpa_supplicant libwpa_client.a
@@ -57,12 +54,7 @@ do_compile () {
57} 54}
58 55
59do_install () { 56do_install () {
60 install -d ${D}${sbindir} 57 oe_runmake -C wpa_supplicant DESTDIR="${D}" install
61 install -m 755 wpa_supplicant/wpa_supplicant ${D}${sbindir}
62 install -m 755 wpa_supplicant/wpa_cli ${D}${sbindir}
63
64 install -d ${D}${bindir}
65 install -m 755 wpa_supplicant/wpa_passphrase ${D}${bindir}
66 58
67 install -d ${D}${docdir}/wpa_supplicant 59 install -d ${D}${docdir}/wpa_supplicant
68 install -m 644 wpa_supplicant/README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant 60 install -m 644 wpa_supplicant/README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant