[Buildroot] [PATCH 1/2] package/dbus: fix group and mode for the launcher

[Buildroot] [PATCH 1/2] package/dbus: fix group and mode for the launcher

[Norbert Lange]

see bus/Makefile.am

Signed-off-by: Norbert Lange <nolange79@gmail.com>
---
 package/dbus/dbus.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index a4043864d1..bb9f17a5e0 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -11,7 +11,7 @@ DBUS_LICENSE_FILES = COPYING
 DBUS_INSTALL_STAGING = YES
 
 define DBUS_PERMISSIONS
-	/usr/libexec/dbus-daemon-launch-helper f 4755 0 0 - - - - -
+	/usr/libexec/dbus-daemon-launch-helper f 4750 0 dbus - - - - -
 endef
 
 define DBUS_USERS
-- 
2.26.2

[Buildroot] [PATCH 2/2] package/dbus: remove /usr/lib/dbus-1.0 if empty

[Norbert Lange]

---
 package/dbus/dbus.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index bb9f17a5e0..7a7762f537 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -80,7 +80,8 @@ endef
 DBUS_PRE_INSTALL_TARGET_HOOKS += DBUS_REMOVE_VAR_LIB_DBUS
 
 define DBUS_REMOVE_DEVFILES
-	rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0
+	rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0/include
+	-rmdir $(TARGET_DIR)/usr/lib/dbus-1.0 2>/dev/null
 endef
 
 DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_REMOVE_DEVFILES
-- 
2.26.2

[Buildroot] [PATCH 2/2] package/dbus: remove /usr/lib/dbus-1.0 if empty

[Thomas Petazzoni]

On Sat,  6 Jun 2020 00:52:46 +0200
Norbert Lange <nolange79@gmail.com> wrote:

> ---
>  package/dbus/dbus.mk | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Your Signed-off-by is missing, and there is no commit log. We clearly
need a better explanation. And your commit title is wrong: you're not
just removing /usr/lib/dbus-1.0 is empty: you're changing from removing
it unconditionally to removing just /usr/lib/dbus-1.0/include and then
removing /usr/lib/dbus-1.0 if it's empty.

So it means that you have installed *something* in /usr/lib/dbus-1.0
that you want Buildroot to keep on the target. But what? This is not
explained in your commit log.

> diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
> index bb9f17a5e0..7a7762f537 100644
> --- a/package/dbus/dbus.mk
> +++ b/package/dbus/dbus.mk
> @@ -80,7 +80,8 @@ endef
>  DBUS_PRE_INSTALL_TARGET_HOOKS += DBUS_REMOVE_VAR_LIB_DBUS
>  
>  define DBUS_REMOVE_DEVFILES
> -	rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0
> +	rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0/include
> +	-rmdir $(TARGET_DIR)/usr/lib/dbus-1.0 2>/dev/null

Can we use --ignore-fail-on-non-empty instead ? Yann, is this option
reasonably available even on old distributions ?

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 2/2] package/dbus: remove /usr/lib/dbus-1.0 if empty

[Norbert Lange]

Am Sa., 6. Juni 2020 um 22:38 Uhr schrieb Thomas Petazzoni
<thomas.petazzoni@bootlin.com>:
>
> On Sat,  6 Jun 2020 00:52:46 +0200
> Norbert Lange <nolange79@gmail.com> wrote:
>
> > ---
> >  package/dbus/dbus.mk | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
>
> Your Signed-off-by is missing, and there is no commit log. We clearly
> need a better explanation. And your commit title is wrong: you're not
> just removing /usr/lib/dbus-1.0 is empty: you're changing from removing
> it unconditionally to removing just /usr/lib/dbus-1.0/include and then
> removing /usr/lib/dbus-1.0 if it's empty.

Ok, gonna improve that in a v2 if you find no other objections

>
> So it means that you have installed *something* in /usr/lib/dbus-1.0
> that you want Buildroot to keep on the target. But what? This is not
> explained in your commit log.

I wrote this commit some months ago, would have to outright lie, but I
think it was dbusbroker (patch on the ML).
The basic gist is, that /usr/lib/dbus-1.0 is some sort of libexec dir
(on Debian and Fedora AFAIK), and I believe dbusbroker installs it
stuff there.

What we really want is to remove the unneeded files (the includes),
and the parent directory it is empty.

>
> > diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
> > index bb9f17a5e0..7a7762f537 100644
> > --- a/package/dbus/dbus.mk
> > +++ b/package/dbus/dbus.mk
> > @@ -80,7 +80,8 @@ endef
> >  DBUS_PRE_INSTALL_TARGET_HOOKS += DBUS_REMOVE_VAR_LIB_DBUS
> >
> >  define DBUS_REMOVE_DEVFILES
> > -     rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0
> > +     rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0/include
> > +     -rmdir $(TARGET_DIR)/usr/lib/dbus-1.0 2>/dev/null
>
> Can we use --ignore-fail-on-non-empty instead ? Yann, is this option
> reasonably available even on old distributions ?
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

Norbert

[Buildroot] [PATCH 2/2] package/dbus: remove /usr/lib/dbus-1.0 if empty

[Thomas Petazzoni]

Hello Norbert,

On Sun, 7 Jun 2020 00:36:47 +0200
Norbert Lange <nolange79@gmail.com> wrote:

> > Your Signed-off-by is missing, and there is no commit log. We clearly
> > need a better explanation. And your commit title is wrong: you're not
> > just removing /usr/lib/dbus-1.0 is empty: you're changing from removing
> > it unconditionally to removing just /usr/lib/dbus-1.0/include and then
> > removing /usr/lib/dbus-1.0 if it's empty.  
> 
> Ok, gonna improve that in a v2 if you find no other objections

My main objection is that we need a better commit log.

> > So it means that you have installed *something* in /usr/lib/dbus-1.0
> > that you want Buildroot to keep on the target. But what? This is not
> > explained in your commit log.  
> 
> I wrote this commit some months ago, would have to outright lie, but I
> think it was dbusbroker (patch on the ML).
> The basic gist is, that /usr/lib/dbus-1.0 is some sort of libexec dir
> (on Debian and Fedora AFAIK), and I believe dbusbroker installs it
> stuff there.
> 
> What we really want is to remove the unneeded files (the includes),
> and the parent directory it is empty.

Could you verify what dbusbroker installs in this directory, explain
why it is relevant, and use that as a justification in the commit log ?

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 2/2] package/dbus: remove /usr/lib/dbus-1.0 if empty

[Norbert Lange]

Am So., 7. Juni 2020 um 10:45 Uhr schrieb Thomas Petazzoni
<thomas.petazzoni@bootlin.com>:
>
> Hello Norbert,
>
> On Sun, 7 Jun 2020 00:36:47 +0200
> Norbert Lange <nolange79@gmail.com> wrote:
>
> > > Your Signed-off-by is missing, and there is no commit log. We clearly
> > > need a better explanation. And your commit title is wrong: you're not
> > > just removing /usr/lib/dbus-1.0 is empty: you're changing from removing
> > > it unconditionally to removing just /usr/lib/dbus-1.0/include and then
> > > removing /usr/lib/dbus-1.0 if it's empty.
> >
> > Ok, gonna improve that in a v2 if you find no other objections
>
> My main objection is that we need a better commit log.
>
> > > So it means that you have installed *something* in /usr/lib/dbus-1.0
> > > that you want Buildroot to keep on the target. But what? This is not
> > > explained in your commit log.
> >
> > I wrote this commit some months ago, would have to outright lie, but I
> > think it was dbusbroker (patch on the ML).
> > The basic gist is, that /usr/lib/dbus-1.0 is some sort of libexec dir
> > (on Debian and Fedora AFAIK), and I believe dbusbroker installs it
> > stuff there.
> >
> > What we really want is to remove the unneeded files (the includes),
> > and the parent directory it is empty.
>
> Could you verify what dbusbroker installs in this directory, explain
> why it is relevant, and use that as a justification in the commit log ?
>
> Thanks a lot!
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

Well,

turns out I was playing with libexec configuration, and dbus then
places its helpers in /usr/lib/dbus-1.0.
So, it's actually useless for the upstream buildroot (as you wont
allow for libexec config), but it actually wont hurt either.
Amended patch is following.

[Buildroot] [PATCH 1/2] package/dbus: fix group and mode for the launcher

[Thomas Petazzoni]

On Sat,  6 Jun 2020 00:52:45 +0200
Norbert Lange <nolange79@gmail.com> wrote:

> see bus/Makefile.am
> 
> Signed-off-by: Norbert Lange <nolange79@gmail.com>

This commit log was really too short in details. I've expanded it with
more details and applied.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/2] package/dbus: fix group and mode for the launcher

[Peter Korsgaard]

>>>>> "Norbert" == Norbert Lange <nolange79@gmail.com> writes:

 > see bus/Makefile.am
 > Signed-off-by: Norbert Lange <nolange79@gmail.com>

Committed to 2020.02.x and 2020.05.x, thanks.

-- 
Bye, Peter Korsgaard