diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options index 10503e5bc7..bd45ea4416 100644 --- a/distributions/LibreELEC/options +++ b/distributions/LibreELEC/options @@ -224,3 +224,6 @@ # debug tty path DEBUG_TTY="/dev/tty3" + +# wireless daemon to use (wpa_supplicant/iwd) + WIRELESS_DAEMON="wpa_supplicant" diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk index f3d971eeeb..ca98db7bb6 100644 --- a/packages/network/connman/package.mk +++ b/packages/network/connman/package.mk @@ -8,12 +8,11 @@ PKG_SHA256="6ce29b3eb0bb16a7387bc609c39455fd13064bdcde5a4d185fab3a0c71946e16" PKG_LICENSE="GPL" PKG_SITE="http://www.connman.net" PKG_URL="https://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS_TARGET="toolchain glib readline dbus iptables wpa_supplicant" +PKG_DEPENDS_TARGET="toolchain glib readline dbus iptables" PKG_LONGDESC="A modular network connection manager." PKG_TOOLCHAIN="autotools" -PKG_CONFIGURE_OPTS_TARGET="WPASUPPLICANT=/usr/bin/wpa_supplicant \ - --srcdir=.. \ +PKG_CONFIGURE_OPTS_TARGET="--srcdir=.. \ --disable-debug \ --disable-hh2serial-gps \ --disable-openconnect \ @@ -31,7 +30,8 @@ PKG_CONFIGURE_OPTS_TARGET="WPASUPPLICANT=/usr/bin/wpa_supplicant \ --enable-loopback \ --enable-ethernet \ --disable-gadget \ - --enable-wifi \ + --disable-wifi \ + --enable-iwd \ --disable-bluetooth \ --disable-ofono \ --disable-dundee \ @@ -46,6 +46,20 @@ PKG_CONFIGURE_OPTS_TARGET="WPASUPPLICANT=/usr/bin/wpa_supplicant \ --with-systemdunitdir=/usr/lib/systemd/system \ --disable-silent-rules" +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 \ statedir=/run/connman"