diff mbox series

[BlueZ,1/1] Makefile.am: Install D-Bus policy in /usr/share, not /etc

Message ID 20230808085540.1475435-2-gioele@svario.it (mailing list archive)
State New, archived
Headers show
Series Makefile.am: Install D-Bus policy in /usr/share, not /etc | expand

Checks

Context Check Description
tedd_an/pre-ci_am success Success
tedd_an/CheckPatch warning WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #58: > deprecates installing packages' default policies into `/etc/dbus-1/systemd`, /github/workspace/src/src/13346617.patch total: 0 errors, 1 warnings, 8 lines checked NOTE: For some of the reported defects, checkpatch may be able to mechanically convert to the typical style using --fix or --fix-inplace. /github/workspace/src/src/13346617.patch has style problems, please review. NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO NOTE: If any of the errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS.
tedd_an/GitLint success Gitlint PASS
tedd_an/BuildEll success Build ELL PASS
tedd_an/BluezMake success Bluez Make PASS
tedd_an/MakeCheck success Bluez Make Check PASS
tedd_an/MakeDistcheck success Make Distcheck PASS
tedd_an/CheckValgrind success Check Valgrind PASS
tedd_an/CheckSmatch success CheckSparse PASS
tedd_an/bluezmakeextell success Make External ELL PASS
tedd_an/IncrementalBuild success Incremental Build PASS
tedd_an/ScanBuild success Scan Build PASS

Commit Message

Gioele Barabucci Aug. 8, 2023, 8:55 a.m. UTC
From https://bugs.debian.org/1006631:

> dbus supports policy files in both `/usr/share/dbus-1/system.d` and
> `/etc/dbus-1/systemd`. [The] recently released dbus 1.14.0, officially
> deprecates installing packages' default policies into `/etc/dbus-1/systemd`,
> instead reserving it for the sysadmin. This is the same idea as the
> difference between `/usr/lib/udev/rules.d` and `/etc/udev/rules.d`.
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Luiz Augusto von Dentz Aug. 8, 2023, 6:48 p.m. UTC | #1
Hi Gioele,

On Tue, Aug 8, 2023 at 11:23 AM Gioele Barabucci <gioele@svario.it> wrote:
>
> From https://bugs.debian.org/1006631:
>
> > dbus supports policy files in both `/usr/share/dbus-1/system.d` and
> > `/etc/dbus-1/systemd`. [The] recently released dbus 1.14.0, officially
> > deprecates installing packages' default policies into `/etc/dbus-1/systemd`,
> > instead reserving it for the sysadmin. This is the same idea as the
> > difference between `/usr/lib/udev/rules.d` and `/etc/udev/rules.d`.

I'm fine with these changes but we also need to bump dbus dependency
to 1.14 then since it currently requiring 1.6:

PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.6, dummy=yes,
                AC_MSG_ERROR(D-Bus >= 1.6 is required))

> ---
>  Makefile.am | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index 4b9b7e5cd..f23c39d20 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -32,7 +32,7 @@ confdir = $(sysconfdir)/bluetooth
>  statedir = $(localstatedir)/lib/bluetooth
>
>  if DATAFILES
> -dbusdir = $(DBUS_CONFDIR)/dbus-1/system.d
> +dbusdir = $(datadir)/dbus-1/system.d
>  dbus_DATA = src/bluetooth.conf
>
>  conf_DATA =
> --
> 2.39.2
>
bluez.test.bot@gmail.com Aug. 8, 2023, 7:37 p.m. UTC | #2
This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=774197

---Test result---

Test Summary:
CheckPatch                    FAIL      0.68 seconds
GitLint                       PASS      0.26 seconds
BuildEll                      PASS      34.92 seconds
BluezMake                     PASS      1226.11 seconds
MakeCheck                     PASS      13.05 seconds
MakeDistcheck                 PASS      196.01 seconds
CheckValgrind                 PASS      321.40 seconds
CheckSmatch                   PASS      448.00 seconds
bluezmakeextell               PASS      133.20 seconds
IncrementalBuild              PASS      1034.85 seconds
ScanBuild                     PASS      1387.12 seconds

Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[BlueZ,1/1] Makefile.am: Install D-Bus policy in /usr/share, not /etc
WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#58: 
> deprecates installing packages' default policies into `/etc/dbus-1/systemd`,

/github/workspace/src/src/13346617.patch total: 0 errors, 1 warnings, 8 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
      mechanically convert to the typical style using --fix or --fix-inplace.

/github/workspace/src/src/13346617.patch has style problems, please review.

NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO

NOTE: If any of the errors are false positives, please report
      them to the maintainer, see CHECKPATCH in MAINTAINERS.




---
Regards,
Linux Bluetooth
Gioele Barabucci Aug. 8, 2023, 7:48 p.m. UTC | #3
On 08/08/23 20:48, Luiz Augusto von Dentz wrote:
> On Tue, Aug 8, 2023 at 11:23 AM Gioele Barabucci <gioele@svario.it> wrote:
>>
>>  From https://bugs.debian.org/1006631:
>>
>>> dbus supports policy files in both `/usr/share/dbus-1/system.d` and
>>> `/etc/dbus-1/systemd`. [The] recently released dbus 1.14.0, officially
>>> deprecates installing packages' default policies into `/etc/dbus-1/systemd`,
>>> instead reserving it for the sysadmin. This is the same idea as the
>>> difference between `/usr/lib/udev/rules.d` and `/etc/udev/rules.d`.
> 
> I'm fine with these changes but we also need to bump dbus dependency
> to 1.14 then since it currently requiring 1.6:
> 
> PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.6, dummy=yes,
>                  AC_MSG_ERROR(D-Bus >= 1.6 is required))

Thanks Luiz for the quick review.

I believe bumping the minimum D-Bus version to 1.10 (released in 2015) 
should be enough:

https://sources.debian.org/src/dbus/1.10.32-0%2Bdeb9u1/NEWS/#L483-L499

I'll send a v2 patch that adds the version bump.

Regards,
diff mbox series

Patch

diff --git a/Makefile.am b/Makefile.am
index 4b9b7e5cd..f23c39d20 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@  confdir = $(sysconfdir)/bluetooth
 statedir = $(localstatedir)/lib/bluetooth
 
 if DATAFILES
-dbusdir = $(DBUS_CONFDIR)/dbus-1/system.d
+dbusdir = $(datadir)/dbus-1/system.d
 dbus_DATA = src/bluetooth.conf
 
 conf_DATA =