Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/systemd: fix dbus activation
@ 2016-02-08 22:50 Gabe Evans
  2016-02-09 23:07 ` Arnout Vandecappelle
  2016-02-10 23:44 ` [Buildroot] [PATCH v2 1/2] systemd: " Gabe Evans
  0 siblings, 2 replies; 6+ messages in thread
From: Gabe Evans @ 2016-02-08 22:50 UTC (permalink / raw)
  To: buildroot

Various DBus activated services fail to start with errors similar to:

  Unit dbus-org.freedesktop.hostname1.service failed to load: File exists.

The message itself is rather vague and can be seen as a warning in
systemd-networkd logs. Meanwhile, tools like hostnamectl don't work
at all.

The post-install target hook SYSTEMD_SANITIZE_PATH_IN_UNITS was replacing
symlinks with duplicate files. The sed command could have used
--follow-symlinks to avoid this but I instead chose to remove the hook
since this fix doesn't seem to be needed anymore.

Some configure options are also removed:

 * --with-dbuspolicydir, --with-dbussessionservicedir, and
   --with-dbussystemservicedir are no longer needed since these are
   defaults in recent releases.

 * --disable-dbus has no effect when combined with --disable-tests. The
   option itself only applies to tests, not the runtime.

Signed-off-by: Gabe Evans <gabe@hashrabbit.co>
---
 package/systemd/systemd.mk | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index e432069..05121cf 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -32,14 +32,10 @@ SYSTEMD_CONF_OPTS += \
 	--disable-selinux \
 	--disable-pam \
 	--disable-libcryptsetup \
-	--with-dbuspolicydir=/etc/dbus-1/system.d \
-	--with-dbussessionservicedir=/usr/share/dbus-1/services \
-	--with-dbussystemservicedir=/usr/share/dbus-1/system-services \
 	--disable-efi \
 	--disable-gnuefi \
 	--disable-ldconfig \
 	--disable-tests \
-	--disable-dbus \
 	--without-python
 
 SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -fno-lto
@@ -150,16 +146,10 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK
 	touch $(TARGET_DIR)/etc/machine-id
 endef
 
-define SYSTEMD_SANITIZE_PATH_IN_UNITS
-	find $(TARGET_DIR)/lib/systemd/system -name '*.service' \
-		-exec $(SED) 's,$(HOST_DIR),,g' {} \;
-endef
-
 SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
 	SYSTEMD_INSTALL_INIT_HOOK \
 	SYSTEMD_INSTALL_MACHINEID_HOOK \
-	SYSTEMD_INSTALL_RESOLVCONF_HOOK \
-	SYSTEMD_SANITIZE_PATH_IN_UNITS
+	SYSTEMD_INSTALL_RESOLVCONF_HOOK
 
 define SYSTEMD_USERS
 	systemd-journal -1 systemd-journal -1 * /var/log/journal - - Journal
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/1] package/systemd: fix dbus activation
  2016-02-08 22:50 [Buildroot] [PATCH 1/1] package/systemd: fix dbus activation Gabe Evans
@ 2016-02-09 23:07 ` Arnout Vandecappelle
  2016-02-10 22:14   ` Gabe Evans
  2016-02-10 23:44 ` [Buildroot] [PATCH v2 1/2] systemd: " Gabe Evans
  1 sibling, 1 reply; 6+ messages in thread
From: Arnout Vandecappelle @ 2016-02-09 23:07 UTC (permalink / raw)
  To: buildroot

On 08-02-16 23:50, Gabe Evans wrote:
> Various DBus activated services fail to start with errors similar to:
> 
>   Unit dbus-org.freedesktop.hostname1.service failed to load: File exists.
> 
> The message itself is rather vague and can be seen as a warning in
> systemd-networkd logs. Meanwhile, tools like hostnamectl don't work
> at all.
> 
> The post-install target hook SYSTEMD_SANITIZE_PATH_IN_UNITS was replacing
> symlinks with duplicate files. The sed command could have used
> --follow-symlinks to avoid this 

 Or better yet, add -type f to the find command.

> but I instead chose to remove the hook
> since this fix doesn't seem to be needed anymore.
> 
> Some configure options are also removed:
> 
>  * --with-dbuspolicydir, --with-dbussessionservicedir, and
>    --with-dbussystemservicedir are no longer needed since these are
>    defaults in recent releases.
> 
>  * --disable-dbus has no effect when combined with --disable-tests. The
>    option itself only applies to tests, not the runtime.

 This part really should have been in a separate patch, with as subject
"systemd: remove redundant configure options".

 Still, this patch gets my

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 (checked that there is not HOST_DIR reference and that the dbus paths are still
correct).


 If you repost as two patches, you can carry my acked/tested tags.

 Regards,
 Arnout

> 
> Signed-off-by: Gabe Evans <gabe@hashrabbit.co>
> ---
>  package/systemd/systemd.mk | 12 +-----------
>  1 file changed, 1 insertion(+), 11 deletions(-)
> 
> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
> index e432069..05121cf 100644
> --- a/package/systemd/systemd.mk
> +++ b/package/systemd/systemd.mk
> @@ -32,14 +32,10 @@ SYSTEMD_CONF_OPTS += \
>  	--disable-selinux \
>  	--disable-pam \
>  	--disable-libcryptsetup \
> -	--with-dbuspolicydir=/etc/dbus-1/system.d \
> -	--with-dbussessionservicedir=/usr/share/dbus-1/services \
> -	--with-dbussystemservicedir=/usr/share/dbus-1/system-services \
>  	--disable-efi \
>  	--disable-gnuefi \
>  	--disable-ldconfig \
>  	--disable-tests \
> -	--disable-dbus \
>  	--without-python
>  
>  SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -fno-lto
> @@ -150,16 +146,10 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK
>  	touch $(TARGET_DIR)/etc/machine-id
>  endef
>  
> -define SYSTEMD_SANITIZE_PATH_IN_UNITS
> -	find $(TARGET_DIR)/lib/systemd/system -name '*.service' \
> -		-exec $(SED) 's,$(HOST_DIR),,g' {} \;
> -endef
> -
>  SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
>  	SYSTEMD_INSTALL_INIT_HOOK \
>  	SYSTEMD_INSTALL_MACHINEID_HOOK \
> -	SYSTEMD_INSTALL_RESOLVCONF_HOOK \
> -	SYSTEMD_SANITIZE_PATH_IN_UNITS
> +	SYSTEMD_INSTALL_RESOLVCONF_HOOK
>  
>  define SYSTEMD_USERS
>  	systemd-journal -1 systemd-journal -1 * /var/log/journal - - Journal
> 


-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/1] package/systemd: fix dbus activation
  2016-02-09 23:07 ` Arnout Vandecappelle
@ 2016-02-10 22:14   ` Gabe Evans
  0 siblings, 0 replies; 6+ messages in thread
From: Gabe Evans @ 2016-02-10 22:14 UTC (permalink / raw)
  To: buildroot

Hi Arnout,

On Tue, Feb 9, 2016 at 3:07 PM Arnout Vandecappelle <arnout@mind.be> wrote:

> On 08-02-16 23:50, Gabe Evans wrote:
> > Various DBus activated services fail to start with errors similar to:
> >
> >   Unit dbus-org.freedesktop.hostname1.service failed to load: File
> exists.
> >
> > The message itself is rather vague and can be seen as a warning in
> > systemd-networkd logs. Meanwhile, tools like hostnamectl don't work
> > at all.
> >
> > The post-install target hook SYSTEMD_SANITIZE_PATH_IN_UNITS was replacing
> > symlinks with duplicate files. The sed command could have used
> > --follow-symlinks to avoid this
>
>  Or better yet, add -type f to the find command.
>

Right! I might have been suffering from some tunnel vision while figuring
this out.


>
> > but I instead chose to remove the hook
> > since this fix doesn't seem to be needed anymore.
> >
> > Some configure options are also removed:
> >
> >  * --with-dbuspolicydir, --with-dbussessionservicedir, and
> >    --with-dbussystemservicedir are no longer needed since these are
> >    defaults in recent releases.
> >
> >  * --disable-dbus has no effect when combined with --disable-tests. The
> >    option itself only applies to tests, not the runtime.
>
>  This part really should have been in a separate patch, with as subject
> "systemd: remove redundant configure options".


>  Still, this patch gets my
>
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>  (checked that there is not HOST_DIR reference and that the dbus paths are
> still
> correct).
>
>
>  If you repost as two patches, you can carry my acked/tested tags.
>

Thanks for your feedback. I'll split this up and send v2 when I have some
free time.

Thanks,
Gabe


>
>  Regards,
>  Arnout
>
> >
> > Signed-off-by: Gabe Evans <gabe@hashrabbit.co>
> > ---
> >  package/systemd/systemd.mk | 12 +-----------
> >  1 file changed, 1 insertion(+), 11 deletions(-)
> >
> > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
> > index e432069..05121cf 100644
> > --- a/package/systemd/systemd.mk
> > +++ b/package/systemd/systemd.mk
> > @@ -32,14 +32,10 @@ SYSTEMD_CONF_OPTS += \
> >       --disable-selinux \
> >       --disable-pam \
> >       --disable-libcryptsetup \
> > -     --with-dbuspolicydir=/etc/dbus-1/system.d \
> > -     --with-dbussessionservicedir=/usr/share/dbus-1/services \
> > -     --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
> >       --disable-efi \
> >       --disable-gnuefi \
> >       --disable-ldconfig \
> >       --disable-tests \
> > -     --disable-dbus \
> >       --without-python
> >
> >  SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -fno-lto
> > @@ -150,16 +146,10 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK
> >       touch $(TARGET_DIR)/etc/machine-id
> >  endef
> >
> > -define SYSTEMD_SANITIZE_PATH_IN_UNITS
> > -     find $(TARGET_DIR)/lib/systemd/system -name '*.service' \
> > -             -exec $(SED) 's,$(HOST_DIR),,g' {} \;
> > -endef
> > -
> >  SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
> >       SYSTEMD_INSTALL_INIT_HOOK \
> >       SYSTEMD_INSTALL_MACHINEID_HOOK \
> > -     SYSTEMD_INSTALL_RESOLVCONF_HOOK \
> > -     SYSTEMD_SANITIZE_PATH_IN_UNITS
> > +     SYSTEMD_INSTALL_RESOLVCONF_HOOK
> >
> >  define SYSTEMD_USERS
> >       systemd-journal -1 systemd-journal -1 * /var/log/journal - -
> Journal
> >
>
>
> --
> Arnout Vandecappelle                          arnout at mind be
> Senior Embedded Software Architect            +32-16-286500
> Essensium/Mind                                http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
>
-- 
Gabe Evans | Co-Founder & CTO
hashrabbit.co ? angel.co/hashrabbit ? github.com/gevans
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20160210/5f82d4fe/attachment.html>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v2 1/2] systemd: fix dbus activation
  2016-02-08 22:50 [Buildroot] [PATCH 1/1] package/systemd: fix dbus activation Gabe Evans
  2016-02-09 23:07 ` Arnout Vandecappelle
@ 2016-02-10 23:44 ` Gabe Evans
  2016-02-10 23:44   ` [Buildroot] [PATCH v2 2/2] systemd: remove redundant configure options Gabe Evans
  2016-02-14 23:01   ` [Buildroot] [PATCH v2 1/2] systemd: fix dbus activation Thomas Petazzoni
  1 sibling, 2 replies; 6+ messages in thread
From: Gabe Evans @ 2016-02-10 23:44 UTC (permalink / raw)
  To: buildroot

Various DBus activated services fail to start with errors similar to:

  Unit dbus-org.freedesktop.hostname1.service failed to load: File exists.

The message itself is rather vague and can be seen as a warning in
systemd-networkd logs. Meanwhile, tools like hostnamectl don't work
at all.

The post-install target hook SYSTEMD_SANITIZE_PATH_IN_UNITS was replacing
symlinks with duplicate files. The find command could have used -type f
to avoid this but I instead chose to remove the hook since this fix doesn't
seem to be needed anymore.

Signed-off-by: Gabe Evans <gabe@hashrabbit.co>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
Changes v1 -> v2:
  - split changes into two separate commits (suggested by Arnout)
---
 package/systemd/systemd.mk | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index e432069..2340963 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -150,16 +150,10 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK
 	touch $(TARGET_DIR)/etc/machine-id
 endef
 
-define SYSTEMD_SANITIZE_PATH_IN_UNITS
-	find $(TARGET_DIR)/lib/systemd/system -name '*.service' \
-		-exec $(SED) 's,$(HOST_DIR),,g' {} \;
-endef
-
 SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
 	SYSTEMD_INSTALL_INIT_HOOK \
 	SYSTEMD_INSTALL_MACHINEID_HOOK \
-	SYSTEMD_INSTALL_RESOLVCONF_HOOK \
-	SYSTEMD_SANITIZE_PATH_IN_UNITS
+	SYSTEMD_INSTALL_RESOLVCONF_HOOK
 
 define SYSTEMD_USERS
 	systemd-journal -1 systemd-journal -1 * /var/log/journal - - Journal
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v2 2/2] systemd: remove redundant configure options
  2016-02-10 23:44 ` [Buildroot] [PATCH v2 1/2] systemd: " Gabe Evans
@ 2016-02-10 23:44   ` Gabe Evans
  2016-02-14 23:01   ` [Buildroot] [PATCH v2 1/2] systemd: fix dbus activation Thomas Petazzoni
  1 sibling, 0 replies; 6+ messages in thread
From: Gabe Evans @ 2016-02-10 23:44 UTC (permalink / raw)
  To: buildroot

 * --with-dbuspolicydir, --with-dbussessionservicedir, and
   --with-dbussystemservicedir are no longer needed since these are
   defaults in recent releases.

 * --disable-dbus has no effect when combined with --disable-tests. The
   option itself only applies to tests, not the runtime.

Signed-off-by: Gabe Evans <gabe@hashrabbit.co>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
Changes v1 -> v2:
  - split changes into two separate commits (suggested by Arnout)
---
 package/systemd/systemd.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 2340963..05121cf 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -32,14 +32,10 @@ SYSTEMD_CONF_OPTS += \
 	--disable-selinux \
 	--disable-pam \
 	--disable-libcryptsetup \
-	--with-dbuspolicydir=/etc/dbus-1/system.d \
-	--with-dbussessionservicedir=/usr/share/dbus-1/services \
-	--with-dbussystemservicedir=/usr/share/dbus-1/system-services \
 	--disable-efi \
 	--disable-gnuefi \
 	--disable-ldconfig \
 	--disable-tests \
-	--disable-dbus \
 	--without-python
 
 SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -fno-lto
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v2 1/2] systemd: fix dbus activation
  2016-02-10 23:44 ` [Buildroot] [PATCH v2 1/2] systemd: " Gabe Evans
  2016-02-10 23:44   ` [Buildroot] [PATCH v2 2/2] systemd: remove redundant configure options Gabe Evans
@ 2016-02-14 23:01   ` Thomas Petazzoni
  1 sibling, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2016-02-14 23:01 UTC (permalink / raw)
  To: buildroot

Dear Gabe Evans,

On Wed, 10 Feb 2016 23:44:03 +0000, Gabe Evans wrote:
> Various DBus activated services fail to start with errors similar to:
> 
>   Unit dbus-org.freedesktop.hostname1.service failed to load: File exists.
> 
> The message itself is rather vague and can be seen as a warning in
> systemd-networkd logs. Meanwhile, tools like hostnamectl don't work
> at all.
> 
> The post-install target hook SYSTEMD_SANITIZE_PATH_IN_UNITS was replacing
> symlinks with duplicate files. The find command could have used -type f
> to avoid this but I instead chose to remove the hook since this fix doesn't
> seem to be needed anymore.
> 
> Signed-off-by: Gabe Evans <gabe@hashrabbit.co>
> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
> Changes v1 -> v2:
>   - split changes into two separate commits (suggested by Arnout)
> ---
>  package/systemd/systemd.mk | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)

Both applied to master, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2016-02-14 23:01 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-08 22:50 [Buildroot] [PATCH 1/1] package/systemd: fix dbus activation Gabe Evans
2016-02-09 23:07 ` Arnout Vandecappelle
2016-02-10 22:14   ` Gabe Evans
2016-02-10 23:44 ` [Buildroot] [PATCH v2 1/2] systemd: " Gabe Evans
2016-02-10 23:44   ` [Buildroot] [PATCH v2 2/2] systemd: remove redundant configure options Gabe Evans
2016-02-14 23:01   ` [Buildroot] [PATCH v2 1/2] systemd: fix dbus activation Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox