systemd: bump to v213

PATCH New Eric Le Bihan 2 participants 3 messages Jun 4, 2014 – Jun 8, 2014

lore

Share & tools

lore

Eric Le Bihan

author

2014-06-04 21:40 UTC #0 lore raw

v2 cover systemd: bump to v213

This patch bumps systemd to v213.

This version features systemd-timesyncd, a SNTP daemon, which is useful on machines without a RTC, like Raspberry Pi.

Note that in order to have systemd and this daemon to run properly, some changes to /var, /run and /etc/resolv.conf in the target skeleton should be made. This can be done in a post-build script (see
https://github.com/elebihan/buildroot-ext-elb/commit/557d5df324db4ec12d1b98bed7c1a899eb24bdb6
for an example).

Changes v1 -> v2:
- patch configure.ac instead of configure.
- use autoreconf (reported by ThomasP).
- add new patch to fix gtk-doc deactivation.
- add menu option to enable systemd-timesyncd if systemd-networkd is selected

Eric Le Bihan (1):
systemd: bump to v213

 package/systemd/Config.in                          | 12 ++++
 ...uild-sys-revert-use-of-ln-relative-option.patch | 73 +++++++++++++---------
 package/systemd/systemd-03-fix-no-gtk-doc.patch    | 23 +++++++
 package/systemd/systemd.mk                         | 14 ++++-
 4 files changed, 92 insertions(+), 30 deletions(-)
 create mode 100644 package/systemd/systemd-03-fix-no-gtk-doc.patch

--
1.9.3

Eric Le Bihan

author

2014-06-04 21:40 UTC #1 lore raw

PATCH v2 1/1 systemd: bump to v213

This patch bumps systemd to v213.

This new version introduces systemd-timesyncd, a SNTP daemon. This feature can be enabled if systemd-networkd is selected via the configuration menu. It is a simple alternative to ntpd, useful for machines without a RTC.

The patch for reverting the use of --relative option when calling ln has been refreshed, as the configure script now checks if ln supports the --relative option and fails if it does not.

Another patch for the proper deactivation of gtk-doc has been added.

All these steps now require an autoreconf.

Signed-off-by Eric Le Bihan <[email protected]>

---
 package/systemd/Config.in                          | 12 ++++
 ...uild-sys-revert-use-of-ln-relative-option.patch | 73 +++++++++++++---------
 package/systemd/systemd-03-fix-no-gtk-doc.patch    | 23 +++++++
 package/systemd/systemd.mk                         | 14 ++++-
 4 files changed, 92 insertions(+), 30 deletions(-)
 create mode 100644 package/systemd/systemd-03-fix-no-gtk-doc.patch

package/systemd/Config.in +12 -0

index 2566533..ce14415 100644
@@ -93,6 +93,18 @@ config BR2_PACKAGE_SYSTEMD_NETWORKD
 
 	  http://www.freedesktop.org/software/systemd/man/systemd-networkd.html
 
+config BR2_PACKAGE_SYSTEMD_TIMESYNCD
+	bool "enable SNTP client"
+	depends on BR2_PACKAGE_SYSTEMD_NETWORKD
+	help
+	  systemd-timesyncd is a service that may be used to synchronize the
+	  local system clock with a Network Time Protocol Server.
+
+	  This simple NTP solution is an alternative to sntp/ntpd from the ntp
+	  package.
+
+	  http://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html
+
 config BR2_PACKAGE_SYSTEMD_COMPAT
 	bool "enable compatibility libraries"
 	help

package/systemd/systemd-02-build-sys-revert-use-of-ln-relative-option.patch +44 ~~-29~~

144 lines not on this page · raw message

package/systemd/systemd-03-fix-no-gtk-doc.patch new file +23 -0

new file mode 100644
index 0000000..dc236a7
@@ -0,0 +1,23 @@
+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 <[email protected]>
+---
+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:

package/systemd/systemd.mk +13 -1

index e1c984f..ca51ddf 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SYSTEMD_VERSION = 212
+SYSTEMD_VERSION = 213
 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

@@ -18,6 +18,7 @@ SYSTEMD_DEPENDENCIES = \
 	host-gperf
 
 SYSTEMD_PROVIDES = udev
+SYSTEMD_AUTORECONF = YES
 
 # Make sure that systemd will always be built after busybox so that we have
 # a consistent init setup between two builds

@@ -34,6 +35,7 @@ SYSTEMD_CONF_OPT += \
 	--disable-selinux \
 	--disable-pam \
 	--disable-libcryptsetup \
+	--disable-gtk-doc \
 	--with-dbuspolicydir=/etc/dbus-1/system.d \
 	--with-dbussessionservicedir=/usr/share/dbus-1/services \
 	--with-dbussystemservicedir=/usr/share/dbus-1/system-services \

@@ -94,6 +96,15 @@ else
 SYSTEMD_CONF_OPT += --disable-networkd
 endif
 
+ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y)
+SYSTEMD_CONF_OPT += --enable-timesyncd
+define SYSTEMD_USER_TIMESYNC
+	systemd-timesync -1 systemd-timesync -1 * - - - Network Time Synchronization
+endef
+else
+SYSTEMD_CONF_OPT += --disable-timesyncd
+endif
+
 # mq_getattr needs -lrt
 SYSTEMD_MAKE_OPT += LIBS=-lrt
 SYSTEMD_MAKE_OPT += LDFLAGS+=-ldl

@@ -130,6 +141,7 @@ 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_USER_TIMESYNC)
 endef
 
 $(eval $(autotools-package))

Signature · 1 line

1.9.3

Thomas Petazzoni

Applied

2014-06-08 13:33 UTC #2 lore raw

v2 cover systemd: bump to v213

In reply to Eric Le Bihan

Dear Eric Le Bihan,

Quoted 4 lines · Eric Le Bihan

This patch bumps systemd to v213.
This version features systemd-timesyncd, a SNTP daemon, which is useful on machines without a RTC, like Raspberry Pi.

Applied, thanks.

Quoted 5 lines

Note that in order to have systemd and this daemon to run properly, some changes to /var, /run and /etc/resolv.conf in the target skeleton should be made. This can be done in a post-build script (see
https://github.com/elebihan/buildroot-ext-elb/commit/557d5df324db4ec12d1b98bed7c1a899eb24bdb6
for an example).

I think we should find a way of making this automatic. I believe it is quite related to something we've discussed last week with Maxime: maybe the skeleton should become a proper package, and should be freed from everything Busybox-specific. Then, we can have additional skeleton-busybox and skeleton-systemd packages, or some other mechanism to introduce the specificities needed by these init systems (maybe directly in the busybox and systemd packages).

Thanks!

Thomas

Signature · 3 lines

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