[rdkb][mt7986][app][Refactor hostapd service]
[Description]
Refactor hostapd service
1. move mac80211.sh from init-filogic to hostapd, and will run before hostapd.service
2. refactor hostapd-init.sh, it will accroding to uci wireless config to gen config and bring up interface
3. remove unused hostapd config, such like hostapd-bhaul2G.conf
4. separate init brlan0 part from hostapd-init.sh and create init-Lanbridge.service to handle
[Release-log]
diff --git a/recipes-connectivity/hostapd/hostapd_2.10.bb b/recipes-connectivity/hostapd/hostapd_2.10.bb
index 7497f07..235315d 100644
--- a/recipes-connectivity/hostapd/hostapd_2.10.bb
+++ b/recipes-connectivity/hostapd/hostapd_2.10.bb
@@ -18,10 +18,13 @@
file://hostapd-full.config \
file://hostapd-2G.conf \
file://hostapd-5G.conf \
- file://hostapd-bhaul2G.conf \
- file://hostapd-bhaul5G.conf \
+ file://hostapd-6G.conf \
+ file://hostapd-5G-7915.conf \
+ file://hostapd-5G-7916.conf \
file://hostapd.service \
file://hostapd-init.sh \
+ file://mac80211.sh \
+ file://init-uci-config.service \
file://src \
file://001-rdkb-remove-ubus-support.patch;apply=no \
"
@@ -35,6 +38,7 @@
SYSTEMD_AUTO_ENABLE_${PN} = "enable"
SYSTEMD_SERVICE_${PN} = "hostapd.service"
+SYSTEMD_SERVICE_${PN} += " init-uci-config.service"
do_unpack_append() {
bb.build.exec_func('do_copy_openwrt_src', d)
@@ -65,13 +69,6 @@
echo "CONFIG_FILS=y" >> ${B}/.config
}
-SRC_URI_append_mt7915 += " \
- file://hostapd-5G-7915.conf \
-"
-do_configure_append_mt7915() {
- ln -sf ${WORKDIR}/hostapd-5G-7915.conf ${WORKDIR}/hostapd-5G.conf
-}
-
do_filogic_patches() {
cd ${S}
if [ ! -e patch_applied ]; then
@@ -94,17 +91,22 @@
install -m 0755 ${B}/hostapd_cli ${D}${sbindir}
install -m 0644 ${WORKDIR}/hostapd-2G.conf ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/hostapd-5G.conf ${D}${sysconfdir}
- install -m 0644 ${WORKDIR}/hostapd-bhaul2G.conf ${D}${sysconfdir}
- install -m 0644 ${WORKDIR}/hostapd-bhaul5G.conf ${D}${sysconfdir}
+ install -m 0644 ${WORKDIR}/hostapd-6G.conf ${D}${sysconfdir}
+ install -m 0644 ${WORKDIR}/hostapd-5G-7915.conf ${D}${sysconfdir}
+ install -m 0644 ${WORKDIR}/hostapd-5G-7916.conf ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/hostapd.service ${D}${systemd_unitdir}/system
install -m 0755 ${WORKDIR}/hostapd-init.sh ${D}${base_libdir}/rdk
+ install -m 0644 ${WORKDIR}/init-uci-config.service ${D}${systemd_unitdir}/system
+ install -m 0755 ${WORKDIR}/mac80211.sh ${D}${sbindir}
}
FILES_${PN} += " \
${systemd_unitdir}/system/hostapd.service \
${sysconfdir}/hostapd-2G.conf \
${sysconfdir}/hostapd-5G.conf \
- ${sysconfdir}/hostapd-bhaul2G.conf \
- ${sysconfdir}/hostapd-bhaul5G.conf \
+ ${sysconfdir}/hostapd-6G.conf \
+ ${sysconfdir}/hostapd-5G-7915.conf \
+ ${sysconfdir}/hostapd-5G-7916.conf \
${base_libdir}/rdk/hostapd-init.sh \
+ ${systemd_unitdir}/system/init-uci-config.service \
"