From d861162794bbc452a10683d083143138416f54d1 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Thu, 5 Jan 2023 18:42:30 -0600
Subject: Remove cfg80211.conf, since country code is moved to
 /etc/default/rs9113

---
 recipes-connectivity/hostapd/hostapd_%.bbappend | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'recipes-connectivity')

diff --git a/recipes-connectivity/hostapd/hostapd_%.bbappend b/recipes-connectivity/hostapd/hostapd_%.bbappend
index c8f8fab..d14587a 100644
--- a/recipes-connectivity/hostapd/hostapd_%.bbappend
+++ b/recipes-connectivity/hostapd/hostapd_%.bbappend
@@ -1,16 +1,12 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-PR = "m2"
-
-do_install_append() {
-	install -d ${D}{sysconfdir}/modprobe.d
-	install -m 644 -D ${WORKDIR}/cfg80211.conf ${D}${sysconfdir}/modprobe.d/cfg80211.conf
-}
+# cfg80211 should be configured when loading wifi
+# modules using a regulatory database, not here.
+PR = "m3"
 
 
 # -p option is striplevel
-SRC_URI += " file://cfg80211.conf \
-           file://WiFi-SSID \
+SRC_URI += " file://WiFi-SSID \
            file://setchan \
            file://default \
            file://init \
@@ -26,7 +22,6 @@ do_install() {
     install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd
     install -m 755 ${WORKDIR}/default ${D}${sysconfdir}/default/hostapd
 
-    install -m 644 -D ${WORKDIR}/cfg80211.conf ${D}${sysconfdir}/modprobe.d/cfg80211.conf
     install -d ${D}/usr/share/hostapd
     install -m 0444 ${WORKDIR}/WiFi-SSID ${D}/usr/share/hostapd/WiFi-SSID.patch
     install -d ${D}/usr/local/bin
-- 
cgit v1.2.3