From fce7feae79990506c86be483d6eab7920a03228f Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Tue, 18 Aug 2020 18:56:13 -0500
Subject: Put configuration files into hostadp-cfg

---
 recipes-connectivity/hostapd/hostapd_%.bbappend | 29 ++++++++++++++++++-------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'recipes-connectivity')

diff --git a/recipes-connectivity/hostapd/hostapd_%.bbappend b/recipes-connectivity/hostapd/hostapd_%.bbappend
index 3d8ad14..3c69a72 100644
--- a/recipes-connectivity/hostapd/hostapd_%.bbappend
+++ b/recipes-connectivity/hostapd/hostapd_%.bbappend
@@ -22,28 +22,41 @@ do_install() {
     install -m 0755 ${B}/hostapd_cli ${D}${sbindir}
     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/hostap-daemon
-    install -m 0444 ${WORKDIR}/WiFi-SSID ${D}/usr/share/hostap-daemon/WiFi-SSID.patch
+    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
     install -m 0744 ${WORKDIR}/setchan ${D}/usr/local/bin
 }
 
+# ${PN}-extra sets a unique SSID name, and has a channel setting utility
 PACKAGES =+ "${PN}-extra ${PN}-cfg"
 RDEPENDS_${PN}-extra = "${PN}-cfg bash"
 
-FILES_${PN}-extra = "/usr/local/bin/* /usr/share/hostap-daemon/WiFi-SSID.patch"
+FILES_${PN}-extra = "/usr/local/bin/* /usr/share/hostapd/WiFi-SSID.patch"
+
+# initscripts are unique to mLinux so put into ${PN}-cfg
+INITSCRIPT_NAME_${PN}-cfg = "hostapd"
+SYSTEMD_SERVICE_${PN}-cfg = "hostapd.service"
+SYSTEMD_AUTO_ENABLE_${PN}-cfg = "disable"
+INITSCRIPT_PACKAGES = "${PN}-cfg"
+SYSTEMD_PACKAGES = "${PN}-cfg"
+INITSCRIPT_NAME = ""
+SYSTEMD_SERVICE_${PN} = ""
+SYSTEMD_AUTO_ENABLE_${PN} = ""
+SYSTEMD_SERVICE_${PN}-cfg = "hostapd.service"
+SYSTEMD_AUTO_ENABLE_${PN}-cfg = "disable"
 
 # mLinux files
 FILES_${PN}-cfg = "/etc/init.d/hostapd /etc/default/hostapd /etc/hostapd.conf"
 
-pkg_postinst_${PN}-bt-name() {
+pkg_postinst_${PN}-extra() {
 	cd /$D
-	patch -Np1 < $D/usr/share/hostap-daemon/WiFi-SSID.patch
+	patch -Np1 < $D/usr/share/hostapd/WiFi-SSID.patch
 }
 
-pkg_prerm_${PN}-bt-name() {
+pkg_prerm_${PN}-extra() {
 	cd /$D
-	patch -Rp1 < $D/usr/share/hostap-daemon/WiFi-SSID.patch
+	patch -Rp1 < $D/usr/share/hostapd/WiFi-SSID.patch
 }
-- 
cgit v1.2.3