[PATCH] obexd: Install D-BUS service for non systemd

[PATCH] obexd: Install D-BUS service for non systemd

[Joakim Tjernlund]

From: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>

non systemd(like OpenRC) machines need D-BUS activation for obexd as
they lack --user service.

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
---
 Makefile.obexd | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Makefile.obexd b/Makefile.obexd
index 385e5618d..cfcc115b7 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 if OBEX
 
-if SYSTEMD
 systemduserunitdir = $(SYSTEMD_USERUNITDIR)
 systemduserunit_DATA = obexd/src/obex.service
 
@@ -10,10 +9,6 @@ obexd-add-service-symlink:
 
 obexd-remove-service-symlink:
 	rm -f $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service
-else
-obexd-add-service-symlink:
-obexd-remove-service-symlink:
-endif
 
 dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
 dbussessionbus_DATA = obexd/src/org.bluez.obex.service
-- 
2.43.0

RE: obexd: Install D-BUS service for non systemd

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 529 bytes --]

This is an automated email and please do not reply to this email.

Dear Submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
While preparing the CI tests, the patches you submitted couldn't be applied to the current HEAD of the repository.

----- Output -----

error: patch failed: Makefile.obexd:10
error: Makefile.obexd: patch does not apply
hint: Use 'git am --show-current-patch' to see the failed patch

Please resolve the issue and submit the patches again.


---
Regards,
Linux Bluetooth

Re: [PATCH] obexd: Install D-BUS service for non systemd

[Luiz Augusto von Dentz]

Hi Joakim,

On Wed, Mar 6, 2024 at 7:40 PM Joakim Tjernlund
<joakim.tjernlund@infinera.com> wrote:
>
> From: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
>
> non systemd(like OpenRC) machines need D-BUS activation for obexd as
> they lack --user service.
>
> Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
> ---
>  Makefile.obexd | 5 -----
>  1 file changed, 5 deletions(-)
>
> diff --git a/Makefile.obexd b/Makefile.obexd
> index 385e5618d..cfcc115b7 100644
> --- a/Makefile.obexd
> +++ b/Makefile.obexd
> @@ -1,7 +1,6 @@
>  # SPDX-License-Identifier: GPL-2.0
>  if OBEX
>
> -if SYSTEMD
>  systemduserunitdir = $(SYSTEMD_USERUNITDIR)
>  systemduserunit_DATA = obexd/src/obex.service
>
> @@ -10,10 +9,6 @@ obexd-add-service-symlink:
>
>  obexd-remove-service-symlink:
>         rm -f $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service
> -else
> -obexd-add-service-symlink:
> -obexd-remove-service-symlink:
> -endif
>
>  dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
>  dbussessionbus_DATA = obexd/src/org.bluez.obex.service
> --
> 2.43.0
>

I guess you want to revert 9cc8b97b8f5d060e334207136100e947732aed08,
but then we need to fix the checkpatch error:

commit 9cc8b97b8f5d060e334207136100e947732aed08
Author: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date:   Mon Mar 4 12:44:08 2024 -0500

    build: obexd: Fix make distcheck

    This fixes the following error:

    /usr/bin/install: cannot remove
    '/usr/share/dbus-1/services/org.bluez.obex.service': Permission denied



-- 
Luiz Augusto von Dentz

Re: [PATCH] obexd: Install D-BUS service for non systemd

[Joakim Tjernlund]

On Wed, 2024-03-06 at 22:40 -0500, Luiz Augusto von Dentz wrote:
> Hi Joakim,
Hi Luiz :)

> 
> On Wed, Mar 6, 2024 at 7:40 PM Joakim Tjernlund
> <joakim.tjernlund@infinera.com> wrote:
> > 
> > From: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
> > 
> > non systemd(like OpenRC) machines need D-BUS activation for obexd as
> > they lack --user service.
> > 
> > Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
> > ---
> >  Makefile.obexd | 5 -----
> >  1 file changed, 5 deletions(-)
> > 
> > diff --git a/Makefile.obexd b/Makefile.obexd
> > index 385e5618d..cfcc115b7 100644
> > --- a/Makefile.obexd
> > +++ b/Makefile.obexd
> > @@ -1,7 +1,6 @@
> >  # SPDX-License-Identifier: GPL-2.0
> >  if OBEX
> > 
> > -if SYSTEMD
> >  systemduserunitdir = $(SYSTEMD_USERUNITDIR)
> >  systemduserunit_DATA = obexd/src/obex.service
> > 
> > @@ -10,10 +9,6 @@ obexd-add-service-symlink:
> > 
> >  obexd-remove-service-symlink:
> >         rm -f $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service
> > -else
> > -obexd-add-service-symlink:
> > -obexd-remove-service-symlink:
> > -endif
> > 
> >  dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
> >  dbussessionbus_DATA = obexd/src/org.bluez.obex.service
> > --
> > 2.43.0
> > 
> 
> I guess you want to revert 9cc8b97b8f5d060e334207136100e947732aed08,
> but then we need to fix the checkpatch error:

Don't know that, a bit clueless about distcheck and what it does.
For me it fails before my patch already:

./bootstrap
./configure
make distcheck
make --no-print-directory dist-xz am__post_remove_distdir='@:'
  GEN      lib/bluetooth/bluetooth.h
  GEN      lib/bluetooth/hci.h
  GEN      lib/bluetooth/hci_lib.h
  GEN      lib/bluetooth/sco.h
  GEN      lib/bluetooth/l2cap.h
  GEN      lib/bluetooth/sdp.h
  GEN      lib/bluetooth/sdp_lib.h
  GEN      lib/bluetooth/rfcomm.h
  GEN      lib/bluetooth/bnep.h
  GEN      lib/bluetooth/cmtp.h
  GEN      lib/bluetooth/hidp.h
  GEN      ell/shared
  GEN      src/builtin.h
  GEN      obexd/src/builtin.h
make --no-print-directory distdir-am
make[2]: *** No rule to make target 'ell/util.h', needed by 'distdir-am'.  Stop.
make[1]: *** [Makefile:12016: distdir] Error 2
make: *** [Makefile:12096: dist] Error 2


 Jocke
> 
> commit 9cc8b97b8f5d060e334207136100e947732aed08
> Author: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> Date:   Mon Mar 4 12:44:08 2024 -0500
> 
>     build: obexd: Fix make distcheck
> 
>     This fixes the following error:
> 
>     /usr/bin/install: cannot remove
>     '/usr/share/dbus-1/services/org.bluez.obex.service': Permission denied
> 
> 
> 

Re: [PATCH] obexd: Install D-BUS service for non systemd

[Joakim Tjernlund]

On Thu, 2024-03-07 at 09:18 +0100, Joakim Tjernlund wrote:
> On Wed, 2024-03-06 at 22:40 -0500, Luiz Augusto von Dentz wrote:
> > Hi Joakim,
> Hi Luiz :)

FYI, that patch should hav been smaller, this is enough to get the D-BUS service:
diff --git a/Makefile.am b/Makefile.am
index ed4f9dc51..e780fcbb1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,10 +48,10 @@ endif
 if SYSTEMD
 systemdsystemunitdir = $(SYSTEMD_SYSTEMUNITDIR)
 systemdsystemunit_DATA = src/bluetooth.service
+endif
 
 dbussystembusdir = $(DBUS_SYSTEMBUSDIR)
 dbussystembus_DATA = src/org.bluez.service
-endif


> 
> > 
> > On Wed, Mar 6, 2024 at 7:40 PM Joakim Tjernlund
> > <joakim.tjernlund@infinera.com> wrote:
> > > 
> > > From: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
> > > 
> > > non systemd(like OpenRC) machines need D-BUS activation for obexd as
> > > they lack --user service.
> > > 
> > > Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
> > > ---
> > >  Makefile.obexd | 5 -----
> > >  1 file changed, 5 deletions(-)
> > > 
> > > diff --git a/Makefile.obexd b/Makefile.obexd
> > > index 385e5618d..cfcc115b7 100644
> > > --- a/Makefile.obexd
> > > +++ b/Makefile.obexd
> > > @@ -1,7 +1,6 @@
> > >  # SPDX-License-Identifier: GPL-2.0
> > >  if OBEX
> > > 
> > > -if SYSTEMD
> > >  systemduserunitdir = $(SYSTEMD_USERUNITDIR)
> > >  systemduserunit_DATA = obexd/src/obex.service
> > > 
> > > @@ -10,10 +9,6 @@ obexd-add-service-symlink:
> > > 
> > >  obexd-remove-service-symlink:
> > >         rm -f $(DESTDIR)$(SYSTEMD_USERUNITDIR)/dbus-org.bluez.obex.service
> > > -else
> > > -obexd-add-service-symlink:
> > > -obexd-remove-service-symlink:
> > > -endif
> > > 
> > >  dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
> > >  dbussessionbus_DATA = obexd/src/org.bluez.obex.service
> > > --
> > > 2.43.0
> > > 
> > 
> > I guess you want to revert 9cc8b97b8f5d060e334207136100e947732aed08,
> > but then we need to fix the checkpatch error:
> 
> Don't know that, a bit clueless about distcheck and what it does.
> For me it fails before my patch already:
> 
> ./bootstrap
> ./configure
> make distcheck
> make --no-print-directory dist-xz am__post_remove_distdir='@:'
>   GEN      lib/bluetooth/bluetooth.h
>   GEN      lib/bluetooth/hci.h
>   GEN      lib/bluetooth/hci_lib.h
>   GEN      lib/bluetooth/sco.h
>   GEN      lib/bluetooth/l2cap.h
>   GEN      lib/bluetooth/sdp.h
>   GEN      lib/bluetooth/sdp_lib.h
>   GEN      lib/bluetooth/rfcomm.h
>   GEN      lib/bluetooth/bnep.h
>   GEN      lib/bluetooth/cmtp.h
>   GEN      lib/bluetooth/hidp.h
>   GEN      ell/shared
>   GEN      src/builtin.h
>   GEN      obexd/src/builtin.h
> make --no-print-directory distdir-am
> make[2]: *** No rule to make target 'ell/util.h', needed by 'distdir-am'.  Stop.
> make[1]: *** [Makefile:12016: distdir] Error 2
> make: *** [Makefile:12096: dist] Error 2
> 
> 
>  Jocke
> > 
> > commit 9cc8b97b8f5d060e334207136100e947732aed08
> > Author: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> > Date:   Mon Mar 4 12:44:08 2024 -0500
> > 
> >     build: obexd: Fix make distcheck
> > 
> >     This fixes the following error:
> > 
> >     /usr/bin/install: cannot remove
> >     '/usr/share/dbus-1/services/org.bluez.obex.service': Permission denied
> > 
> > 
> > 
>