mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-01 15:07:49 +00:00
Merge pull request #7865 from heitbaum/wpa
wpa_supplicant: drop legacy IEEE 802.11i supplicant package
This commit is contained in:
CvH
GitHub
commit
4c9ff73be1
@ -193,9 +193,6 @@
|
||||
DEBUG_GROUPS="kodi+=kodi+,kodi-platform+,p8-platform+,!mesa"
|
||||
DEBUG_GROUP_YES="kodi+"
|
||||
|
||||
# wireless daemon to use (wpa_supplicant/iwd)
|
||||
WIRELESS_DAEMON="iwd"
|
||||
|
||||
# build and install iSCSI support - iscsistart (yes / no)
|
||||
ISCSI_SUPPORT="no"
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ PKG_SHA256="57ec9d2f4b007f90c1eecdae8ae69d051457f2e408b4d93f5490735797376d9e"
|
||||
PKG_LICENSE="GPL"
|
||||
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_DEPENDS_TARGET="toolchain glib readline dbus iptables"
|
||||
PKG_DEPENDS_TARGET="toolchain dbus glib iptables iwd readline"
|
||||
PKG_LONGDESC="A modular network connection manager."
|
||||
PKG_TOOLCHAIN="autotools"
|
||||
|
||||
@ -42,7 +42,9 @@ PKG_CONFIGURE_OPTS_TARGET="--srcdir=.. \
|
||||
--enable-datafiles \
|
||||
--with-dbusconfdir=/etc \
|
||||
--with-systemdunitdir=/usr/lib/systemd/system \
|
||||
--disable-silent-rules"
|
||||
--disable-silent-rules \
|
||||
--disable-wifi \
|
||||
--enable-iwd"
|
||||
|
||||
if [ "${WIREGUARD_SUPPORT}" = "yes" ]; then
|
||||
PKG_CONFIGURE_OPTS_TARGET+=" --enable-wireguard=builtin"
|
||||
@ -50,20 +52,6 @@ else
|
||||
PKG_CONFIGURE_OPTS_TARGET+=" --disable-wireguard"
|
||||
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 \
|
||||
vpn_storagedir=/storage/.config/wireguard \
|
||||
statedir=/run/connman"
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
CONFIG_CTRL_IFACE=y
|
||||
CONFIG_CTRL_IFACE_DBUS=y
|
||||
CONFIG_CTRL_IFACE_DBUS_NEW=y
|
||||
CONFIG_CTRL_IFACE_DBUS_INTRO=y
|
||||
CONFIG_DRIVER_WEXT=y
|
||||
CONFIG_LIBNL32=y
|
||||
CONFIG_DRIVER_NL80211=y
|
||||
CONFIG_DRIVER_WIRED=y
|
||||
CONFIG_IEEE8021X_EAPOL=y
|
||||
CONFIG_EAP_MD5=y
|
||||
CONFIG_EAP_MSCHAPV2=y
|
||||
CONFIG_EAP_TLS=y
|
||||
CONFIG_EAP_PEAP=y
|
||||
CONFIG_EAP_TTLS=y
|
||||
CONFIG_EAP_PSK=y
|
||||
CONFIG_EAP_FAST=y
|
||||
CONFIG_EAP_GTC=y
|
||||
CONFIG_EAP_OTP=y
|
||||
CONFIG_EAP_AKA=y
|
||||
CONFIG_EAP_PAX=y
|
||||
CONFIG_EAP_LEAP=y
|
||||
CONFIG_EAP_SAKE=y
|
||||
CONFIG_EAP_GPSK=y
|
||||
CONFIG_EAP_GPSK_SHA256=y
|
||||
CONFIG_EAP_TNC=y
|
||||
CONFIG_WPS=y
|
||||
CONFIG_EAP_IKEV2=y
|
||||
CONFIG_PKCS12=y
|
||||
CONFIG_SMARTCARD=y
|
||||
CONFIG_DEBUG_FILE=y
|
||||
CONFIG_BACKEND=file
|
||||
CONFIG_PEERKEY=y
|
||||
CONFIG_BGSCAN_SIMPLE=y
|
||||
CONFIG_AP=y
|
||||
#CONFIG_FIPS=y
|
||||
@ -1,36 +0,0 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
|
||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="wpa_supplicant"
|
||||
PKG_VERSION="2.10"
|
||||
PKG_SHA256="20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="https://w1.fi/wpa_supplicant/"
|
||||
PKG_URL="https://w1.fi/releases/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
PKG_DEPENDS_TARGET="toolchain dbus libnl openssl"
|
||||
PKG_LONGDESC="A free software implementation of an IEEE 802.11i supplicant."
|
||||
PKG_TOOLCHAIN="make"
|
||||
PKG_BUILD_FLAGS="+lto-parallel"
|
||||
|
||||
PKG_MAKE_OPTS_TARGET="-C wpa_supplicant V=1 LIBDIR=/usr/lib BINDIR=/usr/bin"
|
||||
PKG_MAKEINSTALL_OPTS_TARGET="-C wpa_supplicant V=1 LIBDIR=/usr/lib BINDIR=/usr/bin"
|
||||
|
||||
configure_target() {
|
||||
LDFLAGS+=" -lpthread -lm"
|
||||
|
||||
cp ${PKG_DIR}/config/makefile.config wpa_supplicant/.config
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
rm -r ${INSTALL}/usr/bin/wpa_cli
|
||||
|
||||
mkdir -p ${INSTALL}/etc/dbus-1/system.d
|
||||
cp wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${INSTALL}/etc/dbus-1/system.d
|
||||
|
||||
mkdir -p ${INSTALL}/usr/lib/systemd/system
|
||||
cp wpa_supplicant/systemd/wpa_supplicant.service ${INSTALL}/usr/lib/systemd/system
|
||||
|
||||
mkdir -p ${INSTALL}/usr/share/dbus-1/system-services
|
||||
cp wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service ${INSTALL}/usr/share/dbus-1/system-services
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
diff -Naur wpa_supplicant-2.4/src/drivers/drivers.mk wpa_supplicant-2.4.patch/src/drivers/drivers.mk
|
||||
--- wpa_supplicant-2.4/src/drivers/drivers.mk 2015-03-15 18:30:39.000000000 +0100
|
||||
+++ wpa_supplicant-2.4.patch/src/drivers/drivers.mk 2015-03-17 13:16:01.390789977 +0100
|
||||
@@ -35,7 +35,7 @@
|
||||
ifdef CONFIG_LIBNL32
|
||||
DRV_LIBS += -lnl-3
|
||||
DRV_LIBS += -lnl-genl-3
|
||||
- DRV_CFLAGS += -I/usr/include/libnl3
|
||||
+ DRV_CFLAGS += `pkg-config --cflags libnl-3.0`
|
||||
ifdef CONFIG_LIBNL3_ROUTE
|
||||
DRV_LIBS += -lnl-route-3
|
||||
DRV_CFLAGS += -DCONFIG_LIBNL3_ROUTE
|
||||
Loading…
x
Reference in New Issue
Block a user