summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2023-01-05 18:42:30 -0600
committerJohn Klug <john.klug@multitech.com>2023-01-06 09:07:24 -0600
commitd861162794bbc452a10683d083143138416f54d1 (patch)
treeee4343a95e82ed808091257579639096e5434b4b
parent4235cda131ed46945025bbdaa7f23d0204d117b7 (diff)
downloadmeta-mlinux-d861162794bbc452a10683d083143138416f54d1.tar.gz
meta-mlinux-d861162794bbc452a10683d083143138416f54d1.tar.bz2
meta-mlinux-d861162794bbc452a10683d083143138416f54d1.zip
Remove cfg80211.conf, since country code is moved to /etc/default/rs9113
-rw-r--r--recipes-connectivity/hostapd/hostapd_%.bbappend13
1 files changed, 4 insertions, 9 deletions
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