[Buildroot] [PATCH 1/2] package/dnsmasq: install D-Bus policy to datadir

[Buildroot] [PATCH 1/2] package/dnsmasq: install D-Bus policy to datadir

[Fiona Klute via buildroot]

From: "Fiona Klute (WIWA)" <fiona.klute@gmx.de>

Since D-Bus 1.14.0 installing default policies into sysconfdir (/etc)
is deprecated, they should go into datadir (/usr/share) instead
[1]. Follow that policy.

[1] https://gitlab.freedesktop.org/dbus/dbus/-/blob/8f1e00427f7048f8b24c3a1cfca8903254fe00d4/NEWS#L274-283

Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
---
 package/dnsmasq/dnsmasq.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 9f342cb049..5dd7ed5c21 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -70,7 +70,7 @@ DNSMASQ_COPTS += -DHAVE_DBUS
 
 define DNSMASQ_INSTALL_DBUS
 	$(INSTALL) -m 0644 -D $(@D)/dbus/dnsmasq.conf \
-		$(TARGET_DIR)/etc/dbus-1/system.d/dnsmasq.conf
+		$(TARGET_DIR)/usr/share/dbus-1/system.d/dnsmasq.conf
 endef
 endif
 
-- 
2.45.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/2] package/wpa_supplicant: install D-Bus policy to datadir

[Fiona Klute via buildroot]

From: "Fiona Klute (WIWA)" <fiona.klute@gmx.de>

Since D-Bus 1.14.0 installing default policies into sysconfdir (/etc)
is deprecated, they should go into datadir (/usr/share) instead
[1]. Follow that policy.

[1] https://gitlab.freedesktop.org/dbus/dbus/-/blob/8f1e00427f7048f8b24c3a1cfca8903254fe00d4/NEWS#L274-283

Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
---
 package/wpa_supplicant/wpa_supplicant.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk
index aef8731341..44cfed495b 100644
--- a/package/wpa_supplicant/wpa_supplicant.mk
+++ b/package/wpa_supplicant/wpa_supplicant.mk
@@ -254,7 +254,7 @@ ifeq ($(BR2_PACKAGE_DBUS),y)
 define WPA_SUPPLICANT_INSTALL_DBUS
 	$(INSTALL) -m 0644 -D \
 		$(@D)/wpa_supplicant/dbus/dbus-wpa_supplicant.conf \
-		$(TARGET_DIR)/etc/dbus-1/system.d/wpa_supplicant.conf
+		$(TARGET_DIR)/usr/share/dbus-1/system.d/wpa_supplicant.conf
 	$(WPA_SUPPLICANT_INSTALL_DBUS_NEW)
 endef
 endif
-- 
2.45.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/dnsmasq: install D-Bus policy to datadir

[Thomas Petazzoni]

Hello Fiona,

On Thu,  5 Dec 2024 16:01:13 +0100
Fiona Klute via buildroot <buildroot@buildroot.org> wrote:

> From: "Fiona Klute (WIWA)" <fiona.klute@gmx.de>
> 
> Since D-Bus 1.14.0 installing default policies into sysconfdir (/etc)
> is deprecated, they should go into datadir (/usr/share) instead
> [1]. Follow that policy.
> 
> [1] https://gitlab.freedesktop.org/dbus/dbus/-/blob/8f1e00427f7048f8b24c3a1cfca8903254fe00d4/NEWS#L274-283
> 
> Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
> ---
>  package/dnsmasq/dnsmasq.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Thanks, both applied. We still have quite a few references to
/etc/dbus-1/system though:

package/dbus-broker/system.conf:  <include ignore_missing="yes">/etc/dbus-1/system.conf</include>
package/dbus-broker/system.conf:  <includedir>/etc/dbus-1/system.d</includedir>
package/dbus-broker/system.conf:  <include ignore_missing="yes">/etc/dbus-1/system-local.conf</include>
package/mender/mender.mk:               $(TARGET_DIR)/etc/dbus-1/system.d/io.mender.AuthenticationManager.conf
package/mender/mender.mk:               $(TARGET_DIR)/etc/dbus-1/system.d/io.mender.UpdateManager.conf
package/miraclecast/miraclecast.mk:             $(TARGET_DIR)/etc/dbus-1/system.d/org.freedesktop.miracle.conf
package/shairport-sync/shairport-sync.mk:               $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-dbus.conf
package/shairport-sync/shairport-sync.mk:               $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-mpris.conf
package/tpm2-abrmd/S80tpm2-abrmd:check_required_files /etc/dbus-1/system.d/tpm2-abrmd.conf
support/testing/tests/package/test_python_dbus_fast.py:        config_dir = "/etc/dbus-1/system.d"
support/testing/tests/package/test_python_dbus_next.py:        config_dir = "/etc/dbus-1/system.d"

Should some of these be fixed, perhaps?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/2] package/dnsmasq: install D-Bus policy to datadir

[Fiona Klute via buildroot]

Hi Thomas!

Am 05.02.25 um 15:37 schrieb Thomas Petazzoni:
> Hello Fiona,
>
> On Thu,  5 Dec 2024 16:01:13 +0100
> Fiona Klute via buildroot <buildroot@buildroot.org> wrote:
>
>> From: "Fiona Klute (WIWA)" <fiona.klute@gmx.de>
>>
>> Since D-Bus 1.14.0 installing default policies into sysconfdir (/etc)
>> is deprecated, they should go into datadir (/usr/share) instead
>> [1]. Follow that policy.
>>
>> [1] https://gitlab.freedesktop.org/dbus/dbus/-/blob/8f1e00427f7048f8b24c3a1cfca8903254fe00d4/NEWS#L274-283
>>
>> Signed-off-by: Fiona Klute (WIWA) <fiona.klute@gmx.de>
>> ---
>>   package/dnsmasq/dnsmasq.mk | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> Thanks, both applied. We still have quite a few references to
> /etc/dbus-1/system though:
>
> package/dbus-broker/system.conf:  <include ignore_missing="yes">/etc/dbus-1/system.conf</include>
> package/dbus-broker/system.conf:  <includedir>/etc/dbus-1/system.d</includedir>
> package/dbus-broker/system.conf:  <include ignore_missing="yes">/etc/dbus-1/system-local.conf</include>

These are fine: Config in /etc/dbus-1 should still be loaded as the
directory is meant for local config, it's just that *default* configs
shouldn't be installed there.

> package/mender/mender.mk:               $(TARGET_DIR)/etc/dbus-1/system.d/io.mender.AuthenticationManager.conf
> package/mender/mender.mk:               $(TARGET_DIR)/etc/dbus-1/system.d/io.mender.UpdateManager.conf
> package/miraclecast/miraclecast.mk:             $(TARGET_DIR)/etc/dbus-1/system.d/org.freedesktop.miracle.conf
> package/shairport-sync/shairport-sync.mk:               $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-dbus.conf
> package/shairport-sync/shairport-sync.mk:               $(TARGET_DIR)/etc/dbus-1/system.d/shairport-sync-mpris.conf
> package/tpm2-abrmd/S80tpm2-abrmd:check_required_files /etc/dbus-1/system.d/tpm2-abrmd.conf

These should probably be updated, but I'd prefer if someone who actually
uses those packages and can meaningfully test did that. :-)

> support/testing/tests/package/test_python_dbus_fast.py:        config_dir = "/etc/dbus-1/system.d"
> support/testing/tests/package/test_python_dbus_next.py:        config_dir = "/etc/dbus-1/system.d"
The tests create some local configuration and do some check that depend
on it, so that should be fine, unless the test is specifically meant to
test loading default config.

Best regards,
Fiona

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot