From 369f7a32b96b8c6fa4e64af59acbd28ae0ea0ee4 Mon Sep 17 00:00:00 2001 From: Peter Steenbergen Date: Mon, 27 Sep 2021 09:19:23 +0200 Subject: [PATCH] Fixes and addition of shared dbus service/socket --- buildroot-external/configs/rpi4_64-gui_defconfig | 1 + .../package/mycroft-skill-news/mycroft-skill-news.mk | 2 +- .../package/ovos-dashboard/ovos-dashboard@.service | 3 +++ .../rootfs-overlay/usr/lib/systemd/user/dbus.service | 10 ++++++++++ .../rootfs-overlay/usr/lib/systemd/user/dbus.socket | 10 ++++++++++ 5 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 buildroot-external/rootfs-overlay/usr/lib/systemd/user/dbus.service create mode 100644 buildroot-external/rootfs-overlay/usr/lib/systemd/user/dbus.socket diff --git a/buildroot-external/configs/rpi4_64-gui_defconfig b/buildroot-external/configs/rpi4_64-gui_defconfig index 78ea312d..2b30e160 100644 --- a/buildroot-external/configs/rpi4_64-gui_defconfig +++ b/buildroot-external/configs/rpi4_64-gui_defconfig @@ -667,6 +667,7 @@ BR2_PACKAGE_PYTHON_PYJOKES=y BR2_PACKAGE_PYTHON_PYMPLAYER=y BR2_PACKAGE_PYTHON_PYOWM=y BR2_PACKAGE_PYTHON_PYTHRAN=y +BR2_PACKAGE_PYTHON_PYTZDATA=y BR2_PACKAGE_PYTHON_QUANTULUM3=y BR2_PACKAGE_PYTHON_RAKEKEYWORDS=y BR2_PACKAGE_PYTHON_RAPIDFUZZ=y diff --git a/buildroot-external/package/mycroft-skill-news/mycroft-skill-news.mk b/buildroot-external/package/mycroft-skill-news/mycroft-skill-news.mk index 76c3d78e..d0db18b8 100644 --- a/buildroot-external/package/mycroft-skill-news/mycroft-skill-news.mk +++ b/buildroot-external/package/mycroft-skill-news/mycroft-skill-news.mk @@ -4,7 +4,7 @@ # ################################################################################ -MYCROFT_SKILL_NEWS_VERSION = 4503ac4741326b38902c26a62c3a68ef2fad87ef +MYCROFT_SKILL_NEWS_VERSION = db21971365efd8016301ebe7fc2cf9abdf10cbc9 MYCROFT_SKILL_NEWS_SITE = git://github.com/JarbasSkills/skill-news MYCROFT_SKILL_NEWS_SITE_METHOD = git MYCROFT_SKILL_NEWS_DIRLOCATION = home/mycroft/.local/share/mycroft/skills diff --git a/buildroot-external/package/ovos-dashboard/ovos-dashboard@.service b/buildroot-external/package/ovos-dashboard/ovos-dashboard@.service index ba7c25e5..fd55191d 100644 --- a/buildroot-external/package/ovos-dashboard/ovos-dashboard@.service +++ b/buildroot-external/package/ovos-dashboard/ovos-dashboard@.service @@ -1,8 +1,11 @@ [Unit] Description=OVOS Dashboard Service After=network.target +Requires=dbus.socket [Service] +Type=dbus +BusName=com.openvoiceos.ovos-dashboard Environment=SIMPLELOGIN_USERNAME="OVOS" Environment=SIMPLELOGIN_PASSWORD=%i Environment=MYCROFT_SKILLS_LOCATION=%h/.local/share/mycroft/skills/ diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/dbus.service b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/dbus.service new file mode 100644 index 00000000..63b032a2 --- /dev/null +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/dbus.service @@ -0,0 +1,10 @@ +[Unit] +Description=D-Bus User Message Bus +Requires=dbus.socket + +[Service] +ExecStart=/usr/bin/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation +ExecReload=/usr/bin/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig + +[Install] +Also=dbus.socket diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/user/dbus.socket b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/dbus.socket new file mode 100644 index 00000000..803f63ad --- /dev/null +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/user/dbus.socket @@ -0,0 +1,10 @@ +[Unit] +Description=D-Bus User Message Bus Socket + +[Socket] +ListenStream=%t/bus +ExecStartPost=-/bin/systemctl --user set-environment DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus + +[Install] +WantedBy=sockets.target +Also=dbus.service