wpa_supplicant-full.config: do not use libnl-tiny

Signed-off-by: Ramon Moesching <ramon.moesching@netmodule.com>

conf/layer.conf

@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "netmodule-wlan"
 BBFILE_PATTERN_netmodule-wlan = "^${LAYERDIR}/"
-BBFILE_PRIORITY_netmodule-wlan = "9"
+BBFILE_PRIORITY_netmodule-wlan = "11"
 
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers

recipes-connectivity/hostapd/files/hostapd-full.config

@@ -34,7 +34,7 @@ CONFIG_DRIVER_NL80211=y
 # CONFIG_LIBNL32=y
 
 # Use libnl-tiny
-CONFIG_LIBNL_TINY=y
+#CONFIG_LIBNL_TINY=y
 
 # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
 #CONFIG_DRIVER_BSD=y

recipes-connectivity/hostapd/files/wpa_supplicant-full.config

@@ -50,7 +50,7 @@ CONFIG_DRIVER_NL80211=y
 # CONFIG_LIBNL32=y
 
 # Use libnl-tiny
-CONFIG_LIBNL_TINY=y
+#CONFIG_LIBNL_TINY=y
 
 # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
 #CONFIG_DRIVER_BSD=y

recipes-connectivity/hostapd/hostapd.inc

@@ -5,7 +5,9 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=279b4f5abb9c153c285221855ddb78cc \
                     file://README;beginline=1;endline=56;md5=e7d3dbb01f75f0b9799e192731d1e1ff \
                     file://wpa_supplicant/wpa_supplicant.c;beginline=1;endline=12;md5=0a8b56d3543498b742b9c0e94cc2d18b"
-DEPENDS = "libnl-tiny"
+
+DEPENDS = "libnl dbus"
+
 PACKAGECONFIG ??= "gnutls"
 PACKAGECONFIG[gnutls] = ",,gnutls libgcrypt"
 PACKAGECONFIG[openssl] = ",,openssl"
@@ -80,11 +82,7 @@ S = "${WORKDIR}/git"
 
 export EXTRA_CFLAGS = " \
     ${CFLAGS} \
-    -I${STAGING_DIR_TARGET}/usr/include/libnl-tiny \
+    -I${STAGING_DIR_TARGET}/usr/include/libnl3 \
-    -lnl-tiny \
-    -DCONFIG_LIBNL20 \
-    -DCONFIG_LIBNL_TINY \
-    -D_GNU_SOURCE \
 "
 LDFLAGS += " -Wl,--gc-sections"
 

recipes-connectivity/iw/iw_5.4.bb

@@ -7,7 +7,7 @@ SECTION = "base"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=878618a5c4af25e9b93ef0be1a93f774"
 
-DEPENDS = "libnl-tiny"
+DEPENDS = "libnl"
 
 SRC_URI = "http://www.kernel.org/pub/software/network/iw/${BP}.tar.xz \
            file://0001-Remove-obsolete-library.patch \
@@ -26,10 +26,10 @@ SRC_URI[sha256sum] = "a2469f677088d7b1070a7fbb28f3c747041697e8f6ec70783339cb1bc2
 
 inherit pkgconfig
 
-CFLAGS += "-I${STAGING_DIR_TARGET}/usr/include/libnl-tiny -lnl-tiny -DCONFIG_LIBNL20 -D_GNU_SOURCE"
+#CFLAGS += "-I${STAGING_DIR_TARGET}/usr/include/libnl -lnl -DCONFIG_LIBNL20 -D_GNU_SOURCE"
-LDFLAGS += " -Wl,--gc-sections"
+#LDFLAGS += " -Wl,--gc-sections"
 
-CFLAGS_remove += "-lnl-genl"
+#CFLAGS_remove += "-lnl-genl"
 
 EXTRA_OEMAKE = "\
     -f '${S}/Makefile' \
@@ -37,9 +37,6 @@ EXTRA_OEMAKE = "\
     'PREFIX=${prefix}' \
     'SBINDIR=${sbindir}' \
     'MANDIR=${mandir}' \
-    'NLLIBNAME=libnl-tiny' \
-    'NL1FOUND=""' \
-    'NL2FOUND=Y' \
 "
 
 do_compile() {

recipes-kernel/mac80211/mac80211_5.4.27-1.bb

@@ -19,6 +19,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/projects/backports/stable/v${S
            file://0005-backport-of-mwl-patches-from-openwrt.patch \
            file://0006-backport-of-brcm-patches-from-openwrt.patch \
            file://0007-backport-of-netmodule-patches-from-openwrt.patch \
+           file://config.netbird \
            "
 
 SRC_URI[sha256sum] = "2b060db29386c6f3fb178df33e0b8256703b7e90f7e3799e8b5a26330ca6fc1e"
@@ -30,10 +31,11 @@ DEPENDS += "coreutils-native flex-native bison-native"
 
 EXTRA_OEMAKE = "KLIB_BUILD=${STAGING_KERNEL_BUILDDIR} KLIB=${base_libdir}/modules/${KERNEL_VERSION}"
 KCONFIG_CONFIG_COMMAND = "${EXTRA_OEMAKE} CC=${BUILD_CC} menuconfig"
+export LEX = "flex"
 
 MAKE_TARGETS = "modules"
 
-PACKAGE_CONFIGFILE ?= ""
+PACKAGE_CONFIGFILE ?= "config.netbird"
 do_configure_prepend() {
 	# Make sure kconf is built to run on the host
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS