From 1d23c603d7dd566bd8bb3b5192ae195f87e42c12 Mon Sep 17 00:00:00 2001 From: Ramon Moesching Date: Wed, 28 Oct 2020 16:35:44 +0100 Subject: [PATCH] hostapd: remove recipe, use meta-netmodule-wlan layer hostapd is now maintained by meta-netmodule-wlan layer BugzID: 67576 Signed-off-by: Ramon Moesching --- .../hostapd/hostapd/defconfig | 150 ------------------ .../hostapd/hostapd/force-40mhz.patch | 26 --- .../hostapd/hostapd_%.bbappend | 5 - 3 files changed, 181 deletions(-) delete mode 100644 recipes-connectivity/hostapd/hostapd/defconfig delete mode 100644 recipes-connectivity/hostapd/hostapd/force-40mhz.patch delete mode 100644 recipes-connectivity/hostapd/hostapd_%.bbappend diff --git a/recipes-connectivity/hostapd/hostapd/defconfig b/recipes-connectivity/hostapd/hostapd/defconfig deleted file mode 100644 index f701c12..0000000 --- a/recipes-connectivity/hostapd/hostapd/defconfig +++ /dev/null @@ -1,150 +0,0 @@ -# Example hostapd build time configuration -# -# This file lists the configuration options that are used when building the -# hostapd binary. All lines starting with # are ignored. Configuration option -# lines must be commented out complete, if they are not to be included, i.e., -# just setting VARIABLE=n is not disabling that variable. -# -# This file is included in Makefile, so variables like CFLAGS and LIBS can also -# be modified from here. In most cass, these lines should use += in order not -# to override previous values of the variables. - -# Driver interface for Host AP driver -CONFIG_DRIVER_HOSTAP=y - -# Driver interface for wired authenticator -CONFIG_DRIVER_WIRED=y - -# Driver interface for madwifi driver -#CONFIG_DRIVER_MADWIFI=y -#CFLAGS += -I../../madwifi # change to the madwifi source directory - -# Driver interface for Prism54 driver -CONFIG_DRIVER_PRISM54=y - -# Driver interface for drivers using the nl80211 kernel interface -CONFIG_DRIVER_NL80211=y -CONFIG_LIBNL32=y -# driver_nl80211.c requires a rather new libnl (version 1.1) which may not be -# shipped with your distribution yet. If that is the case, you need to build -# newer libnl version and point the hostapd build to use it. -#LIBNL=/usr/src/libnl -#CFLAGS += -I$(LIBNL)/include -#LIBS += -L$(LIBNL)/lib - -# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) -#CONFIG_DRIVER_BSD=y -#CFLAGS += -I/usr/local/include -#LIBS += -L/usr/local/lib - -# Driver interface for no driver (e.g., RADIUS server only) -#CONFIG_DRIVER_NONE=y - -# IEEE 802.11F/IAPP -CONFIG_IAPP=y - -# WPA2/IEEE 802.11i RSN pre-authentication -CONFIG_RSN_PREAUTH=y - -# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) -CONFIG_PEERKEY=y - -# IEEE 802.11w (management frame protection) -# This version is an experimental implementation based on IEEE 802.11w/D1.0 -# draft and is subject to change since the standard has not yet been finalized. -# Driver support is also needed for IEEE 802.11w. -#CONFIG_IEEE80211W=y - -# Integrated EAP server -CONFIG_EAP=y - -# EAP-MD5 for the integrated EAP server -CONFIG_EAP_MD5=y - -# EAP-TLS for the integrated EAP server -CONFIG_EAP_TLS=y - -# EAP-MSCHAPv2 for the integrated EAP server -CONFIG_EAP_MSCHAPV2=y - -# EAP-PEAP for the integrated EAP server -CONFIG_EAP_PEAP=y - -# EAP-GTC for the integrated EAP server -CONFIG_EAP_GTC=y - -# EAP-TTLS for the integrated EAP server -CONFIG_EAP_TTLS=y - -# EAP-SIM for the integrated EAP server -#CONFIG_EAP_SIM=y - -# EAP-AKA for the integrated EAP server -#CONFIG_EAP_AKA=y - -# EAP-AKA' for the integrated EAP server -# This requires CONFIG_EAP_AKA to be enabled, too. -#CONFIG_EAP_AKA_PRIME=y - -# EAP-PAX for the integrated EAP server -#CONFIG_EAP_PAX=y - -# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK) -#CONFIG_EAP_PSK=y - -# EAP-SAKE for the integrated EAP server -#CONFIG_EAP_SAKE=y - -# EAP-GPSK for the integrated EAP server -#CONFIG_EAP_GPSK=y -# Include support for optional SHA256 cipher suite in EAP-GPSK -#CONFIG_EAP_GPSK_SHA256=y - -# EAP-FAST for the integrated EAP server -# Note: Default OpenSSL package does not include support for all the -# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL, -# the OpenSSL library must be patched (openssl-0.9.9-session-ticket.patch) -# to add the needed functions. -#CONFIG_EAP_FAST=y - -# Wi-Fi Protected Setup (WPS) -CONFIG_WPS=y -# Enable UPnP support for external WPS Registrars -#CONFIG_WPS_UPNP=y - -# EAP-IKEv2 -#CONFIG_EAP_IKEV2=y - -# Trusted Network Connect (EAP-TNC) -#CONFIG_EAP_TNC=y - -# PKCS#12 (PFX) support (used to read private key and certificate file from -# a file that usually has extension .p12 or .pfx) -CONFIG_PKCS12=y - -# RADIUS authentication server. This provides access to the integrated EAP -# server from external hosts using RADIUS. -CONFIG_RADIUS_SERVER=y - -# Build IPv6 support for RADIUS operations -CONFIG_IPV6=y - -# IEEE Std 802.11r-2008 (Fast BSS Transition) -#CONFIG_IEEE80211R=y - -# Use the hostapd's IEEE 802.11 authentication (ACL), but without -# the IEEE 802.11 Management capability (e.g., madwifi or FreeBSD/net80211) -CONFIG_DRIVER_RADIUS_ACL=y - -# IEEE 802.11n (High Throughput) support -CONFIG_IEEE80211N=y - -# IEEE 802.11ac support -CONFIG_IEEE80211AC=y - -CONFIG_ACS=y - -# Remove debugging code that is printing out debug messages to stdout. -# This can be used to reduce the size of the hostapd considerably if debugging -# code is not needed. -#CONFIG_NO_STDOUT_DEBUG=y diff --git a/recipes-connectivity/hostapd/hostapd/force-40mhz.patch b/recipes-connectivity/hostapd/hostapd/force-40mhz.patch deleted file mode 100644 index b2404a4..0000000 --- a/recipes-connectivity/hostapd/hostapd/force-40mhz.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/hostapd-2.8/src/ap/hw_features.c b/hostapd-2.8/src/ap/hw_features.c -index 9d3d990..11fee71 100644 ---- a/hostapd-2.8/src/ap/hw_features.c -+++ b/hostapd-2.8/src/ap/hw_features.c -@@ -312,10 +312,12 @@ static void ieee80211n_check_scan(struct hostapd_iface *iface) - iface->secondary_ch = iface->conf->secondary_channel; - if (!oper40) { - wpa_printf(MSG_INFO, "20/40 MHz operation not permitted on " -- "channel pri=%d sec=%d based on overlapping BSSes", -+ "channel pri=%d sec=%d based on overlapping BSSes " -+ "but will force now", - iface->conf->channel, - iface->conf->channel + - iface->conf->secondary_channel * 4); -+#if 0 - iface->conf->secondary_channel = 0; - if (iface->drv_flags & WPA_DRIVER_FLAGS_HT_2040_COEX) { - /* -@@ -324,6 +326,7 @@ static void ieee80211n_check_scan(struct hostapd_iface *iface) - * are received from associating stations. - */ - } -+#endif - } - - res = ieee80211n_allowed_ht40_channel_pair(iface); diff --git a/recipes-connectivity/hostapd/hostapd_%.bbappend b/recipes-connectivity/hostapd/hostapd_%.bbappend deleted file mode 100644 index 15992f6..0000000 --- a/recipes-connectivity/hostapd/hostapd_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI_append = " \ - file://force-40mhz.patch;patchdir=${S}/../ \ - "