Merge branch 'user_manager' of https://xajhuang.com:3100/avs/avs_mtk_voice into user_manager
This commit is contained in:
commit
cca1f13013
|
|
@ -1,33 +0,0 @@
|
|||
From 57b12a1e43605f71239a21488cb9b541f0751dda Mon Sep 17 00:00:00 2001
|
||||
From: Alex Kiernan <alexk@zuma.ai>
|
||||
Date: Thu, 21 Apr 2022 10:15:29 +0100
|
||||
Subject: [PATCH] Install wpa_passphrase when not disabled
|
||||
|
||||
As part of fixing CONFIG_NO_WPA_PASSPHRASE, whilst wpa_passphrase gets
|
||||
built, its not installed during `make install`.
|
||||
|
||||
Fixes: cb41c214b78d ("build: Re-enable options for libwpa_client.so and wpa_passphrase")
|
||||
Signed-off-by: Alex Kiernan <alexk@zuma.ai>
|
||||
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
|
||||
Upstream-Status: Submitted [http://lists.infradead.org/pipermail/hostap/2022-April/040448.html]
|
||||
---
|
||||
wpa_supplicant/Makefile | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
|
||||
index 0bab313f2355..12787c0c7d0f 100644
|
||||
--- a/wpa_supplicant/Makefile
|
||||
+++ b/wpa_supplicant/Makefile
|
||||
@@ -73,6 +73,9 @@ $(DESTDIR)$(BINDIR)/%: %
|
||||
|
||||
install: $(addprefix $(DESTDIR)$(BINDIR)/,$(BINALL))
|
||||
$(MAKE) -C ../src install
|
||||
+ifndef CONFIG_NO_WPA_PASSPHRASE
|
||||
+ install -D wpa_passphrase $(DESTDIR)/$(BINDIR)/wpa_passphrase
|
||||
+endif
|
||||
ifdef CONFIG_BUILD_WPA_CLIENT_SO
|
||||
install -m 0644 -D libwpa_client.so $(DESTDIR)/$(LIBDIR)/libwpa_client.so
|
||||
install -m 0644 -D ../src/common/wpa_ctrl.h $(DESTDIR)/$(INCDIR)/wpa_ctrl.h
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
From cb41c214b78d6df187a31950342e48a403dbd769 Mon Sep 17 00:00:00 2001
|
||||
From: Sergey Matyukevich <geomatsi@gmail.com>
|
||||
Date: Tue, 22 Feb 2022 11:52:19 +0300
|
||||
Subject: [PATCH 1/2] build: Re-enable options for libwpa_client.so and
|
||||
wpa_passphrase
|
||||
|
||||
Commit a41a29192e5d ("build: Pull common fragments into a build.rules
|
||||
file") introduced a regression into wpa_supplicant build process. The
|
||||
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
|
||||
this config option is used before it is imported from the configuration
|
||||
file. Moving its use after including build.rules does not help: the
|
||||
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.
|
||||
|
||||
Re-enable these options by adding both build targets to _all
|
||||
dependencies.
|
||||
|
||||
Fixes: a41a29192e5d ("build: Pull common fragments into a build.rules file")
|
||||
Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Alex Kiernan <alexk@zuma.ai>
|
||||
Signed-off-by: Alex Kiernan <alexk@gmail.com>
|
||||
---
|
||||
wpa_supplicant/Makefile | 19 ++++++++++++-------
|
||||
1 file changed, 12 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
|
||||
index cb66defac7c8..c456825ae75f 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/wpa_supplicant@.service
|
||||
ALL += systemd/wpa_supplicant-nl80211@.service
|
||||
ALL += systemd/wpa_supplicant-wired@.service
|
||||
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 CONFIG_NO_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
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From d001b301ba7987f4b39453a211631b85c48f2ff8 Mon Sep 17 00:00:00 2001
|
||||
From: Jouni Malinen <quic_jouni@quicinc.com>
|
||||
Date: Thu, 3 Mar 2022 13:26:42 +0200
|
||||
Subject: [PATCH 2/2] Fix removal of wpa_passphrase on 'make clean'
|
||||
|
||||
Fixes: 0430bc8267b4 ("build: Add a common-clean target")
|
||||
Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Alex Kiernan <alexk@zuma.ai>
|
||||
Signed-off-by: Alex Kiernan <alexk@gmail.com>
|
||||
---
|
||||
wpa_supplicant/Makefile | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
|
||||
index c456825ae75f..4b4688931b1d 100644
|
||||
--- a/wpa_supplicant/Makefile
|
||||
+++ b/wpa_supplicant/Makefile
|
||||
@@ -2077,3 +2077,4 @@ clean: common-clean
|
||||
rm -f libwpa_client.a
|
||||
rm -f libwpa_client.so
|
||||
rm -f libwpa_test1 libwpa_test2
|
||||
+ rm -f wpa_passphrase
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
|
@ -4,7 +4,6 @@
|
|||
WPA_SUP_BIN="/usr/sbin/wpa_supplicant"
|
||||
WPA_SUP_PNAME="wpa_supplicant"
|
||||
WPA_SUP_PIDFILE="/var/run/wpa_supplicant.$IFACE.pid"
|
||||
WPA_COMMON_CTRL_IFACE="/var/run/wpa_supplicant"
|
||||
WPA_SUP_OPTIONS="-B -P $WPA_SUP_PIDFILE -i $IFACE"
|
||||
|
||||
VERBOSITY=0
|
||||
|
|
|
|||
|
|
@ -1,137 +0,0 @@
|
|||
SUMMARY = "Client for Wi-Fi Protected Access (WPA)"
|
||||
DESCRIPTION = "wpa_supplicant is a WPA Supplicant for Linux, BSD, Mac OS X, and Windows with support for WPA and WPA2 (IEEE 802.11i / RSN). Supplicant is the IEEE 802.1X/WPA component that is used in the client stations. It implements key negotiation with a WPA Authenticator and it controls the roaming and IEEE 802.11 authentication/association of the wlan driver."
|
||||
HOMEPAGE = "http://w1.fi/wpa_supplicant/"
|
||||
BUGTRACKER = "http://w1.fi/security/"
|
||||
SECTION = "network"
|
||||
LICENSE = "BSD-3-Clause"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=5ebcb90236d1ad640558c3d3cd3035df \
|
||||
file://README;beginline=1;endline=56;md5=e3d2f6c2948991e37c1ca4960de84747 \
|
||||
file://wpa_supplicant/wpa_supplicant.c;beginline=1;endline=12;md5=76306a95306fee9a976b0ac1be70f705"
|
||||
|
||||
DEPENDS = "dbus libnl"
|
||||
|
||||
SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \
|
||||
file://wpa-supplicant.sh \
|
||||
file://wpa_supplicant.conf \
|
||||
file://wpa_supplicant.conf-sane \
|
||||
file://99_wpa_supplicant \
|
||||
file://0001-build-Re-enable-options-for-libwpa_client.so-and-wpa.patch \
|
||||
file://0002-Fix-removal-of-wpa_passphrase-on-make-clean.patch \
|
||||
file://0001-Install-wpa_passphrase-when-not-disabled.patch \
|
||||
"
|
||||
SRC_URI[sha256sum] = "20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f"
|
||||
|
||||
S = "${WORKDIR}/wpa_supplicant-${PV}"
|
||||
|
||||
inherit pkgconfig systemd
|
||||
|
||||
PACKAGECONFIG ?= "openssl"
|
||||
PACKAGECONFIG[gnutls] = ",,gnutls libgcrypt"
|
||||
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/defconfig >wpa_supplicant/.config
|
||||
|
||||
if ${@ bb.utils.contains('PACKAGECONFIG', 'openssl', 'true', 'false', d) }; then
|
||||
echo 'CONFIG_TLS=openssl' >>wpa_supplicant/.config
|
||||
elif ${@ bb.utils.contains('PACKAGECONFIG', 'gnutls', 'true', 'false', d) }; then
|
||||
echo 'CONFIG_TLS=gnutls' >>wpa_supplicant/.config
|
||||
sed -i -e 's/\(^CONFIG_DPP=\)/#\1/' \
|
||||
-e 's/\(^CONFIG_EAP_PWD=\)/#\1/' \
|
||||
-e 's/\(^CONFIG_SAE=\)/#\1/' wpa_supplicant/.config
|
||||
fi
|
||||
|
||||
# For rebuild
|
||||
rm -f wpa_supplicant/*.d wpa_supplicant/dbus/*.d
|
||||
}
|
||||
|
||||
do_compile () {
|
||||
oe_runmake -C wpa_supplicant
|
||||
if [ -z "${DISABLE_STATIC}" ]; then
|
||||
oe_runmake -C wpa_supplicant libwpa_client.a
|
||||
fi
|
||||
}
|
||||
|
||||
do_install () {
|
||||
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
|
||||
|
||||
install -d ${D}${sysconfdir}
|
||||
install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
|
||||
|
||||
install -d ${D}${sysconfdir}/network/if-pre-up.d/
|
||||
install -d ${D}${sysconfdir}/network/if-post-down.d/
|
||||
install -d ${D}${sysconfdir}/network/if-down.d/
|
||||
install -m 755 ${WORKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant
|
||||
ln -sf ../if-pre-up.d/wpa-supplicant ${D}${sysconfdir}/network/if-post-down.d/wpa-supplicant
|
||||
|
||||
install -d ${D}/${sysconfdir}/dbus-1/system.d
|
||||
install -m 644 ${S}/wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d
|
||||
install -d ${D}/${datadir}/dbus-1/system-services
|
||||
install -m 644 ${S}/wpa_supplicant/dbus/*.service ${D}/${datadir}/dbus-1/system-services
|
||||
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
|
||||
install -d ${D}/${systemd_system_unitdir}
|
||||
install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}/${systemd_system_unitdir}
|
||||
fi
|
||||
|
||||
install -d ${D}/etc/default/volatiles
|
||||
install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles
|
||||
|
||||
install -d ${D}${includedir}
|
||||
install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir}
|
||||
|
||||
if [ -z "${DISABLE_STATIC}" ]; then
|
||||
install -d ${D}${libdir}
|
||||
install -m 0644 wpa_supplicant/libwpa_client.a ${D}${libdir}
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst_${PN} () {
|
||||
# If we're offline, we don't need to do this.
|
||||
if [ "x$D" = "x" ]; then
|
||||
killall -q -HUP dbus-daemon || true
|
||||
fi
|
||||
}
|
||||
|
||||
PACKAGE_BEFORE_PN += "${PN}-passphrase ${PN}-cli"
|
||||
PACKAGES =+ "${PN}-lib"
|
||||
PACKAGES += "${PN}-plugins"
|
||||
ALLOW_EMPTY_${PN}-plugins = "1"
|
||||
|
||||
PACKAGES_DYNAMIC += "^${PN}-plugin-.*$"
|
||||
NOAUTOPACKAGEDEBUG = "1"
|
||||
|
||||
FILES_${PN}-passphrase = "${sbindir}/wpa_passphrase"
|
||||
FILES_${PN}-cli = "${sbindir}/wpa_cli"
|
||||
FILES_${PN}-lib = "${libdir}/libwpa_client*${SOLIBSDEV}"
|
||||
FILES_${PN} += "${datadir}/dbus-1/system-services/* ${systemd_system_unitdir}/*"
|
||||
FILES_${PN}-dbg += "${sbindir}/.debug ${libdir}/.debug"
|
||||
|
||||
CONFFILES_${PN} += "${sysconfdir}/wpa_supplicant.conf"
|
||||
|
||||
RRECOMMENDS_${PN} = "${PN}-passphrase ${PN}-cli ${PN}-plugins"
|
||||
|
||||
SYSTEMD_SERVICE_${PN} = "wpa_supplicant.service"
|
||||
SYSTEMD_AUTO_ENABLE = "disable"
|
||||
|
||||
python split_wpa_supplicant_libs () {
|
||||
libdir = d.expand('${libdir}/wpa_supplicant')
|
||||
dbglibdir = os.path.join(libdir, '.debug')
|
||||
|
||||
split_packages = do_split_packages(d, libdir, r'^(.*)\.so', '${PN}-plugin-%s', 'wpa_supplicant %s plugin', prepend=True)
|
||||
split_dbg_packages = do_split_packages(d, dbglibdir, r'^(.*)\.so', '${PN}-plugin-%s-dbg', 'wpa_supplicant %s plugin - Debugging files', prepend=True, extra_depends='${PN}-dbg')
|
||||
|
||||
if split_packages:
|
||||
pn = d.getVar('PN')
|
||||
d.setVar('RRECOMMENDS:' + pn + '-plugins', ' '.join(split_packages))
|
||||
d.appendVar('RRECOMMENDS:' + pn + '-dbg', ' ' + ' '.join(split_dbg_packages))
|
||||
}
|
||||
PACKAGESPLITFUNCS_prepend = "split_wpa_supplicant_libs "
|
||||
Loading…
Reference in New Issue