From d34e00cce8fb7489aaf404d0b2491b3bbb93a0ed Mon Sep 17 00:00:00 2001 From: Alex Kiernan Date: Tue, 12 Apr 2022 14:03:14 +0100 Subject: [PATCH] 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. Signed-off-by: Alex Kiernan Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- .../wpa-supplicant/wpa-supplicant_2.10.bb | 14 +++----------- 1 file 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 51ec5004852..861855e4851 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" CVE_PRODUCT = "wpa_supplicant" +EXTRA_OEMAKE = "'LIBDIR=${libdir}' 'INCDIR=${includedir}' 'BINDIR=${sbindir}'" + do_configure () { ${MAKE} -C wpa_supplicant clean sed -e '/CONFIG_TLS=/d' wpa_supplicant/.config @@ -44,12 +46,7 @@ do_configure () { rm -f wpa_supplicant/*.d wpa_supplicant/dbus/*.d } -export EXTRA_CFLAGS = "${CFLAGS}" -export BINDIR = "${sbindir}" - do_compile () { - unset CFLAGS CPPFLAGS CXXFLAGS - sed -e "s:CFLAGS\ =.*:& \$(EXTRA_CFLAGS):g" -i ${S}/src/lib.rules oe_runmake -C wpa_supplicant if [ -z "${DISABLE_STATIC}" ]; then oe_runmake -C wpa_supplicant libwpa_client.a @@ -57,12 +54,7 @@ do_compile () { } do_install () { - install -d ${D}${sbindir} - install -m 755 wpa_supplicant/wpa_supplicant ${D}${sbindir} - install -m 755 wpa_supplicant/wpa_cli ${D}${sbindir} - - install -d ${D}${bindir} - install -m 755 wpa_supplicant/wpa_passphrase ${D}${bindir} + oe_runmake -C wpa_supplicant DESTDIR="${D}" install install -d ${D}${docdir}/wpa_supplicant install -m 644 wpa_supplicant/README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant -- 2.47.2