From 9186fb58fedf52b120abf82a1a6faa6c3d429d40 Mon Sep 17 00:00:00 2001 From: j1nx Date: Fri, 12 Jun 2020 09:43:10 +0200 Subject: [PATCH] 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