connman: remove wpa_supplicant legacy - only support iwd

This commit is contained in:
Rudi Heitbaum 2023-05-23 14:55:38 +00:00
parent 794a8ad627
commit ffbb9b0600
2 changed files with 4 additions and 19 deletions

View File

@ -193,9 +193,6 @@
DEBUG_GROUPS="kodi+=kodi+,kodi-platform+,p8-platform+,!mesa" DEBUG_GROUPS="kodi+=kodi+,kodi-platform+,p8-platform+,!mesa"
DEBUG_GROUP_YES="kodi+" DEBUG_GROUP_YES="kodi+"
# wireless daemon to use (wpa_supplicant/iwd)
WIRELESS_DAEMON="iwd"
# build and install iSCSI support - iscsistart (yes / no) # build and install iSCSI support - iscsistart (yes / no)
ISCSI_SUPPORT="no" ISCSI_SUPPORT="no"

View File

@ -8,7 +8,7 @@ PKG_SHA256="57ec9d2f4b007f90c1eecdae8ae69d051457f2e408b4d93f5490735797376d9e"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://www.connman.net" PKG_SITE="http://www.connman.net"
PKG_URL="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${PKG_VERSION}.tar.gz" PKG_URL="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain glib readline dbus iptables" PKG_DEPENDS_TARGET="toolchain dbus glib iptables iwd readline"
PKG_LONGDESC="A modular network connection manager." PKG_LONGDESC="A modular network connection manager."
PKG_TOOLCHAIN="autotools" PKG_TOOLCHAIN="autotools"
@ -42,7 +42,9 @@ PKG_CONFIGURE_OPTS_TARGET="--srcdir=.. \
--enable-datafiles \ --enable-datafiles \
--with-dbusconfdir=/etc \ --with-dbusconfdir=/etc \
--with-systemdunitdir=/usr/lib/systemd/system \ --with-systemdunitdir=/usr/lib/systemd/system \
--disable-silent-rules" --disable-silent-rules \
--disable-wifi \
--enable-iwd"
if [ "${WIREGUARD_SUPPORT}" = "yes" ]; then if [ "${WIREGUARD_SUPPORT}" = "yes" ]; then
PKG_CONFIGURE_OPTS_TARGET+=" --enable-wireguard=builtin" PKG_CONFIGURE_OPTS_TARGET+=" --enable-wireguard=builtin"
@ -50,20 +52,6 @@ else
PKG_CONFIGURE_OPTS_TARGET+=" --disable-wireguard" PKG_CONFIGURE_OPTS_TARGET+=" --disable-wireguard"
fi fi
case "${WIRELESS_DAEMON}" in
wpa_supplicant)
PKG_DEPENDS_TARGET+=" wpa_supplicant"
PKG_CONFIGURE_OPTS_TARGET+=" WPASUPPLICANT=/usr/bin/wpa_supplicant \
--enable-wifi \
--disable-iwd"
;;
iwd)
PKG_DEPENDS_TARGET+=" iwd"
PKG_CONFIGURE_OPTS_TARGET+=" --disable-wifi \
--enable-iwd"
;;
esac
PKG_MAKE_OPTS_TARGET="storagedir=/storage/.cache/connman \ PKG_MAKE_OPTS_TARGET="storagedir=/storage/.cache/connman \
vpn_storagedir=/storage/.config/wireguard \ vpn_storagedir=/storage/.config/wireguard \
statedir=/run/connman" statedir=/run/connman"