From 4f9862d495a1c51206689373a38eb66771790f03 Mon Sep 17 00:00:00 2001 From: j1nx Date: Tue, 21 Jul 2020 09:33:46 +0200 Subject: [PATCH] MycroftOS: Remove wifi-ap in favor of wifi-connect. --- buildroot-external/Config.in | 1 - buildroot-external/package/wifi-ap/Config.in | 7 ----- .../package/wifi-ap/dnsmasq.service | 15 --------- .../package/wifi-ap/nginx.service | 18 ----------- buildroot-external/package/wifi-ap/wifi-ap.mk | 31 ------------------- .../package/wifi-ap/wifi-setup.service | 14 --------- .../package/wifi-ap/wpa_supplicant-ap0.conf | 8 ----- .../wifi-ap/wpa_supplicant@ap0.service | 16 ---------- 8 files changed, 110 deletions(-) delete mode 100644 buildroot-external/package/wifi-ap/Config.in delete mode 100644 buildroot-external/package/wifi-ap/dnsmasq.service delete mode 100644 buildroot-external/package/wifi-ap/nginx.service delete mode 100644 buildroot-external/package/wifi-ap/wifi-ap.mk delete mode 100644 buildroot-external/package/wifi-ap/wifi-setup.service delete mode 100644 buildroot-external/package/wifi-ap/wpa_supplicant-ap0.conf delete mode 100644 buildroot-external/package/wifi-ap/wpa_supplicant@ap0.service diff --git a/buildroot-external/Config.in b/buildroot-external/Config.in index 9c359620..12da0c6e 100644 --- a/buildroot-external/Config.in +++ b/buildroot-external/Config.in @@ -6,7 +6,6 @@ menu "Mycroft A.I. Personal Assistant" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/mycroft-gui-embedded/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/mycroft-service/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/mycroft-splash/Config.in" - source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/wifi-ap/Config.in" menu "Additional drivers, libraries and/or applications" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/alsa-plugins/Config.in" source "$BR2_EXTERNAL_MYCROFTOS_PATH/package/baresip/Config.in" diff --git a/buildroot-external/package/wifi-ap/Config.in b/buildroot-external/package/wifi-ap/Config.in deleted file mode 100644 index 239b5b04..00000000 --- a/buildroot-external/package/wifi-ap/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_WIFI_AP - bool "wifi-ap" - help - Start a wifi AP when there is no wifi - configuration present. - - https://www.j1nx.nl diff --git a/buildroot-external/package/wifi-ap/dnsmasq.service b/buildroot-external/package/wifi-ap/dnsmasq.service deleted file mode 100644 index f66611ce..00000000 --- a/buildroot-external/package/wifi-ap/dnsmasq.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=Small DNS server to resolve everything to the AP interface. -BindsTo=sys-subsystem-net-devices-ap0.device -After=sys-subsystem-net-devices-ap0.device -Before=network.target -Wants=network.target - -[Service] -ExecStart=/usr/sbin/dnsmasq -k --conf-file=/etc/dnsmasq.conf -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-failure -RestartSec=5 - -[Install] -WantedBy=sys-subsystem-net-devices-ap0.device diff --git a/buildroot-external/package/wifi-ap/nginx.service b/buildroot-external/package/wifi-ap/nginx.service deleted file mode 100644 index c6c730ec..00000000 --- a/buildroot-external/package/wifi-ap/nginx.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=A high performance web server and a reverse proxy server -BindsTo=sys-subsystem-net-devices-ap0.device -After=sys-subsystem-net-devices-ap0.device wpa_supplicant@ap0.service - -[Service] -Type=forking -PIDFile=/var/run/nginx.pid -ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx -ExecStartPre=/usr/bin/sleep 5 -ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -ExecStart=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -ExecReload=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -s reload -ExecStop=/usr/sbin/nginx -g 'pid /var/run/nginx.pid;' -s quit -PrivateDevices=yes - -[Install] -WantedBy=wpa_supplicant@ap0.service diff --git a/buildroot-external/package/wifi-ap/wifi-ap.mk b/buildroot-external/package/wifi-ap/wifi-ap.mk deleted file mode 100644 index 1ce26407..00000000 --- a/buildroot-external/package/wifi-ap/wifi-ap.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# wifi-ap -# -################################################################################ - -WIFI_AP_VERSION = 0.1.0 -WIFI_AP_SITE = $(BR2_EXTERNAL_MYCROFTOS_PATH)/package/wifi-ap -WIFI_AP_SITE_METHOD = local -WIFI_AP_LICENSE = Apache License 2.0 -WIFI_AP_LICENSE_FILES = LICENSE - -define WIFI_AP_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/etc/wpa_supplicant - $(INSTALL) -m 644 -D $(@D)/wpa_supplicant-ap0.conf \ - $(TARGET_DIR)/etc/wpa_supplicant/wpa_supplicant-ap0.conf - - $(INSTALL) -D -m 644 $(@D)/wpa_supplicant@ap0.service \ - $(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant@ap0.service - - $(INSTALL) -D -m 644 $(@D)/wifi-setup.service \ - $(TARGET_DIR)/usr/lib/systemd/system/wifi-setup.service - - $(INSTALL) -D -m 644 $(@D)/dnsmasq.service \ - $(TARGET_DIR)/usr/lib/systemd/system/dnsmasq.service - - $(INSTALL) -D -m 644 $(@D)/nginx.service \ - $(TARGET_DIR)/usr/lib/systemd/system/nginx.service -endef - -$(eval $(generic-package)) diff --git a/buildroot-external/package/wifi-ap/wifi-setup.service b/buildroot-external/package/wifi-ap/wifi-setup.service deleted file mode 100644 index 4a14c5aa..00000000 --- a/buildroot-external/package/wifi-ap/wifi-setup.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=MycroftOS WiFi Setup - webbased configurator -After=wpa_supplicant@ap0.service -Wants=wpa_supplicant@ap0.service -Before=network.target -Wants=network.target - -[Service] -Type=idle -WorkingDirectory=/opt/mycroft/wifisetup -ExecStart=/usr/bin/python3 app.py > /dev/null 2>&1 - -[Install] -WantedBy=wpa_supplicant@ap0.service diff --git a/buildroot-external/package/wifi-ap/wpa_supplicant-ap0.conf b/buildroot-external/package/wifi-ap/wpa_supplicant-ap0.conf deleted file mode 100644 index 23279643..00000000 --- a/buildroot-external/package/wifi-ap/wpa_supplicant-ap0.conf +++ /dev/null @@ -1,8 +0,0 @@ -ctrl_interface=/var/run/wpa_supplicant -update_config=1 - -network={ - ssid="MYCROFT" - mode=2 - key_mgmt=NONE -} diff --git a/buildroot-external/package/wifi-ap/wpa_supplicant@ap0.service b/buildroot-external/package/wifi-ap/wpa_supplicant@ap0.service deleted file mode 100644 index 3978b42c..00000000 --- a/buildroot-external/package/wifi-ap/wpa_supplicant@ap0.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=WPA supplicant daemon (interface-specific version) -Requires=sys-subsystem-net-devices-wlan0.device -After=sys-subsystem-net-devices-wlan0.device -Conflicts=wpa_supplicant@wlan0.service -Before=network.target -Wants=network.target - -[Service] -Type=simple -ExecStartPre=/usr/sbin/iw dev wlan0 interface add ap0 type __ap -ExecStart=/usr/sbin/wpa_supplicant -c/etc/wpa_supplicant/wpa_supplicant-ap0.conf -Dnl80211,wext -iap0 -ExecStopPost=/usr/sbin/iw dev ap0 del - -[Install] -Alias=multi-user.target.wants/wpa_supplicant@%i.service