rixty
/
OpenVoiceOS
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS
1
1
Fork 0
Code Issues Releases Wiki Activity

MycroftOS: Fix wifi.

This commit is contained in:
Peter Steenbergen 2019-12-20 21:05:12 +01:00
parent 9cfca493ac
commit ef7f547531
6 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildroot-external/configs/rpi3_defconfig
View File

@ -219,6 +219,7 @@ BR2_PACKAGE_LIBOPENSSL_ENGINES=y
BR2_PACKAGE_LIBCONFIG=y
BR2_PACKAGE_LIBNFS=y
BR2_PACKAGE_LIBRSVG=y
BR2_PACKAGE_LIBGUDEV=y
BR2_PACKAGE_MRAA=y
BR2_PACKAGE_WIRINGPI=y
BR2_PACKAGE_LIBASS=y
@ -236,6 +237,7 @@ BR2_PACKAGE_C_ARES=y
BR2_PACKAGE_LIBCURL=y
BR2_PACKAGE_CURL=y
BR2_PACKAGE_LIBHTTPPARSER=y
BR2_PACKAGE_LIBNDP=y
BR2_PACKAGE_LIBTIRPC=y
BR2_PACKAGE_NGHTTP2=y
BR2_PACKAGE_LIBUV=y
@ -248,17 +250,15 @@ BR2_PACKAGE_PCRE2_16=y
BR2_PACKAGE_PCRE2_32=y
BR2_PACKAGE_AVAHI=y
BR2_PACKAGE_CRDA=y
BR2_PACKAGE_IFUPDOWN=y
BR2_PACKAGE_IPTABLES=y
BR2_PACKAGE_IW=y
BR2_PACKAGE_NTP=y
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_WGET=y
BR2_PACKAGE_WIRELESS_TOOLS=y
BR2_PACKAGE_WIRELESS_TOOLS_LIB=y
BR2_PACKAGE_WPA_SUPPLICANT=y
BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y
BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y

6
buildroot-external/package/prepare_system-service/prepare_system
View File

@ -19,3 +19,9 @@ ln -s /etc/pulse/pulseaudio-system.pa /etc/pulse/system.pa
ln -s /etc/pulse/pulseaudio-daemon.conf /etc/pulse/daemon.conf
export LC_ALL="C"
mkdir -p /etc/wpa_supplicant
if [ -f "/boot/wpa_supplicant.conf" ]; then
mv /boot/wpa_supplicant.conf /etc/wpa_supplicant/wpa_supplicant-wlan0.conf
chmod 600 /etc/wpa_supplicant/wpa_supplicant-wlan0.conf
fi

11
buildroot-external/rootfs-overlay/etc/network/interfaces
View File

@ -2,14 +2,3 @@
auto lo
iface lo inet loopback
auto eth0
iface eth0 inet dhcp
pre-up /etc/network/nfs_check
wait-delay 15
auto wlan0
iface wlan0 inet dhcp
pre-up wpa_supplicant -B -Dnl80211 -iwlan0 -c/etc/wpa_supplicant.conf
post-down killall -q wpa_supplicant
wait-delay 15

6
buildroot-external/rootfs-overlay/etc/systemd/network/dhcp.network Normal file
View File

@ -0,0 +1,6 @@
[Match]
Name=eth0
[Network]
DHCP=ipv4
[DHCP]
RouteMetric=10

6
buildroot-external/rootfs-overlay/etc/systemd/network/wifi.network Normal file
View File

@ -0,0 +1,6 @@
[Match]
Name=wlan0
[Network]
DHCP=ipv4
[DHCP]
RouteMetric=20

25
buildroot-patches/0028-Enable-systemd-wifi-wlan0-by-default.patch Normal file
View File

@ -0,0 +1,25 @@
From 66fde29524de8b91eb6b8f3827e1c82e09a0dd54 Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Fri, 20 Dec 2019 19:13:19 +0100
Subject: [PATCH 1/1] Enable systemd wifi wlan0 by default.
---
package/wpa_supplicant/wpa_supplicant.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index a518ecc217..18ccf25fe5 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -232,6 +232,8 @@ define WPA_SUPPLICANT_INSTALL_INIT_SYSTEMD
$(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant.service
$(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/systemd/wpa_supplicant@.service \
$(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant@.service
+ ln -fs ../../../../usr/lib/systemd/system/wpa_supplicant@.service \
+ $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/wpa_supplicant@wlan0.service
$(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/systemd/wpa_supplicant-nl80211@.service \
$(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant-nl80211@.service
$(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/systemd/wpa_supplicant-wired@.service \
--
2.24.0.rc1