[Buildroot] [PATCH 1/1] systemd: bump to version 214

[Buildroot] [PATCH 1/1] systemd: bump to version 214

[Eric Le Bihan]

This patch bumps systemd to version 214.

Changes:

- add new users: systemd-bus-proxy, systemd-network and systemd-resolve.
- remove gtk-doc patch, as it is no longer needed.
- force kmod path when configuring.
- remove attr build dependency.

Besides:

- /var/lock no longer needs to be a symlink to /run, as systemd, via
  tmpfiles.d, will automatically create a symlink to /run/lock at
  runtime.
- when using systemd-networkd, /etc/resolv.conf should now be a symlink
  to /run/systemd/resolve/resolv.conf.

Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
---
 ...ystemd-03-fix-am-path-libgcrypt-no-found.patch} |  0
 package/systemd/systemd-03-fix-no-gtk-doc.patch    | 23 ----------------------
 package/systemd/systemd.mk                         | 11 +++++++++--
 3 files changed, 9 insertions(+), 25 deletions(-)
 rename package/systemd/{systemd-04-fix-am-path-libgcrypt-no-found.patch => systemd-03-fix-am-path-libgcrypt-no-found.patch} (100%)
 delete mode 100644 package/systemd/systemd-03-fix-no-gtk-doc.patch

diff --git a/package/systemd/systemd-04-fix-am-path-libgcrypt-no-found.patch b/package/systemd/systemd-03-fix-am-path-libgcrypt-no-found.patch
similarity index 100%
rename from package/systemd/systemd-04-fix-am-path-libgcrypt-no-found.patch
rename to package/systemd/systemd-03-fix-am-path-libgcrypt-no-found.patch
diff --git a/package/systemd/systemd-03-fix-no-gtk-doc.patch b/package/systemd/systemd-03-fix-no-gtk-doc.patch
deleted file mode 100644
index dc236a7..0000000
--- a/package/systemd/systemd-03-fix-no-gtk-doc.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix deactivation of gtk-doc
-
-The tarball contains the Makefile for building documentation with gtk-doc,
-Unfortunately the AM_CONDITIONAL variable is not the correct one, which
-results in an error when running autoreconf.
-
-This patch fixes this issue.
-
-Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
----
-Index: systemd-213/docs/gtk-doc.make
-===================================================================
---- systemd-213.orig/docs/gtk-doc.make	2014-02-14 09:27:47.000000000 +0100
-+++ systemd-213/docs/gtk-doc.make	2014-06-04 15:20:11.976845074 +0200
-@@ -267,7 +267,7 @@
- #
- # Require gtk-doc when making dist
- #
--if HAVE_GTK_DOC
-+if ENABLE_GTK_DOC
- dist-check-gtkdoc: docs
- else
- dist-check-gtkdoc:
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 95e7214..947bc92 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SYSTEMD_VERSION = 213
+SYSTEMD_VERSION = 214
 SYSTEMD_SITE = http://www.freedesktop.org/software/systemd/
 SYSTEMD_SOURCE = systemd-$(SYSTEMD_VERSION).tar.xz
 SYSTEMD_LICENSE = LGPLv2.1+; GPLv2+ for udev; MIT-like license for few source files listed in README
@@ -50,6 +50,9 @@ SYSTEMD_CONF_OPT += \
 	--disable-dbus \
 	--without-python
 
+SYSTEMD_CONF_ENV = \
+	ac_cv_path_KMOD=/usr/bin/kmod
+
 ifeq ($(BR2_PACKAGE_SYSTEMD_COMPAT),y)
 SYSTEMD_CONF_OPT += --enable-compat-libs
 else
@@ -65,7 +68,6 @@ endif
 
 ifeq ($(BR2_PACKAGE_ATTR),y)
 SYSTEMD_CONF_OPT += --enable-attr
-SYSTEMD_DEPENDENCIES += attr
 else
 SYSTEMD_CONF_OPT += --disable-attr
 endif
@@ -99,6 +101,9 @@ endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y)
 SYSTEMD_CONF_OPT += --enable-networkd
+define SYSTEMD_USER_TIMESYNC
+	systemd-network -1 systemd-network -1 * - - - Network Manager
+endef
 else
 SYSTEMD_CONF_OPT += --disable-networkd
 define SYSTEMD_INSTALL_SERVICE_NETWORK
@@ -155,6 +160,8 @@ SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
 define SYSTEMD_USERS
 	systemd-journal -1 systemd-journal -1 * /var/log/journal - - Journal
 	systemd-journal-gateway -1 systemd-journal-gateway -1 * /var/log/journal - - Journal Gateway
+	systemd-resolve -1 systemd-resolve -1 * - - - Network Name Resolution Manager
+	systemd-bus-proxy -1 systemd-bus-proxy -1 * - - - Proxy D-Bus messages to/from a bus
 	$(SYSTEMD_USER_TIMESYNC)
 endef
 
-- 
1.9.3

[Buildroot] [PATCH 1/1] systemd: bump to version 214

[Thomas Petazzoni]

Dear Eric Le Bihan,

On Sun, 29 Jun 2014 21:35:37 +0200, Eric Le Bihan wrote:
> This patch bumps systemd to version 214.
> 
> Changes:
> 
> - add new users: systemd-bus-proxy, systemd-network and systemd-resolve.
> - remove gtk-doc patch, as it is no longer needed.
> - force kmod path when configuring.
> - remove attr build dependency.
> 
> Besides:
> 
> - /var/lock no longer needs to be a symlink to /run, as systemd, via
>   tmpfiles.d, will automatically create a symlink to /run/lock at
>   runtime.
> - when using systemd-networkd, /etc/resolv.conf should now be a symlink
>   to /run/systemd/resolve/resolv.conf.
> 
> Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
> ---
>  ...ystemd-03-fix-am-path-libgcrypt-no-found.patch} |  0
>  package/systemd/systemd-03-fix-no-gtk-doc.patch    | 23 ----------------------
>  package/systemd/systemd.mk                         | 11 +++++++++--
>  3 files changed, 9 insertions(+), 25 deletions(-)
>  rename package/systemd/{systemd-04-fix-am-path-libgcrypt-no-found.patch => systemd-03-fix-am-path-libgcrypt-no-found.patch} (100%)
>  delete mode 100644 package/systemd/systemd-03-fix-no-gtk-doc.patch

Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

(I don't know much about systemd, but the changes look good to me, and
I trust Eric when it comes to systemd stuff and I know he'll be around
to fix stuff if bad things happen.)

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

[Buildroot] [PATCH 1/1] systemd: bump to version 214

[Arnout Vandecappelle]

On 29/06/14 21:35, Eric Le Bihan wrote:
> This patch bumps systemd to version 214.
> 
> Changes:
> 
> - add new users: systemd-bus-proxy, systemd-network and systemd-resolve.
> - remove gtk-doc patch, as it is no longer needed.
> - force kmod path when configuring.
> - remove attr build dependency.
> 
> Besides:
> 
> - /var/lock no longer needs to be a symlink to /run, as systemd, via
>   tmpfiles.d, will automatically create a symlink to /run/lock at
>   runtime.
> - when using systemd-networkd, /etc/resolv.conf should now be a symlink
>   to /run/systemd/resolve/resolv.conf.

 So, maybe the systemd package should make sure that this is the case? In a
post-install hook for instance?

> 
> Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
[snip]
> diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
> index 95e7214..947bc92 100644
> --- a/package/systemd/systemd.mk
> +++ b/package/systemd/systemd.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -SYSTEMD_VERSION = 213
> +SYSTEMD_VERSION = 214
>  SYSTEMD_SITE = http://www.freedesktop.org/software/systemd/
>  SYSTEMD_SOURCE = systemd-$(SYSTEMD_VERSION).tar.xz
>  SYSTEMD_LICENSE = LGPLv2.1+; GPLv2+ for udev; MIT-like license for few source files listed in README
> @@ -50,6 +50,9 @@ SYSTEMD_CONF_OPT += \
>  	--disable-dbus \
>  	--without-python
>  
> +SYSTEMD_CONF_ENV = \
> +	ac_cv_path_KMOD=/usr/bin/kmod

 Since we would normally expect this to point into $(HOST_DIR), I think there
should be a comment here.

> +
>  ifeq ($(BR2_PACKAGE_SYSTEMD_COMPAT),y)
>  SYSTEMD_CONF_OPT += --enable-compat-libs
>  else
> @@ -65,7 +68,6 @@ endif
>  
>  ifeq ($(BR2_PACKAGE_ATTR),y)
>  SYSTEMD_CONF_OPT += --enable-attr
> -SYSTEMD_DEPENDENCIES += attr

 Uh? How is it possible to do --enable-attr without depending on attr? Run-time
dependency only? Then this should be explained in a comment.

>  else
>  SYSTEMD_CONF_OPT += --disable-attr
>  endif
> @@ -99,6 +101,9 @@ endif
>  
>  ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y)
>  SYSTEMD_CONF_OPT += --enable-networkd
> +define SYSTEMD_USER_TIMESYNC

 I don't suppose timesync and networkd are mutually exclusive, so this should be
SYSTEMD_USER_NETWORK and it should be added to SYSTEMD_USERS, below.


 Regards,
 Arnout


> +	systemd-network -1 systemd-network -1 * - - - Network Manager
> +endef
>  else
>  SYSTEMD_CONF_OPT += --disable-networkd
>  define SYSTEMD_INSTALL_SERVICE_NETWORK
> @@ -155,6 +160,8 @@ SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
>  define SYSTEMD_USERS
>  	systemd-journal -1 systemd-journal -1 * /var/log/journal - - Journal
>  	systemd-journal-gateway -1 systemd-journal-gateway -1 * /var/log/journal - - Journal Gateway
> +	systemd-resolve -1 systemd-resolve -1 * - - - Network Name Resolution Manager
> +	systemd-bus-proxy -1 systemd-bus-proxy -1 * - - - Proxy D-Bus messages to/from a bus
>  	$(SYSTEMD_USER_TIMESYNC)
>  endef
>  
> 


-- 
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:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 1/1] systemd: bump to version 214

[Eric Le Bihan]

Hi!
On Wed, Jul 02, 2014 at 07:30:38AM +0200, Arnout Vandecappelle wrote:
> On 29/06/14 21:35, Eric Le Bihan wrote:
> > This patch bumps systemd to version 214.
> >
> > Changes:
> >
> > - add new users: systemd-bus-proxy, systemd-network and systemd-resolve.
> > - remove gtk-doc patch, as it is no longer needed.
> > - force kmod path when configuring.
> > - remove attr build dependency.
> >
> > Besides:
> >
> > - /var/lock no longer needs to be a symlink to /run, as systemd, via
> >   tmpfiles.d, will automatically create a symlink to /run/lock at
> >   runtime.
> > - when using systemd-networkd, /etc/resolv.conf should now be a symlink
> >   to /run/systemd/resolve/resolv.conf.
>
>  So, maybe the systemd package should make sure that this is the case? In a
> post-install hook for instance?

I usually perform these steps in a post-build script. There was a recent
discussion [1] about adding systemd/sysv specific target skeletons. If adding
a post installation hook that rework /var and /run is OK, this can solve this
problem.
> >
> > Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
> [snip]
> > diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
> > index 95e7214..947bc92 100644
> > --- a/package/systemd/systemd.mk
> > +++ b/package/systemd/systemd.mk
> > @@ -4,7 +4,7 @@
> >  #
> >  ################################################################################
> >
> > -SYSTEMD_VERSION = 213
> > +SYSTEMD_VERSION = 214
> >  SYSTEMD_SITE = http://www.freedesktop.org/software/systemd/
> >  SYSTEMD_SOURCE = systemd-$(SYSTEMD_VERSION).tar.xz
> >  SYSTEMD_LICENSE = LGPLv2.1+; GPLv2+ for udev; MIT-like license for few source files listed in README
> > @@ -50,6 +50,9 @@ SYSTEMD_CONF_OPT += \
> >  	--disable-dbus \
> >  	--without-python
> >
> > +SYSTEMD_CONF_ENV = \
> > +	ac_cv_path_KMOD=/usr/bin/kmod
>
>  Since we would normally expect this to point into $(HOST_DIR), I think there
> should be a comment here.
>
This hack is needed to set the correct path to kmod in
kmod-static-nodes.service. I'll add a comment about this.
> > +
> >  ifeq ($(BR2_PACKAGE_SYSTEMD_COMPAT),y)
> >  SYSTEMD_CONF_OPT += --enable-compat-libs
> >  else
> > @@ -65,7 +68,6 @@ endif
> >
> >  ifeq ($(BR2_PACKAGE_ATTR),y)
> >  SYSTEMD_CONF_OPT += --enable-attr
> > -SYSTEMD_DEPENDENCIES += attr
>
>  Uh? How is it possible to do --enable-attr without depending on attr? Run-time
> dependency only? Then this should be explained in a comment.
GLibc offers all the extended attribute calls, so no need to depend on
libattr. Thinking it twice, I will completely remove this part, as the
configuration option has also been removed and there is no need for the tools
provided by attr.
> >  else
> >  SYSTEMD_CONF_OPT += --disable-attr
> >  endif
> > @@ -99,6 +101,9 @@ endif
> >
> >  ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y)
> >  SYSTEMD_CONF_OPT += --enable-networkd
> > +define SYSTEMD_USER_TIMESYNC
>
>  I don't suppose timesync and networkd are mutually exclusive, so this should be
> SYSTEMD_USER_NETWORK and it should be added to SYSTEMD_USERS, below.
True! In fact, systemd complains if the user systemd-network has not been
created (there is a reference to it in /usr/lib/tmpfiles.d/systemd.conf), even
if systemd-networkd has not been built. So I will unconditionaly create all
the users.
>
>  Regards,
>  Arnout
>
>
> > +	systemd-network -1 systemd-network -1 * - - - Network Manager
> > +endef
> >  else
> >  SYSTEMD_CONF_OPT += --disable-networkd
> >  define SYSTEMD_INSTALL_SERVICE_NETWORK
> > @@ -155,6 +160,8 @@ SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
> >  define SYSTEMD_USERS
> >  	systemd-journal -1 systemd-journal -1 * /var/log/journal - - Journal
> >  	systemd-journal-gateway -1 systemd-journal-gateway -1 * /var/log/journal - - Journal Gateway
> > +	systemd-resolve -1 systemd-resolve -1 * - - - Network Name Resolution Manager
> > +	systemd-bus-proxy -1 systemd-bus-proxy -1 * - - - Proxy D-Bus messages to/from a bus
> >  	$(SYSTEMD_USER_TIMESYNC)
> >  endef
> >
> >
>

Thank you very much for your review!

Best regards,
ELB

[1] http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/86510/

[Buildroot] [PATCH 1/1] systemd: bump to version 214

[Arnout Vandecappelle]

On 02/07/14 20:08, Eric Le Bihan wrote:
> Hi!
> On Wed, Jul 02, 2014 at 07:30:38AM +0200, Arnout Vandecappelle wrote:
>> > On 29/06/14 21:35, Eric Le Bihan wrote:
>>> > > This patch bumps systemd to version 214.
>>> > >
>>> > > Changes:
>>> > >
>>> > > - add new users: systemd-bus-proxy, systemd-network and systemd-resolve.
>>> > > - remove gtk-doc patch, as it is no longer needed.
>>> > > - force kmod path when configuring.
>>> > > - remove attr build dependency.
>>> > >
>>> > > Besides:
>>> > >
>>> > > - /var/lock no longer needs to be a symlink to /run, as systemd, via
>>> > >   tmpfiles.d, will automatically create a symlink to /run/lock at
>>> > >   runtime.
>>> > > - when using systemd-networkd, /etc/resolv.conf should now be a symlink
>>> > >   to /run/systemd/resolve/resolv.conf.
>> >
>> >  So, maybe the systemd package should make sure that this is the case? In a
>> > post-install hook for instance?
> I usually perform these steps in a post-build script. There was a recent
> discussion [1] about adding systemd/sysv specific target skeletons. If adding
> a post installation hook that rework /var and /run is OK, this can solve this
> problem.

 For resolv.conf, it is easy to create that symlink in the
POST_INSTALL_TARGET_HOOKS, so I would do it. A user can still override it in the
fs-overlay if needed.


 Regards,
 Arnout

[snip]

-- 
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:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 1/1] systemd: bump to version 214

[Thomas Petazzoni]

Dear Eric Le Bihan,

On Sun, 29 Jun 2014 21:35:37 +0200, Eric Le Bihan wrote:

> +SYSTEMD_CONF_ENV = \
> +	ac_cv_path_KMOD=/usr/bin/kmod

I just got a report from "nroach44" on IRC (Cc'ed to this e-mail) that
this chunk is actually also needed with systemd 213. From the IRC
discussions:

13:16 < NRoach44> kmod is being put in /usr/bin
13:17 < NRoach44> when systemd trys to run it from /bin
13:18 < kos_tom> with which version of systemd are you seeing this kmod issue?
13:18 < NRoach44> 213

So I obviously pointed "nroach44" to your 214 systemd bump patch, but I
believe that since the kmod issue exists with systemd 213, the chunk
above should probably be part of a separate patch.

Thanks!

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

[Buildroot] [PATCH 1/1] systemd: bump to version 214

[Arnout Vandecappelle]

On 03/07/14 13:21, Thomas Petazzoni wrote:
> Dear Eric Le Bihan,
> 
> On Sun, 29 Jun 2014 21:35:37 +0200, Eric Le Bihan wrote:
> 
>> +SYSTEMD_CONF_ENV = \
>> +	ac_cv_path_KMOD=/usr/bin/kmod
> 
> I just got a report from "nroach44" on IRC (Cc'ed to this e-mail) that
> this chunk is actually also needed with systemd 213. From the IRC
> discussions:
> 
> 13:16 < NRoach44> kmod is being put in /usr/bin
> 13:17 < NRoach44> when systemd trys to run it from /bin
> 13:18 < kos_tom> with which version of systemd are you seeing this kmod issue?
> 13:18 < NRoach44> 213
> 
> So I obviously pointed "nroach44" to your 214 systemd bump patch, but I
> believe that since the kmod issue exists with systemd 213, the chunk
> above should probably be part of a separate patch.

 This is probably a symptom of systemd moving to the everything-in-/usr
filesystem layout [1]. So we can expect more of that in the future.

 This everything-in-/usr actually doesn't sound like a bad idea. TLDR: move
everything in /bin and /lib to /usr/bin and /usr/lib, and make symlinks /bin ->
/usr/bin etc. Would be really trivial for us to implement.


 Regards,
 Arnout


[1] http://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/


-- 
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:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

[Buildroot] [PATCH 1/1] systemd: bump to version 214

[Peter Korsgaard]

>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

Hi,

 >  This is probably a symptom of systemd moving to the everything-in-/usr
 > filesystem layout [1]. So we can expect more of that in the future.

 >  This everything-in-/usr actually doesn't sound like a bad idea. TLDR: move
 > everything in /bin and /lib to /usr/bin and /usr/lib, and make symlinks /bin ->
 > /usr/bin etc. Would be really trivial for us to implement.

Don't forget /sbin + /usr/sbin - But Yes, I mentioned it on IRC the
other day as well. Could solve these kind of issues for good.

Anyone against it?

-- 
Bye, Peter Korsgaard