From 0b65f57ff804035f3d0395c3a800918769b68fa3 Mon Sep 17 00:00:00 2001
From: j1nx
Date: Tue, 9 Jun 2020 19:48:40 +0200
Subject: [PATCH 1/5] MycroftOS: Prepare for alpha8 release. (Update README)
---
README.md | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 1e3b392d..f3154b65 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,11 @@ More information about the development, process, ideas etc. at https://www.j1nx.
More information about the Mycroft A.I. software stack at https://mycroft.ai
## System.
-- Linux kernel 4.19.106
-- Buildroot 2020.02.0
-- Mycroft 20.02.1
+- MycroftOS - Full 64 Bit distribution
+- Linux kernel 5.4.42
+- Buildroot 2020.02.3
+- Mycroft 20.02.4
+- Mycroft-GUI 1.0+ (latest dev version)
- Raspberry Pi 3|3b|3b+ (Initial development hardware = 3b)
- Raspberry Pi 4 (Current development hardware)
@@ -25,7 +27,7 @@ More information about the Mycroft A.I. software stack at https://mycroft.ai
| I use uptime robot to monitor for things i can't monitor when the connection drops. | If you feel the need, now it's as easy as clicking this button! |
## Getting started.
-At this moment development is in very early stages and focussed on the Raspberry Pi 3B. As soon as an initial first workable version
+At this moment development is in very early stages and focussed on the Raspberry Pi 3B & 4. As soon as an initial first workable version
is created, other hardware might be added.
## Documentation.
From 94b8c0e41e276dffbbb20d7b4cd8ff8575e3b313 Mon Sep 17 00:00:00 2001
From: j1nx
Date: Thu, 11 Jun 2020 15:06:57 +0200
Subject: [PATCH 2/5] MycroftOS: Disable headless wifi-app for now.
---
buildroot-external/configs/rpi4_64-gui_defconfig | 7 +++----
.../usr/lib/systemd/system-preset/10-mycroftos.preset | 3 +--
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig
index 70d9b39f..bf0b6bb5 100644
--- a/buildroot-external/configs/rpi4_64-gui_defconfig
+++ b/buildroot-external/configs/rpi4_64-gui_defconfig
@@ -288,6 +288,9 @@ BR2_PACKAGE_RASPI_GPIO=y
BR2_PACKAGE_SPI_TOOLS=y
BR2_PACKAGE_USBMOUNT=y
BR2_PACKAGE_USBUTILS=y
+BR2_PACKAGE_NODEJS=y
+BR2_PACKAGE_NODEJS_NPM=y
+BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL="node-red"
BR2_PACKAGE_PYTHON3=y
BR2_PACKAGE_PYTHON3_PY_PYC=y
BR2_PACKAGE_PYTHON3_BZIP2=y
@@ -379,7 +382,6 @@ BR2_PACKAGE_LIBOPENH264=y
BR2_PACKAGE_LIBOPUSENC=y
BR2_PACKAGE_X264=y
BR2_PACKAGE_X265=y
-BR2_PACKAGE_C_ARES=y
BR2_PACKAGE_GLIB_NETWORKING=y
BR2_PACKAGE_LIBCURL_CURL=y
BR2_PACKAGE_LIBHTTPPARSER=y
@@ -387,12 +389,10 @@ BR2_PACKAGE_LIBIDN=y
BR2_PACKAGE_LIBMICROHTTPD=y
BR2_PACKAGE_LIBNDP=y
BR2_PACKAGE_LIBSHAIRPLAY=y
-BR2_PACKAGE_NGHTTP2=y
BR2_PACKAGE_BOOST_SYSTEM=y
BR2_PACKAGE_CMOCKA=y
BR2_PACKAGE_ELL=y
BR2_PACKAGE_LIBCAP_NG=y
-BR2_PACKAGE_LIBUV=y
BR2_PACKAGE_LINUX_PAM=y
BR2_PACKAGE_PROTOBUF=y
BR2_PACKAGE_LIBESTR=y
@@ -481,7 +481,6 @@ BR2_PACKAGE_MYCROFT_GUI=y
BR2_PACKAGE_MYCROFT_GUI_EMBEDDED=y
BR2_PACKAGE_MYCROFT_SERVICE=y
BR2_PACKAGE_MYCROFT_SPLASH=y
-BR2_PACKAGE_WIFI_AP=y
BR2_PACKAGE_ALSA_PLUGINS=y
BR2_PACKAGE_BARESIP=y
BR2_PACKAGE_BTSPEAKER=y
diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-mycroftos.preset b/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-mycroftos.preset
index aafd16b3..113182ad 100644
--- a/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-mycroftos.preset
+++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/system-preset/10-mycroftos.preset
@@ -1,4 +1,4 @@
-enable wpa_supplicant@ap0.service
+enable wpa_supplicant@wlan0.service
enable firstboot.service
enable prepare_system.service
@@ -31,4 +31,3 @@ disable snapclient.service
disable snapserver.service
disable spotifyd.service
-disable wpa_supplicant@wlan0.service
From 9186fb58fedf52b120abf82a1a6faa6c3d429d40 Mon Sep 17 00:00:00 2001
From: j1nx
Date: Fri, 12 Jun 2020 09:43:10 +0200
Subject: [PATCH 3/5] MycroftOS: More possible fixes.
---
.../usr/lib/systemd/system-preset/09-wifisetup.preset | 1 -
buildroot-external/configs/rpi4_64-gui_defconfig | 6 +++---
.../package/mycroft-service/mycroft-gui.service | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
delete mode 100644 buildroot-external/board/raspberrypi/rootfs-overlay/usr/lib/systemd/system-preset/09-wifisetup.preset
diff --git a/buildroot-external/board/raspberrypi/rootfs-overlay/usr/lib/systemd/system-preset/09-wifisetup.preset b/buildroot-external/board/raspberrypi/rootfs-overlay/usr/lib/systemd/system-preset/09-wifisetup.preset
deleted file mode 100644
index c18efde0..00000000
--- a/buildroot-external/board/raspberrypi/rootfs-overlay/usr/lib/systemd/system-preset/09-wifisetup.preset
+++ /dev/null
@@ -1 +0,0 @@
-enable wpa_supplicant@ap0.service
diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig
index bf0b6bb5..2afa90dd 100644
--- a/buildroot-external/configs/rpi4_64-gui_defconfig
+++ b/buildroot-external/configs/rpi4_64-gui_defconfig
@@ -288,9 +288,6 @@ BR2_PACKAGE_RASPI_GPIO=y
BR2_PACKAGE_SPI_TOOLS=y
BR2_PACKAGE_USBMOUNT=y
BR2_PACKAGE_USBUTILS=y
-BR2_PACKAGE_NODEJS=y
-BR2_PACKAGE_NODEJS_NPM=y
-BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL="node-red"
BR2_PACKAGE_PYTHON3=y
BR2_PACKAGE_PYTHON3_PY_PYC=y
BR2_PACKAGE_PYTHON3_BZIP2=y
@@ -382,6 +379,7 @@ BR2_PACKAGE_LIBOPENH264=y
BR2_PACKAGE_LIBOPUSENC=y
BR2_PACKAGE_X264=y
BR2_PACKAGE_X265=y
+BR2_PACKAGE_C_ARES=y
BR2_PACKAGE_GLIB_NETWORKING=y
BR2_PACKAGE_LIBCURL_CURL=y
BR2_PACKAGE_LIBHTTPPARSER=y
@@ -389,10 +387,12 @@ BR2_PACKAGE_LIBIDN=y
BR2_PACKAGE_LIBMICROHTTPD=y
BR2_PACKAGE_LIBNDP=y
BR2_PACKAGE_LIBSHAIRPLAY=y
+BR2_PACKAGE_NGHTTP2=y
BR2_PACKAGE_BOOST_SYSTEM=y
BR2_PACKAGE_CMOCKA=y
BR2_PACKAGE_ELL=y
BR2_PACKAGE_LIBCAP_NG=y
+BR2_PACKAGE_LIBUV=y
BR2_PACKAGE_LINUX_PAM=y
BR2_PACKAGE_PROTOBUF=y
BR2_PACKAGE_LIBESTR=y
diff --git a/buildroot-external/package/mycroft-service/mycroft-gui.service b/buildroot-external/package/mycroft-service/mycroft-gui.service
index 7fa4a9e7..ffeec906 100644
--- a/buildroot-external/package/mycroft-service/mycroft-gui.service
+++ b/buildroot-external/package/mycroft-service/mycroft-gui.service
@@ -13,7 +13,7 @@ Environment=QT_QPA_PLATFORM=wayland
Environment=QT_PLUGIN_PATH=/usr/lib/qt/plugins:/usr/lib/plugins:/usr/lib/plugins/kf5
Environment=QT_LOGGING_RULES='*=false'
Environment=XDG_RUNTIME_DIR=/tmp/weston
-Environment=XDG_DATA_DIRS=/usr/share/kf5:$XDG_DATA_DIRS
+Environment=XDG_DATA_DIRS=/usr/share/icons:/usr/share/kf5:$XDG_DATA_DIRS
Environment=LD_LIBRARY_PATH=/usr/lib
Environment=LIBEXEC_PATH=/usr/lib/libexec:/usr/lib/libexec/kf5
Environment=QML2_IMPORT_PATH=/usr/lib/qml
From 42b1c052aab5b34683399c3941abe103450a785e Mon Sep 17 00:00:00 2001
From: j1nx
Date: Sat, 18 Jul 2020 17:24:50 +0200
Subject: [PATCH 4/5] MycroftOS: Switch to and add NetworkManager package(s)
---
buildroot-external/configs/rpi4_64-gui_defconfig | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig
index 2afa90dd..d109f90e 100644
--- a/buildroot-external/configs/rpi4_64-gui_defconfig
+++ b/buildroot-external/configs/rpi4_64-gui_defconfig
@@ -213,6 +213,7 @@ BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS=y
BR2_PACKAGE_QT5WEBVIEW=y
BR2_PACKAGE_KF5=y
BR2_PACKAGE_KF5_KCOREADDONS=y
+BR2_PACKAGE_KF5_NETWORKMANAGER_QT=y
BR2_PACKAGE_WESTON=y
BR2_PACKAGE_WESTON_DEFAULT_DRM=y
BR2_PACKAGE_WESTON_FBDEV=y
@@ -348,7 +349,6 @@ BR2_PACKAGE_LIBARCHIVE_BSDCPIO=y
BR2_PACKAGE_LIBARCHIVE_BSDCAT=y
BR2_PACKAGE_LIBZIP=y
BR2_PACKAGE_CA_CERTIFICATES=y
-BR2_PACKAGE_GNUTLS=y
BR2_PACKAGE_GNUTLS_OPENSSL=y
BR2_PACKAGE_GNUTLS_TOOLS=y
BR2_PACKAGE_LIBSSH2=y
@@ -385,7 +385,6 @@ BR2_PACKAGE_LIBCURL_CURL=y
BR2_PACKAGE_LIBHTTPPARSER=y
BR2_PACKAGE_LIBIDN=y
BR2_PACKAGE_LIBMICROHTTPD=y
-BR2_PACKAGE_LIBNDP=y
BR2_PACKAGE_LIBSHAIRPLAY=y
BR2_PACKAGE_NGHTTP2=y
BR2_PACKAGE_BOOST_SYSTEM=y
@@ -413,6 +412,7 @@ BR2_PACKAGE_DNSMASQ=y
# BR2_PACKAGE_DNSMASQ_DHCP is not set
BR2_PACKAGE_IPTABLES=y
BR2_PACKAGE_IW=y
+BR2_PACKAGE_NETWORK_MANAGER=y
BR2_PACKAGE_NGINX=y
BR2_PACKAGE_NTP=y
# BR2_PACKAGE_NTP_NTPD is not set
@@ -424,8 +424,6 @@ BR2_PACKAGE_SHAIRPORT_SYNC_CONVOLUTION=y
BR2_PACKAGE_SHAIRPORT_SYNC_DBUS=y
BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR=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_MESH_NETWORKING=y
From 08ac7a72d6d19b94e6758eaeb4e767356179109f Mon Sep 17 00:00:00 2001
From: j1nx
Date: Sat, 18 Jul 2020 17:25:32 +0200
Subject: [PATCH 5/5] MycroftOS: Remove pip binary-only restriction (for now)
---
.../board/raspberrypi/rootfs-overlay/etc/pip.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildroot-external/board/raspberrypi/rootfs-overlay/etc/pip.conf b/buildroot-external/board/raspberrypi/rootfs-overlay/etc/pip.conf
index d48dbbd9..12cdad8e 100644
--- a/buildroot-external/board/raspberrypi/rootfs-overlay/etc/pip.conf
+++ b/buildroot-external/board/raspberrypi/rootfs-overlay/etc/pip.conf
@@ -1,3 +1,3 @@
[global]
-only-binary=:all:
+#only-binary=:all:
extra-index-url=https://www.piwheels.org/simple