From 0ccf773659a25a16d83f5e1e08f7cdcb61ce9c83 Mon Sep 17 00:00:00 2001 From: Chris Lesiak Date: Tue, 23 Jan 2018 17:17:23 -0600 Subject: [PATCH] package/avahi: Set the path to D-Bus system.d directory MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Since D-Bus 1.9.18, the recommended location for the system and session busses configuration files is /usr/share instead of /etc. From the D-Bus NEWS file: D-Bus 1.9.18 (2015-07-21) == The “Pirate Elite” release. Configuration changes: • The basic setup for the well-known system and session buses is now done in read-only files in ${datadir}, moving a step closer to systems that can operate with an empty /etc directory. In increasing order of precedence: · ${datadir}/dbus-1/s*.conf now perform the basic setup such as setting the default message policies. · ${sysconfdir}/dbus-1/s*.conf are now optional. By default dbus still installs a trivial version of each, for documentation purposes; putting configuration directives in these files is deprecated. · ${datadir}/dbus-1/s*.d/ are now available for third-party software to install "drop-in" configuration snippets (any packages using those directories should explicitly depend on at least this version of dbus). · ${sysconfdir}/dbus-1/s*.d/ are also still available for sysadmins or third-party software to install "drop-in" configuration snippets · ${sysconfdir}/dbus-1/s*-local.conf are still available for sysadmins' overrides ${datadir} is normally /usr/share, ${sysconfdir} is normally /etc, and "s*" refers to either system or session as appropriate. Therefore, this commit adjusts the Avahi package to install the D-Bus related files to /usr/share/dbus-1/system.d. Signed-off-by: Chris Lesiak Reviewed-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- package/avahi/avahi.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index c8f1af9a9d..ef621620f0 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -125,6 +125,7 @@ endif ifeq ($(BR2_PACKAGE_DBUS),y) AVAHI_DEPENDENCIES += dbus +AVAHI_CONF_OPTS += --with-dbus-sys=/usr/share/dbus-1/system.d else AVAHI_CONF_OPTS += --disable-dbus endif -- 2.30.2