jeans/operating-system
jeans/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2025-07-27 06:56:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use dbus-broker as default D-Bus broker (#2053)

Browse Source 
* Bump buildroot

* buildroot 99b62b8bd3...97287bbebf (3):
  > package/dbus-broker: bump to release 32
  > package/dbus-broker: new package
  > Merge pull request #3 from home-assistant/2022.02.x-haos-cgroup-v2

* Use dbus-broker as default D-Bus broker

The dbus-broker (Linux D-Bus Message Broker) aims to be a high
performance and reliable D-Bus broker which can be used as a drop in
replacement to the reference implementation D-Bus broker. In tests it
showed significantly better performance especially when routing BLE
messages.

* Allow dbus-broker to start early

For HAOS device wipe feature we need haos-agent.service and
udisk2.service early. Both require a working D-Bus broker.
The options PrivateTmp and PrivateDevices add additional After=
orderings which doesn't allow dbus-broker to be started early.

* Fix D-Bus dependency

D-Bus services should just depend on dbus.socket.
This commit is contained in:
Stefan Agner 2022-08-10 17:01:02 +02:00 committed by GitHub
parent 5d0a61fafc
commit 2d8ec0c8ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildroot

@ -1 +1 @@
Subproject commit 99b62b8bd3ceb58bcd003b8ac15c5ae92122b5c8 Subproject commit 97287bbebf63f48b9f9b28f52b42acb42e75cac5

1
buildroot-external/configs/generic_aarch64_defconfig
View File

@ -72,6 +72,7 @@ BR2_PACKAGE_LIBCGROUP_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
BR2_PACKAGE_DBUS_BROKER=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR=y

1
buildroot-external/configs/generic_x86_64_defconfig
View File

@ -72,6 +72,7 @@ BR2_PACKAGE_LIBCGROUP_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
BR2_PACKAGE_DBUS_BROKER=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR=y

1
buildroot-external/configs/khadas_vim3_defconfig
View File

@ -60,6 +60,7 @@ BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
BR2_PACKAGE_DBUS_BROKER=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR=y

1
buildroot-external/configs/odroid_c2_defconfig
View File

@ -60,6 +60,7 @@ BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
BR2_PACKAGE_DBUS_BROKER=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR=y

1
buildroot-external/configs/odroid_c4_defconfig
View File

@ -58,6 +58,7 @@ BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
BR2_PACKAGE_DBUS_BROKER=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR=y

1
buildroot-external/configs/odroid_n2_defconfig
View File

@ -60,6 +60,7 @@ BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
BR2_PACKAGE_DBUS_BROKER=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR=y

1
buildroot-external/configs/odroid_xu4_defconfig
View File

@ -60,6 +60,7 @@ BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
BR2_PACKAGE_DBUS_BROKER=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR=y

1
buildroot-external/configs/ova_defconfig
View File

@ -72,6 +72,7 @@ BR2_PACKAGE_LIBCGROUP_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
BR2_PACKAGE_DBUS_BROKER=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR=y

1
buildroot-external/configs/rpi2_defconfig
View File

@ -63,6 +63,7 @@ BR2_PACKAGE_LIBCGROUP_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
BR2_PACKAGE_DBUS_BROKER=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR=y

1
buildroot-external/configs/rpi3_64_defconfig
View File

@ -65,6 +65,7 @@ BR2_PACKAGE_LIBCGROUP_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
BR2_PACKAGE_DBUS_BROKER=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR=y

1
buildroot-external/configs/rpi3_defconfig
View File

@ -66,6 +66,7 @@ BR2_PACKAGE_LIBCGROUP_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
BR2_PACKAGE_DBUS_BROKER=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR=y

1
buildroot-external/configs/rpi4_64_defconfig
View File

@ -66,6 +66,7 @@ BR2_PACKAGE_LIBCGROUP_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
BR2_PACKAGE_DBUS_BROKER=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR=y

1
buildroot-external/configs/rpi4_defconfig
View File

@ -65,6 +65,7 @@ BR2_PACKAGE_LIBCGROUP_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
BR2_PACKAGE_DBUS_BROKER=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR=y

1
buildroot-external/configs/tinker_defconfig
View File

@ -61,6 +61,7 @@ BR2_PACKAGE_LIBCGROUP_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
BR2_PACKAGE_DBUS_BROKER=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR=y

1
buildroot-external/configs/yellow_defconfig
View File

@ -65,6 +65,7 @@ BR2_PACKAGE_LIBCGROUP_TOOLS=y
BR2_PACKAGE_BLUEZ5_UTILS=y BR2_PACKAGE_BLUEZ5_UTILS=y
BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y BR2_PACKAGE_BLUEZ5_UTILS_TOOLS=y
BR2_PACKAGE_DBUS_BROKER=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DROPBEAR=y BR2_PACKAGE_DROPBEAR=y

3
buildroot-external/rootfs-overlay/etc/systemd/system/dbus-broker.service.d/haos.conf Normal file
View File

@ -0,0 +1,3 @@
[Service]
PrivateTmp=false
PrivateDevices=false

4
buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service
View File

@ -1,8 +1,8 @@
[Unit] [Unit]
Description=HassOS supervisor Description=HassOS supervisor
Requires=docker.service rauc.service dbus.service Requires=docker.service rauc.service dbus.socket
Wants=network-online.target hassos-apparmor.service time-sync.target systemd-journal-gatewayd.socket Wants=network-online.target hassos-apparmor.service time-sync.target systemd-journal-gatewayd.socket
After=docker.service rauc.service dbus.service network-online.target hassos-apparmor.service time-sync.target systemd-journal-gatewayd.socket After=docker.service rauc.service dbus.socket network-online.target hassos-apparmor.service time-sync.target systemd-journal-gatewayd.socket
RequiresMountsFor=/mnt/data /mnt/boot /mnt/overlay RequiresMountsFor=/mnt/data /mnt/boot /mnt/overlay
StartLimitIntervalSec=30m StartLimitIntervalSec=30m
StartLimitBurst=3 StartLimitBurst=3