* [Buildroot] [PATCH 1/1] systemd: bumped to version 206
@ 2013-08-30 14:32 eric.le.bihan.dev at free.fr
2013-08-30 14:36 ` Thomas Petazzoni
2013-09-02 6:18 ` Arnout Vandecappelle
0 siblings, 2 replies; 13+ messages in thread
From: eric.le.bihan.dev at free.fr @ 2013-08-30 14:32 UTC (permalink / raw)
To: buildroot
From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
This patch updates Systemd from version 44 to 206.
It includes fixes for compiling with uClibc, based on the ones from Khem Raj,
used by Yocto project:
http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-core/systemd/systemd/
Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
---
package/systemd/Config.in | 20 +-
...tenv-instead-of-secure_getenv-when-using-.patch | 26 ++
...ed-posix_fallocate-calls-when-using-uClib.patch | 85 ++++
...ed-pwritev-preadv-calls-when-using-uClibc.patch | 32 ++
...fer-getty-to-agetty-in-console-setup-unit.patch | 39 ++
...ms-sscanf-modifier-not-being-available-in.patch | 417 ++++++++++++++++++++
...-mknod-capability-to-kmod-static-nodes.se.patch | 26 ++
package/systemd/systemd-fix-getty-unit.patch | 34 --
package/systemd/systemd-fix-page-size.patch | 43 --
package/systemd/systemd-uclibc-fix.patch | 59 ---
package/systemd/systemd.mk | 45 ++-
11 files changed, 677 insertions(+), 149 deletions(-)
create mode 100644 package/systemd/systemd-0001-core-use-getenv-instead-of-secure_getenv-when-using-.patch
create mode 100644 package/systemd/systemd-0002-journal-fixed-posix_fallocate-calls-when-using-uClib.patch
create mode 100644 package/systemd/systemd-0003-bus-fixed-pwritev-preadv-calls-when-using-uClibc.patch
create mode 100644 package/systemd/systemd-0004-units-prefer-getty-to-agetty-in-console-setup-unit.patch
create mode 100644 package/systemd/systemd-0005-core-fixed-ms-sscanf-modifier-not-being-available-in.patch
create mode 100644 package/systemd/systemd-0006-units-Added-mknod-capability-to-kmod-static-nodes.se.patch
delete mode 100644 package/systemd/systemd-fix-getty-unit.patch
delete mode 100644 package/systemd/systemd-fix-page-size.patch
delete mode 100644 package/systemd/systemd-uclibc-fix.patch
diff --git a/package/systemd/Config.in b/package/systemd/Config.in
index 86ab2cf..ae86de9 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -1,5 +1,6 @@
config BR2_PACKAGE_SYSTEMD
bool "systemd"
+ depends on BR2_LARGEFILE
depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV
depends on BR2_INET_IPV6
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
@@ -18,6 +19,21 @@ config BR2_PACKAGE_SYSTEMD
http://freedesktop.org/wiki/Software/systemd
+if BR2_PACKAGE_SYSTEMD
+
+config BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY
+ bool "HTTP server for journal events"
+ default n
+ select BR2_PACKAGE_LIBMICROHTTPD
+ help
+ systemd-journal-gatewayd serves journal events over the network.
+ Clients must connect using HTTP. The server listens on port 19531 by
+ default.
+
+ http://www.freedesktop.org/software/systemd/man/systemd-journal-gatewayd.service.html
+
+endif
+
comment "systemd not available (depends on /dev management with udev and ipv6 support, and thread support in toolchain)"
- depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV || !BR2_INET_IPV6 || \\
- !BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_LARGEFILE || !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV || \\
+ !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/systemd/systemd-0001-core-use-getenv-instead-of-secure_getenv-when-using-.patch b/package/systemd/systemd-0001-core-use-getenv-instead-of-secure_getenv-when-using-.patch
new file mode 100644
index 0000000..f0e955f
--- /dev/null
+++ b/package/systemd/systemd-0001-core-use-getenv-instead-of-secure_getenv-when-using-.patch
@@ -0,0 +1,26 @@
+From c6e94fd5b8f39fd09f703e25a226e2bd52df1f4f Mon Sep 17 00:00:00 2001
+From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
+Date: Thu, 29 Aug 2013 15:34:49 +0200
+Subject: [PATCH 1/6] core: use getenv() instead of secure_getenv() when using
+ uClibc
+
+---
+ src/shared/missing.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/shared/missing.h b/src/shared/missing.h
+index 534b3cc..48280c1 100644
+--- a/src/shared/missing.h
++++ b/src/shared/missing.h
+@@ -254,6 +254,8 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle
+ #ifndef HAVE_SECURE_GETENV
+ # ifdef HAVE___SECURE_GETENV
+ # define secure_getenv __secure_getenv
++# elif defined __UCLIBC__
++# define secure_getenv getenv
+ # else
+ # error neither secure_getenv nor __secure_getenv are available
+ # endif
+--
+1.7.9.5
+
diff --git a/package/systemd/systemd-0002-journal-fixed-posix_fallocate-calls-when-using-uClib.patch b/package/systemd/systemd-0002-journal-fixed-posix_fallocate-calls-when-using-uClib.patch
new file mode 100644
index 0000000..2acdcca
--- /dev/null
+++ b/package/systemd/systemd-0002-journal-fixed-posix_fallocate-calls-when-using-uClib.patch
@@ -0,0 +1,85 @@
+From 0714f43ca1f423e7adb4e868f717f0b923a54b63 Mon Sep 17 00:00:00 2001
+From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
+Date: Thu, 29 Aug 2013 15:37:06 +0200
+Subject: [PATCH 2/6] journal: fixed posix_fallocate() calls when using uClibc
+
+---
+ src/journal/journal-file.c | 18 ++++++++++++++++--
+ src/journal/journald-kmsg.c | 15 ++++++++++++++-
+ 2 files changed, 30 insertions(+), 3 deletions(-)
+
+diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
+index 1236403..c2a4d64 100644
+--- a/src/journal/journal-file.c
++++ b/src/journal/journal-file.c
+@@ -314,7 +314,7 @@ static int journal_file_verify_header(JournalFile *f) {
+
+ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) {
+ uint64_t old_size, new_size;
+- int r;
++ int r = 0;
+
+ assert(f);
+
+@@ -359,10 +359,24 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size)
+ /* Note that the glibc fallocate() fallback is very
+ inefficient, hence we try to minimize the allocation area
+ as we can. */
++#ifdef HAVE_POSIX_ALLOCATE
+ r = posix_fallocate(f->fd, old_size, new_size - old_size);
+ if (r != 0)
+ return -r;
+-
++#else
++ /* Use good old method to write zeros into the journal file
++ perhaps very inefficient yet working. */
++ if (new_size > old_size) {
++ char *buf = alloca(new_size - old_size);
++ off_t oldpos = lseek(f->fd, 0, SEEK_CUR);
++ bzero(buf, new_size - old_size);
++ lseek(f->fd, old_size, SEEK_SET);
++ r = write(f->fd, buf, new_size - old_size);
++ lseek(f->fd, oldpos, SEEK_SET);
++ }
++ if (r < 0)
++ return -errno;
++#endif /* HAVE_POSIX_FALLOCATE */
+ if (fstat(f->fd, &f->last_stat) < 0)
+ return -errno;
+
+diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
+index 21649d0..744d3bc 100644
+--- a/src/journal/journald-kmsg.c
++++ b/src/journal/journald-kmsg.c
+@@ -408,6 +408,7 @@ int server_open_dev_kmsg(Server *s) {
+ int server_open_kernel_seqnum(Server *s) {
+ int fd;
+ uint64_t *p;
++ int r = 0;
+
+ assert(s);
+
+@@ -421,7 +422,19 @@ int server_open_kernel_seqnum(Server *s) {
+ return 0;
+ }
+
+- if (posix_fallocate(fd, 0, sizeof(uint64_t)) < 0) {
++#ifdef HAVE_POSIX_ALLOCATE
++ r = posix_fallocate(fd, 0, sizeof(uint64_t));
++#else
++ /* Use good old method to write zeros into the journal file
++ perhaps very inefficient yet working. */
++ char *buf = alloca(sizeof(uint64_t));
++ off_t oldpos = lseek(fd, 0, SEEK_CUR);
++ bzero(buf, sizeof(uint64_t));
++ lseek(fd, 0, SEEK_SET);
++ r = write(fd, buf, sizeof(uint64_t));
++ lseek(fd, oldpos, SEEK_SET);
++#endif /* HAVE_POSIX_FALLOCATE */
++ if (r < 0) {
+ log_error("Failed to allocate sequential number file, ignoring: %m");
+ close_nointr_nofail(fd);
+ return 0;
+--
+1.7.9.5
+
diff --git a/package/systemd/systemd-0003-bus-fixed-pwritev-preadv-calls-when-using-uClibc.patch b/package/systemd/systemd-0003-bus-fixed-pwritev-preadv-calls-when-using-uClibc.patch
new file mode 100644
index 0000000..c023924
--- /dev/null
+++ b/package/systemd/systemd-0003-bus-fixed-pwritev-preadv-calls-when-using-uClibc.patch
@@ -0,0 +1,32 @@
+From 884323ac0c242e12f5dc7c4bcc487cd6b64e1069 Mon Sep 17 00:00:00 2001
+From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
+Date: Thu, 29 Aug 2013 15:38:31 +0200
+Subject: [PATCH 3/6] bus: fixed pwritev/preadv calls when using uClibc
+
+---
+ src/libsystemd-bus/test-bus-memfd.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/libsystemd-bus/test-bus-memfd.c b/src/libsystemd-bus/test-bus-memfd.c
+index 05ef555..91a9556 100644
+--- a/src/libsystemd-bus/test-bus-memfd.c
++++ b/src/libsystemd-bus/test-bus-memfd.c
+@@ -146,6 +146,7 @@ int main(int argc, char *argv[]) {
+ assert_se(memcmp(buf, "ll", 2) == 0);
+
+ /* writev it out*/
++#ifndef __UCLIBC__
+ iov[0].iov_base = (char *)"ABC";
+ iov[0].iov_len = 3;
+ iov[1].iov_base = (char *)"DEF";
+@@ -167,6 +168,7 @@ int main(int argc, char *argv[]) {
+ assert_se(memcmp(bufv[0], "ABC", 3) == 0);
+ assert_se(memcmp(bufv[1], "DEF", 3) == 0);
+ assert_se(memcmp(bufv[2], "GHI", 3) == 0);
++#endif /* __UCLIBC__ */
+
+ sd_memfd_free(m);
+
+--
+1.7.9.5
+
diff --git a/package/systemd/systemd-0004-units-prefer-getty-to-agetty-in-console-setup-unit.patch b/package/systemd/systemd-0004-units-prefer-getty-to-agetty-in-console-setup-unit.patch
new file mode 100644
index 0000000..77ed365
--- /dev/null
+++ b/package/systemd/systemd-0004-units-prefer-getty-to-agetty-in-console-setup-unit.patch
@@ -0,0 +1,39 @@
+From a39d2ab91dbad209e6f35658327e10733fe910f0 Mon Sep 17 00:00:00 2001
+From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
+Date: Thu, 29 Aug 2013 15:40:10 +0200
+Subject: [PATCH 4/6] units: prefer getty to agetty in console setup unit
+
+---
+ units/getty at .service.m4 | 2 +-
+ units/serial-getty at .service.m4 | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/units/getty at .service.m4 b/units/getty at .service.m4
+index 7853652..34cdf11 100644
+--- a/units/getty at .service.m4
++++ b/units/getty at .service.m4
+@@ -27,7 +27,7 @@ ConditionPathExists=/dev/tty0
+
+ [Service]
+ # the VT is cleared by TTYVTDisallocate
+-ExecStart=-/sbin/agetty --noclear %I
++ExecStart=-/sbin/getty -L %I
+ Type=idle
+ Restart=always
+ RestartSec=0
+diff --git a/units/serial-getty at .service.m4 b/units/serial-getty at .service.m4
+index 5e16963..9657800 100644
+--- a/units/serial-getty at .service.m4
++++ b/units/serial-getty at .service.m4
+@@ -22,7 +22,7 @@ Before=getty.target
+ IgnoreOnIsolate=yes
+
+ [Service]
+-ExecStart=-/sbin/agetty --keep-baud %I 115200,38400,9600
++ExecStart=-/sbin/getty -L %I 115200
+ Type=idle
+ Restart=always
+ RestartSec=0
+--
+1.7.9.5
+
diff --git a/package/systemd/systemd-0005-core-fixed-ms-sscanf-modifier-not-being-available-in.patch b/package/systemd/systemd-0005-core-fixed-ms-sscanf-modifier-not-being-available-in.patch
new file mode 100644
index 0000000..2e22944
--- /dev/null
+++ b/package/systemd/systemd-0005-core-fixed-ms-sscanf-modifier-not-being-available-in.patch
@@ -0,0 +1,417 @@
+From acddfb947d61a21fb4146ae91b17d0e0f6c0fdd3 Mon Sep 17 00:00:00 2001
+From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
+Date: Thu, 29 Aug 2013 15:44:20 +0200
+Subject: [PATCH 5/6] core: fixed %ms sscanf() modifier not being available in
+ uClibc
+
+---
+ configure.ac | 17 +++++++++++++
+ src/core/mount-setup.c | 10 ++++++--
+ src/core/mount.c | 30 +++++++++++++++++++++--
+ src/core/swap.c | 13 ++++++++++
+ src/core/umount.c | 34 +++++++++++++++++++++++---
+ src/cryptsetup/cryptsetup-generator.c | 11 +++++++++
+ src/fsck/fsck.c | 13 ++++++++--
+ src/shared/socket-util.c | 10 ++++++++
+ src/tmpfiles/tmpfiles.c | 42 +++++++++++++++++++++++++++++++++
+ 9 files changed, 171 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 759073a..09a9cb6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -78,6 +78,23 @@ AC_PATH_PROG([KMOD], [kmod], [/usr/bin/kmod])
+
+ AC_PATH_PROG([KEXEC], [kexec], [/usr/sbin/kexec])
+
++# check for few functions not implemented in uClibc
++
++AC_CHECK_FUNCS_ONCE(mkostemp execvpe posix_fallocate)
++
++# check for %ms modifier support - assume always no if cross compiling
++
++AC_MSG_CHECKING([whether %ms modifier is supported by *scanf])
++
++AC_RUN_IFELSE(
++ [AC_LANG_PROGRAM([[ include <stdio.h> ]],
++ [[ char *buf1, *buf2, *buf3, str="1 2.3 abcde" ;
++ int rc = sscanf(str, "%ms %ms %ms", &buf1, &buf2, &buf3) ;
++ return (rc == 3)? 0: 1;]])],
++ [AC_DEFINE([HAVE_SCANF_MS], [1], [Define if %ms modifier is supported by *scanf.])],
++ [AC_MSG_RESULT([no])],
++ [AC_MSG_RESULT([no])])
++
+ # gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
+ m4_ifdef([GTK_DOC_CHECK], [
+ GTK_DOC_CHECK([1.18],[--flavour no-tmpl])],
+diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
+index 4359f59..16ce39a 100644
+--- a/src/core/mount-setup.c
++++ b/src/core/mount-setup.c
+@@ -28,6 +28,7 @@
+ #include <assert.h>
+ #include <unistd.h>
+ #include <ftw.h>
++#include <linux/fs.h>
+
+ #include "mount-setup.h"
+ #include "dev-setup.h"
+@@ -43,6 +44,8 @@
+ #include "virt.h"
+ #include "efivars.h"
+
++#include "config.h"
++
+ #ifndef TTY_GID
+ #define TTY_GID 5
+ #endif
+@@ -233,9 +236,12 @@ int mount_cgroup_controllers(char ***join_controllers) {
+ for (;;) {
+ char *controller;
+ int enabled = 0;
+-
++#ifdef HAVE_SCANF_MS
+ if (fscanf(f, "%ms %*i %*i %i", &controller, &enabled) != 2) {
+-
++#else
++ controller = malloc(257);
++ if (fscanf(f, "%256s %*i %*i %i", controller, &enabled) != 2) {
++#endif /* HAVE_SCANF_MS */
+ if (feof(f))
+ break;
+
+diff --git a/src/core/mount.c b/src/core/mount.c
+index c7d29b0..b76d91c 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -43,6 +43,8 @@
+ #include "exit-status.h"
+ #include "def.h"
+
++#include "config.h"
++
+ static const UnitActiveState state_translation_table[_MOUNT_STATE_MAX] = {
+ [MOUNT_DEAD] = UNIT_INACTIVE,
+ [MOUNT_MOUNTING] = UNIT_ACTIVATING,
+@@ -1634,7 +1636,7 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
+ int k;
+
+ device = path = options = options2 = fstype = d = p = o = NULL;
+-
++#ifdef HAVE_SCANF_MS
+ if ((k = fscanf(m->proc_self_mountinfo,
+ "%*s " /* (1) mount id */
+ "%*s " /* (2) parent id */
+@@ -1653,7 +1655,31 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
+ &fstype,
+ &device,
+ &options2)) != 5) {
+-
++#else
++ path = malloc(257);
++ options = malloc(257);
++ fstype = malloc(257);
++ device = malloc(257);
++ options2 = malloc(257);
++ if ((k = fscanf(m->proc_self_mountinfo,
++ "%*s " /* (1) mount id */
++ "%*s " /* (2) parent id */
++ "%*s " /* (3) major:minor */
++ "%*s " /* (4) root */
++ "%256s " /* (5) mount point */
++ "%256s" /* (6) mount options */
++ "%*[^-]" /* (7) optional fields */
++ "- " /* (8) separator */
++ "%256s " /* (9) file system type */
++ "%256s" /* (10) mount source */
++ "%256s" /* (11) mount options 2 */
++ "%*[^\n]", /* some rubbish at the end */
++ path,
++ options,
++ fstype,
++ device,
++ options2)) != 5) {
++#endif /* HAVE_SCANF_MS */
+ if (k == EOF)
+ break;
+
+diff --git a/src/core/swap.c b/src/core/swap.c
+index 825503f..9886edc 100644
+--- a/src/core/swap.c
++++ b/src/core/swap.c
+@@ -41,6 +41,8 @@
+ #include "path-util.h"
+ #include "virt.h"
+
++#include "config.h"
++
+ static const UnitActiveState state_translation_table[_SWAP_STATE_MAX] = {
+ [SWAP_DEAD] = UNIT_INACTIVE,
+ [SWAP_ACTIVATING] = UNIT_ACTIVATING,
+@@ -1059,6 +1061,7 @@ static int swap_load_proc_swaps(Manager *m, bool set_flags) {
+ char *dev = NULL, *d;
+ int prio = 0, k;
+
++#ifdef HAVE_SCANF_MS
+ k = fscanf(m->proc_swaps,
+ "%ms " /* device/file */
+ "%*s " /* type of swap */
+@@ -1066,6 +1069,16 @@ static int swap_load_proc_swaps(Manager *m, bool set_flags) {
+ "%*s " /* used */
+ "%i\n", /* priority */
+ &dev, &prio);
++#else
++ dev = malloc(257);
++ k = fscanf(m->proc_swaps,
++ "%256s "/* device/file */
++ "%*s " /* type of swap */
++ "%*s " /* swap size */
++ "%*s " /* used */
++ "%i\n", /* priority */
++ dev, &prio);
++#endif /* HAVE_SCANF_MS */
+ if (k != 2) {
+ if (k == EOF)
+ break;
+diff --git a/src/core/umount.c b/src/core/umount.c
+index 1e95ad7..fb48236 100644
+--- a/src/core/umount.c
++++ b/src/core/umount.c
+@@ -36,6 +36,8 @@
+ #include "util.h"
+ #include "virt.h"
+
++#include "config.h"
++
+ typedef struct MountPoint {
+ char *path;
+ dev_t devnum;
+@@ -75,7 +77,7 @@ static int mount_points_list_get(MountPoint **head) {
+ MountPoint *m;
+
+ path = p = NULL;
+-
++#ifdef HAVE_SCANF_MS
+ if ((k = fscanf(proc_self_mountinfo,
+ "%*s " /* (1) mount id */
+ "%*s " /* (2) parent id */
+@@ -90,6 +92,23 @@ static int mount_points_list_get(MountPoint **head) {
+ "%*s" /* (11) mount options 2 */
+ "%*[^\n]", /* some rubbish at the end */
+ &path)) != 1) {
++#else
++ path = malloc(257);
++ if ((k = fscanf(proc_self_mountinfo,
++ "%*s " /* (1) mount id */
++ "%*s " /* (2) parent id */
++ "%*s " /* (3) major:minor */
++ "%*s " /* (4) root */
++ "%256s " /* (5) mount point */
++ "%*s" /* (6) mount options */
++ "%*[^-]" /* (7) optional fields */
++ "- " /* (8) separator */
++ "%*s " /* (9) file system type */
++ "%*s" /* (10) mount source */
++ "%*s" /* (11) mount options 2 */
++ "%*[^\n]", /* some rubbish at the end */
++ path)) != 1) {
++#endif /* HAVE_SCANF_MS */
+ if (k == EOF)
+ break;
+
+@@ -151,7 +170,7 @@ static int swap_list_get(MountPoint **head) {
+ MountPoint *swap;
+ char *dev = NULL, *d;
+ int k;
+-
++#ifdef HAVE_SCANF_MS
+ if ((k = fscanf(proc_swaps,
+ "%ms " /* device/file */
+ "%*s " /* type of swap */
+@@ -159,7 +178,16 @@ static int swap_list_get(MountPoint **head) {
+ "%*s " /* used */
+ "%*s\n", /* priority */
+ &dev)) != 1) {
+-
++#else
++ dev = malloc(257);
++ if ((k = fscanf(proc_swaps,
++ "%256s " /* device/file */
++ "%*s " /* type of swap */
++ "%*s " /* swap size */
++ "%*s " /* used */
++ "%*s\n", /* priority */
++ dev)) != 1) {
++#endif /* HAVE_SCANF_MS */
+ if (k == EOF)
+ break;
+
+diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
+index 81b7708..7d379ec 100644
+--- a/src/cryptsetup/cryptsetup-generator.c
++++ b/src/cryptsetup/cryptsetup-generator.c
+@@ -31,6 +31,8 @@
+ #include "strv.h"
+ #include "fileio.h"
+
++#include "config.h"
++
+ static const char *arg_dest = "/tmp";
+ static bool arg_enabled = true;
+ static bool arg_read_crypttab = true;
+@@ -398,7 +400,16 @@ int main(int argc, char *argv[]) {
+ if (*l == '#' || *l == 0)
+ continue;
+
++#ifdef HAVE_SCANF_MS
+ k = sscanf(l, "%ms %ms %ms %ms", &name, &device, &password, &options);
++#else
++ name = malloc(257);
++ device = malloc(257);
++ password = malloc(257);
++ options = malloc(257);
++ k = sscanf(l, "%256s %256s %256s %256s", name, device, password, options);
++#endif /* HAVE_SCANF_MS */
++
+ if (k < 2 || k > 4) {
+ log_error("Failed to parse /etc/crypttab:%u, ignoring.", n);
+ r = EXIT_FAILURE;
+diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
+index f298cf7..d485f0d 100644
+--- a/src/fsck/fsck.c
++++ b/src/fsck/fsck.c
+@@ -37,6 +37,8 @@
+ #include "virt.h"
+ #include "fileio.h"
+
++#include "config.h"
++
+ static bool arg_skip = false;
+ static bool arg_force = false;
+ static bool arg_show_progress = false;
+@@ -198,9 +200,16 @@ static int process_progress(int fd) {
+ char *device;
+ double p;
+ usec_t t;
+-
++#ifdef HAVE_SCANF_MS
+ if (fscanf(f, "%i %lu %lu %ms", &pass, &cur, &max, &device) != 4)
+- break;
++#else
++ device = malloc(257);
++ if (fscanf(f, "%i %lu %lu %256s", &pass, &cur, &max, device) != 4) {
++ free(device);
++ }
++
++#endif /* HAVE_SCANF_MS */
++ break;
+
+ /* Only show one progress counter at max */
+ if (!locked) {
+diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
+index c583d3d..a09bb2d 100644
+--- a/src/shared/socket-util.c
++++ b/src/shared/socket-util.c
+@@ -40,6 +40,8 @@
+ #include "missing.h"
+ #include "fileio.h"
+
++#include "config.h"
++
+ int socket_address_parse(SocketAddress *a, const char *s) {
+ int r;
+ char *e, *n;
+@@ -203,8 +205,16 @@ int socket_address_parse_netlink(SocketAddress *a, const char *s) {
+ a->type = SOCK_RAW;
+
+ errno = 0;
++#ifdef HAVE_SCANF_MS
+ if (sscanf(s, "%ms %u", &sfamily, &group) < 1)
+ return errno > 0 ? -errno : -EINVAL;
++#else
++ sfamily = malloc(257);
++ if (sscanf(s, "%256s %u", sfamily, &group) < 1) {
++ free(sfamily);
++ return errno ? -errno : -EINVAL;
++ }
++#endif /* HAVE_SCANF_MS */
+
+ family = netlink_family_from_string(sfamily);
+ if (family < 0)
+diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
+index eae993e..ef490f9 100644
+--- a/src/tmpfiles/tmpfiles.c
++++ b/src/tmpfiles/tmpfiles.c
+@@ -52,6 +52,8 @@
+ #include "conf-files.h"
+ #include "capability.h"
+
++#include "config.h"
++
+ /* This reads all files listed in /etc/tmpfiles.d/?*.conf and creates
+ * them in the file system. This is intended to be used to create
+ * properly owned directories beneath /tmp, /var/tmp, /run, which are
+@@ -1018,6 +1020,12 @@ static bool item_equal(Item *a, Item *b) {
+ return true;
+ }
+
++#define FREE_EMPTY_STR(p) \
++ if (*p == '\0') { \
++ free(p); \
++ p = 0; \
++ }
++
+ static int parse_line(const char *fname, unsigned line, const char *buffer) {
+ _cleanup_item_free_ Item *i = NULL;
+ Item *existing;
+@@ -1035,6 +1043,7 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
+ if (!i)
+ return log_oom();
+
++#ifdef HAVE_SCANF_MS
+ r = sscanf(buffer,
+ "%c %ms %ms %ms %ms %ms %n",
+ &type,
+@@ -1044,6 +1053,39 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
+ &group,
+ &age,
+ &n);
++#else
++ i->path = calloc(257, sizeof(char));
++ mode = calloc(257, sizeof(char));
++ user = calloc(257, sizeof(char));
++ group = calloc(257, sizeof(char));
++ age = calloc(257, sizeof(char));
++
++ if (!i->path || !mode || !user || !group || !age)
++ return log_oom();
++
++ r = sscanf(buffer,
++ "%c "
++ "%256s "
++ "%256s "
++ "%256s "
++ "%256s "
++ "%256s "
++ "%n",
++ &type,
++ i->path,
++ mode,
++ user,
++ group,
++ age,
++ &n);
++
++ FREE_EMPTY_STR(user);
++ FREE_EMPTY_STR(mode);
++ FREE_EMPTY_STR(group);
++ FREE_EMPTY_STR(age);
++
++#endif /* HAVE_SCANF_MS */
++
+ if (r < 2) {
+ log_error("[%s:%u] Syntax error.", fname, line);
+ return -EIO;
+--
+1.7.9.5
+
diff --git a/package/systemd/systemd-0006-units-Added-mknod-capability-to-kmod-static-nodes.se.patch b/package/systemd/systemd-0006-units-Added-mknod-capability-to-kmod-static-nodes.se.patch
new file mode 100644
index 0000000..642f51e
--- /dev/null
+++ b/package/systemd/systemd-0006-units-Added-mknod-capability-to-kmod-static-nodes.se.patch
@@ -0,0 +1,26 @@
+From 3739505ce24e690a6d18ecc88abe9570eba27f67 Mon Sep 17 00:00:00 2001
+From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
+Date: Thu, 29 Aug 2013 15:46:25 +0200
+Subject: [PATCH 6/6] units: Added mknod capability to
+ kmod-static-nodes.service.
+
+Fixes errors seen when booting VMs on QEMU.
+---
+ units/kmod-static-nodes.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in
+index cdfc6e5..d8a8420 100644
+--- a/units/kmod-static-nodes.service.in
++++ b/units/kmod-static-nodes.service.in
+@@ -9,6 +9,7 @@
+ Description=Create list of required static device nodes for the current kernel
+ DefaultDependencies=no
+ Before=sysinit.target systemd-tmpfiles-setup-dev.service
++ConditionCapability=CAP_MKNOD
+
+ [Service]
+ Type=oneshot
+--
+1.7.9.5
+
diff --git a/package/systemd/systemd-fix-getty-unit.patch b/package/systemd/systemd-fix-getty-unit.patch
deleted file mode 100644
index 6df54b1..0000000
--- a/package/systemd/systemd-fix-getty-unit.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Prefer getty to agetty in console setup systemd units
-
-Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
----
- units/getty at .service.m4 | 2 +-
- units/serial-getty at .service.m4 | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: systemd-37/units/getty at .service.m4
-===================================================================
---- systemd-37.orig/units/getty at .service.m4
-+++ systemd-37/units/getty at .service.m4
-@@ -32,7 +32,7 @@
-
- [Service]
- Environment=TERM=linux
--ExecStart=-/sbin/agetty %I 38400
-+ExecStart=-/sbin/getty -L %I 115200 vt100
- Restart=always
- RestartSec=0
- UtmpIdentifier=%I
-Index: systemd-37/units/serial-getty at .service.m4
-===================================================================
---- systemd-37.orig/units/serial-getty at .service.m4
-+++ systemd-37/units/serial-getty at .service.m4
-@@ -32,7 +32,7 @@
-
- [Service]
- Environment=TERM=vt100
--ExecStart=-/sbin/agetty -s %I 115200,38400,9600
-+ExecStart=-/sbin/getty -L %I 115200 vt100
- Restart=always
- RestartSec=0
- UtmpIdentifier=%I
diff --git a/package/systemd/systemd-fix-page-size.patch b/package/systemd/systemd-fix-page-size.patch
deleted file mode 100644
index 241ceb8..0000000
--- a/package/systemd/systemd-fix-page-size.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 7264278fbbdc1dc6c30fedc902d1337594aa6ff6
-Author: Lennart Poettering <lennart@poettering.net>
-Date: Wed Mar 21 23:47:44 2012 +0100
-
- journal: PAGE_SIZE is not known on ppc and other archs
-
- Let's use NAME_MAX, as suggested by Dan Walsh
-
-diff --git a/src/journal/journald.c b/src/journal/journald.c
-index d27cb60..87390bd 100644
---- a/src/journal/journald.c
-+++ b/src/journal/journald.c
-@@ -29,7 +29,6 @@
- #include <sys/ioctl.h>
- #include <linux/sockios.h>
- #include <sys/statvfs.h>
--#include <sys/user.h>
-
- #include <systemd/sd-journal.h>
- #include <systemd/sd-login.h>
-@@ -2149,10 +2148,20 @@ static int process_event(Server *s, struct epoll_event *ev) {
- size_t label_len = 0;
- union {
- struct cmsghdr cmsghdr;
-+
-+ /* We use NAME_MAX space for the
-+ * SELinux label here. The kernel
-+ * currently enforces no limit, but
-+ * according to suggestions from the
-+ * SELinux people this will change and
-+ * it will probably be identical to
-+ * NAME_MAX. For now we use that, but
-+ * this should be updated one day when
-+ * the final limit is known.*/
- uint8_t buf[CMSG_SPACE(sizeof(struct ucred)) +
- CMSG_SPACE(sizeof(struct timeval)) +
-- CMSG_SPACE(sizeof(int)) +
-- CMSG_SPACE(PAGE_SIZE)]; /* selinux label */
-+ CMSG_SPACE(sizeof(int)) + /* fd */
-+ CMSG_SPACE(NAME_MAX)]; /* selinux label */
- } control;
- ssize_t n;
- int v;
diff --git a/package/systemd/systemd-uclibc-fix.patch b/package/systemd/systemd-uclibc-fix.patch
deleted file mode 100644
index 9a20845..0000000
--- a/package/systemd/systemd-uclibc-fix.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-[PATCH] fix build with uClibc
-
-Based on OE patch from Khem Raj:
-
-http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-core/systemd/systemd/paper-over-mkostemp.patch
-
-But extended to also cover execvpe (OE carries a patch adding execvpe
-support to uClibc).
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- src/journal/journal-file.c | 2 ++
- src/macro.h | 15 +++++++++++++++
- 2 files changed, 17 insertions(+)
-
-Index: systemd-44/src/macro.h
-===================================================================
---- systemd-44.orig/src/macro.h
-+++ systemd-44/src/macro.h
-@@ -28,6 +28,21 @@
- #include <sys/uio.h>
- #include <inttypes.h>
-
-+#ifdef __UCLIBC__
-+/* uclibc does not implement mkostemp GNU extension */
-+#define mkostemp(x,y) mkstemp(x)
-+/* uclibc does not implement execvpe GNU extension */
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE
-+#endif
-+#include <unistd.h>
-+static inline int execvpe(const char *file, char *const argv[],
-+ char *const envp[])
-+{
-+ environ = (char **)envp;
-+ return execvp(file, argv);
-+}
-+#endif
- #define _printf_attr_(a,b) __attribute__ ((format (printf, a, b)))
- #define _sentinel_ __attribute__ ((sentinel))
- #define _noreturn_ __attribute__((noreturn))
-Index: systemd-44/src/journal/journal-file.c
-===================================================================
---- systemd-44.orig/src/journal/journal-file.c
-+++ systemd-44/src/journal/journal-file.c
-@@ -229,11 +229,13 @@
- }
- }
-
-+#ifndef __UCLIBC__
- /* Note that the glibc fallocate() fallback is very
- inefficient, hence we try to minimize the allocation area
- as we can. */
- if (posix_fallocate(f->fd, old_size, new_size - old_size) < 0)
- return -errno;
-+#endif
-
- if (fstat(f->fd, &f->last_stat) < 0)
- return -errno;
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index 1bb429c..6fc6268 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -4,7 +4,7 @@
#
################################################################################
-SYSTEMD_VERSION = 44
+SYSTEMD_VERSION = 206
SYSTEMD_SITE = http://www.freedesktop.org/software/systemd/
SYSTEMD_SOURCE = systemd-$(SYSTEMD_VERSION).tar.xz
SYSTEMD_INSTALL_STAGING = YES
@@ -13,6 +13,7 @@ SYSTEMD_DEPENDENCIES = \
libcap \
udev \
dbus
+SYSTEMD_AUTORECONF = YES
# Make sure that systemd will always be built after busybox so that we have
# a consistent init setup between two builds
@@ -21,21 +22,21 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
endif
SYSTEMD_CONF_OPT += \
- --with-distro=other \
+ --localstatedir=/var \
+ --enable-static=no \
+ --disable-manpages \
--disable-selinux \
--disable-pam \
--disable-libcryptsetup \
- --disable-gtk \
- --disable-plymouth \
- --with-rootdir=/ \
--with-dbuspolicydir=/etc/dbus-1/system.d \
--with-dbussessionservicedir=/usr/share/dbus-1/services \
--with-dbussystemservicedir=/usr/share/dbus-1/system-services \
--with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
- --with-udevrulesdir=/etc/udev/rules.d \
- --with-sysvinit-path=/etc/init.d/ \
- --without-sysvrcd-path \
- --enable-split-usr
+ --enable-split-usr \
+ --enable-introspection=no \
+ --disable-efi \
+ --disable-myhostname \
+ --without-python
ifeq ($(BR2_PACKAGE_ACL),y)
SYSTEMD_CONF_OPT += --enable-acl
@@ -44,8 +45,25 @@ else
SYSTEMD_CONF_OPT += --disable-acl
endif
-ifneq ($(BR2_LARGEFILE),y)
- SYSTEMD_CONF_OPT += --disable-largefile
+ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
+ SYSTEMD_CONF_OPT += --enable-gudev
+ SYSTEMD_DEPENDENCIES += libglib2
+else
+ SYSTEMD_CONF_OPT += --disable-gudev
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+ SYSTEMD_CONF_OPT += --enable-gcrypt \
+ --with-libgcrypt-prefix=$(STAGING_DIR)/usr
+ SYSTEMD_DEPENDENCIES += libgcrypt
+else
+ SYSTEMD_CONF_OPT += --disable-gcrypt
+endif
+
+ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y)
+ SYSTEMD_DEPENDENCIES += libmicrohttpd
+else
+ SYSTEMD_CONF_OPT += --disable-microhttpd
endif
# mq_getattr needs -lrt
@@ -66,8 +84,13 @@ define SYSTEMD_INSTALL_TTY_HOOK
ln -fs ../../../../usr/lib/systemd/system/serial-getty@.service $(TARGET_DIR)/etc/systemd/system/getty.target.wants/serial-getty@$(BR2_TARGET_GENERIC_GETTY_PORT).service
endef
+define SYSTEMD_INSTALL_MACHINEID_HOOK
+ touch $(TARGET_DIR)/etc/machine-id
+endef
+
SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
SYSTEMD_INSTALL_INIT_HOOK \
SYSTEMD_INSTALL_TTY_HOOK \
+ SYSTEMD_INSTALL_MACHINEID_HOOK
$(eval $(autotools-package))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 1/1] systemd: bumped to version 206
2013-08-30 14:32 [Buildroot] [PATCH 1/1] systemd: bumped to version 206 eric.le.bihan.dev at free.fr
@ 2013-08-30 14:36 ` Thomas Petazzoni
2013-08-30 16:38 ` eric.le.bihan.dev at free.fr
2013-09-02 6:18 ` Arnout Vandecappelle
1 sibling, 1 reply; 13+ messages in thread
From: Thomas Petazzoni @ 2013-08-30 14:36 UTC (permalink / raw)
To: buildroot
Dear eric.le.bihan.dev at free.fr,
On Fri, 30 Aug 2013 16:32:08 +0200, eric.le.bihan.dev at free.fr wrote:
> From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
>
> This patch updates Systemd from version 44 to 206.
> It includes fixes for compiling with uClibc, based on the ones from Khem Raj,
> used by Yocto project:
>
> http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-core/systemd/systemd/
>
> Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Thanks a lot! Definitely nice to see someone interested in systemd
support upgrading this package.
However, how do you handle the fact that systemd now includes udev,
while Buildroot still has a separate udev package?
As of systemd 44 that we have in Buildroot, udev was not part of
systemd, and therefore Buildroot packaged both udev and systemd
separately, and systemd depended on the selected /dev management
method being "devtmpfs + udev".
However, now that udev is part of systemd, some of this needs to
change. What is your plan regarding that?
May I suggest you to go through the thread at
http://lists.busybox.net/pipermail/buildroot/2013-March/068130.html,
which contains a large discussion about systemd/udev that started the
last time a contributor posted an updated to the systemd package.
Thanks again!
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 1/1] systemd: bumped to version 206
2013-08-30 14:36 ` Thomas Petazzoni
@ 2013-08-30 16:38 ` eric.le.bihan.dev at free.fr
2013-08-31 11:46 ` Thomas Petazzoni
0 siblings, 1 reply; 13+ messages in thread
From: eric.le.bihan.dev at free.fr @ 2013-08-30 16:38 UTC (permalink / raw)
To: buildroot
> However, now that udev is part of systemd, some of this needs to
> change. What is your plan regarding that?
Oops! I missed this part! I've just found out I had two copies of
libudev.so on my target (/lib/libudev.so.0.13.1 and /usr/lib/libudev.so.1.3.7).
> May I suggest you to go through the thread at
> http://lists.busybox.net/pipermail/buildroot/2013-March/068130.html,
> which contains a large discussion about systemd/udev that started the
> last time a contributor posted an updated to the systemd package.
Thanks for pointing it out to me. Yocto project gets around this problem
thanks to its packaging system (the 'udev' feature is provided by either
udev-182 or systemd-206 recipe). Enabling udev only if systemd is the
selected init system seems to be the easiest solution, but would it not
restrict the user?
I'll see if I can make the udev package depends on systemd and only grab
the interesting pieces.
BTW, a great feature of Buildroot is to provide means to build images for
a wide range of embedded devices: from small ones with limited resources
(where Busybox init + mdev is a perfect combination) to beefy ones (which
could handle systemd + udev).
I initially updated Systemd because I wanted to see if it could be usable
on embedded devices. I am looking for an init system with supervision
capabilities and successfully used Buildroot with runit an s6. Both are
more suitable (system-journald consumes too much memory for my purpose).
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 1/1] systemd: bumped to version 206
2013-08-30 16:38 ` eric.le.bihan.dev at free.fr
@ 2013-08-31 11:46 ` Thomas Petazzoni
2013-08-31 20:06 ` Eric Le Bihan
0 siblings, 1 reply; 13+ messages in thread
From: Thomas Petazzoni @ 2013-08-31 11:46 UTC (permalink / raw)
To: buildroot
Eric,
On Fri, 30 Aug 2013 18:38:14 +0200 (CEST), eric.le.bihan.dev at free.fr
wrote:
> > However, now that udev is part of systemd, some of this needs to
> > change. What is your plan regarding that?
>
> Oops! I missed this part! I've just found out I had two copies of
> libudev.so on my target (/lib/libudev.so.0.13.1
> and /usr/lib/libudev.so.1.3.7).
Right. You have the old standalone udev, and the udev built in with
systemd.
> > May I suggest you to go through the thread at
> > http://lists.busybox.net/pipermail/buildroot/2013-March/068130.html,
> > which contains a large discussion about systemd/udev that started
> > the last time a contributor posted an updated to the systemd
> > package.
>
> Thanks for pointing it out to me. Yocto project gets around this
> problem thanks to its packaging system (the 'udev' feature is
> provided by either udev-182 or systemd-206 recipe). Enabling udev
> only if systemd is the selected init system seems to be the easiest
> solution, but would it not restrict the user?
>
> I'll see if I can make the udev package depends on systemd and only
> grab the interesting pieces.
I believe we have several options:
(1) No longer allow the usage of 'udev' without systemd. This is I
believe what would match the best the upstream decision of making
udev and systemd more and more integrated together. This would
mean remove the separate 'udev' package, and turn the 'udev' /dev
management method into a 'udev+systemd' management method, which
would force the "init method" to be systemd. This is probably the
easiest solution, but I guess some users might be disappointed:
they might be using udev for some reason, but still may not want
all the systemd/dbus stuff. That said, using udev without systemd
seems to go against the choices of the upstream systemd project.
(2) Continue to use an old standalone udev, but ensure that the choice
of udev and systemd are mutually exclusive. This is not very
satisfying since the old udev we have is no longer maintained, so
it does not look like a solution that is very future-proof.
(3) Package one of more recent 'udev' versions that have been
extracted from systemd sources, as a separate 'udev' package that
would be mutually exclusive with systemd. It's a bit like (2) but
with a more recent udev version. However, it's unclear how those
forked versions of udev will be maintained over time.
(4) See if it's possible to make the systemd package only provide
udev. I think it is possible to install only udev, but as far as I
remember, D-Bus was still required at build time, unless you did
some tricks.
To be honest, as I'm not really using udev myself, choice (1) seems to
have my preference. If udev users are not happy with the fact that they
must now use systemd, then they should work that out with upstream (and
I wish them good luck!).
What do you think about this?
> BTW, a great feature of Buildroot is to provide means to build images
> for a wide range of embedded devices: from small ones with limited
> resources (where Busybox init + mdev is a perfect combination) to
> beefy ones (which could handle systemd + udev).
Right.
> I initially updated Systemd because I wanted to see if it could be
> usable on embedded devices. I am looking for an init system with
> supervision capabilities and successfully used Buildroot with runit
> an s6. Both are more suitable (system-journald consumes too much
> memory for my purpose).
runit ? s6 ? What are these ?
Thanks,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 1/1] systemd: bumped to version 206
2013-08-31 11:46 ` Thomas Petazzoni
@ 2013-08-31 20:06 ` Eric Le Bihan
2013-09-01 7:24 ` Thomas Petazzoni
0 siblings, 1 reply; 13+ messages in thread
From: Eric Le Bihan @ 2013-08-31 20:06 UTC (permalink / raw)
To: buildroot
Le 31/08/2013 13:46, Thomas Petazzoni a ?crit :
> I believe we have several options:
>
> (1) No longer allow the usage of 'udev' without systemd. This is I
> believe what would match the best the upstream decision of making
> udev and systemd more and more integrated together. This would
> mean remove the separate 'udev' package, and turn the 'udev' /dev
> management method into a 'udev+systemd' management method, which
> would force the "init method" to be systemd. This is probably the
> easiest solution, but I guess some users might be disappointed:
> they might be using udev for some reason, but still may not want
> all the systemd/dbus stuff. That said, using udev without systemd
> seems to go against the choices of the upstream systemd project.
This is my first option.
>
> (2) Continue to use an old standalone udev, but ensure that the choice
> of udev and systemd are mutually exclusive. This is not very
> satisfying since the old udev we have is no longer maintained, so
> it does not look like a solution that is very future-proof.
This is a no-go.
> (3) Package one of more recent 'udev' versions that have been
> extracted from systemd sources, as a separate 'udev' package that
> would be mutually exclusive with systemd. It's a bit like (2) but
> with a more recent udev version. However, it's unclear how those
> forked versions of udev will be maintained over time.
Currently, we have two contestants:
1) The developers of Linux From Scratch extracted the udev code from
systemd source tree:
http://www.linuxfromscratch.org/lfs/view/development/chapter06/udev.html. This
does not look very maintainable, so I will not bet on it.
2) The developers of Gentoo forked udev:
https://github.com/gentoo/eudev. They want eudev to be system
initialization neutral, so we might expect it not to diverge too much
from upstream. And it will live as long as Gentoo lives (or moves to mdev!).
> (4) See if it's possible to make the systemd package only provide
> udev. I think it is possible to install only udev, but as far as I
> remember, D-Bus was still required at build time, unless you did
> some tricks.
In the systemd source tree there is only one Makefile to compile the
cathedral. A while ago, a patch was posted on hotplug mailing list to
compile only udev (http://www.spinics.net/lists/hotplug/msg05503.html).
This does not look very maintainable. So compiling the cathedral and
copying the files seems a better choice to me.
> To be honest, as I'm not really using udev myself, choice (1) seems to
> have my preference. If udev users are not happy with the fact that they
> must now use systemd, then they should work that out with upstream (and
> I wish them good luck!).
>
> What do you think about this?
I would also go with choice (1). But out of curiosity, I'll try to
package eudev and implement choice (4) and see what comes out.
> runit ? s6 ? What are these ?
Runit and s6 are Unix init systems with service supervision. They
implement the same features as Systemd, but with less *cough*
freedesktop bloat. They both derive from daemontools from D.J. Berstein
(http://cr.yp.to/daemontools.html).
Service supervision is very handy in embedded devices that have to be
remotely administrated (like ADSL residential gateways, Femtocells, or
smart meters).
These systems also offer a cleaner way of defining services (I
personally think that the unit file concept is the killer feature of
systemd)
The creator of s6 (http://skarnet.org/software/s6/) has a lengthy
explanation about the history and benefits of these tools.
Runit can be used as a replacement to systemd in Arch Linux
(https://github.com/chneukirchen/ignite). It is also available in
Busybox! But I prefer the original implementation.
I've deployed products running s6, without any issues. But I lean
towards runit because:
- s6 depends on a set of libraries that follow the /package
(slashpackage) hierarchy (http://cr.yp.to/slashpackage.html). You have
to twist your brain a little bit to wrap around this concept when mixed
with a traditional LSB. I've got a patch set to build these using an old
Buildroot. I'll update them and post them if someone is interested.
- it is a one-man-army project.
Runit keeps the things simple and is also available in Debian.
Both do fit in embedded devices. I'll try to evaluate OpenRC one day.
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 1/1] systemd: bumped to version 206
2013-08-31 20:06 ` Eric Le Bihan
@ 2013-09-01 7:24 ` Thomas Petazzoni
0 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2013-09-01 7:24 UTC (permalink / raw)
To: buildroot
Dear Eric Le Bihan,
On Sat, 31 Aug 2013 22:06:00 +0200, Eric Le Bihan wrote:
> Le 31/08/2013 13:46, Thomas Petazzoni a ?crit :
>
> > I believe we have several options:
> >
> > (1) No longer allow the usage of 'udev' without systemd. This is I
> > believe what would match the best the upstream decision of making
> > udev and systemd more and more integrated together. This would
> > mean remove the separate 'udev' package, and turn the 'udev' /dev
> > management method into a 'udev+systemd' management method, which
> > would force the "init method" to be systemd. This is probably the
> > easiest solution, but I guess some users might be disappointed:
> > they might be using udev for some reason, but still may not want
> > all the systemd/dbus stuff. That said, using udev without systemd
> > seems to go against the choices of the upstream systemd project.
>
> This is my first option.
Right.
> > (2) Continue to use an old standalone udev, but ensure that the choice
> > of udev and systemd are mutually exclusive. This is not very
> > satisfying since the old udev we have is no longer maintained, so
> > it does not look like a solution that is very future-proof.
>
> This is a no-go.
Agreed.
> > (3) Package one of more recent 'udev' versions that have been
> > extracted from systemd sources, as a separate 'udev' package that
> > would be mutually exclusive with systemd. It's a bit like (2) but
> > with a more recent udev version. However, it's unclear how those
> > forked versions of udev will be maintained over time.
>
> Currently, we have two contestants:
>
> 1) The developers of Linux From Scratch extracted the udev code from
> systemd source tree:
> http://www.linuxfromscratch.org/lfs/view/development/chapter06/udev.html. This
> does not look very maintainable, so I will not bet on it.
>
> 2) The developers of Gentoo forked udev:
> https://github.com/gentoo/eudev. They want eudev to be system
> initialization neutral, so we might expect it not to diverge too much
> from upstream. And it will live as long as Gentoo lives (or moves to mdev!).
This second fork indeed seems like a good option. In the past
discussion, one issue that popped up is whether the 'libudev' and other
tools/libraries provided by eudev on one side and the udev of systemd
on the other side will remain API compatible over time. As you know,
udev is not a standalone program, it also provides a library that is
used by more and more applications/other libraries to get informations
about the hardware available in the system.
Ideally, the APIs will remain compatible, so in Buildroot, we can
create a 'udev' or 'libudev' virtual package, which packages needing
the libudev library can depend on, and which will be implemented either
by eudev or systemd.
> > (4) See if it's possible to make the systemd package only provide
> > udev. I think it is possible to install only udev, but as far as I
> > remember, D-Bus was still required at build time, unless you did
> > some tricks.
>
> In the systemd source tree there is only one Makefile to compile the
> cathedral. A while ago, a patch was posted on hotplug mailing list to
> compile only udev (http://www.spinics.net/lists/hotplug/msg05503.html).
> This does not look very maintainable. So compiling the cathedral and
> copying the files seems a better choice to me.
The only issue being that compiling the cathedral requires dbus, even
if you don't need it in the end if you're only interested in udev and
not the full systemd thing. That said, it's maybe something that can be
tweaked later on by only compiling the relevant subdirectories in
systemd sources and faking a few things to make it believe that dbus is
available. We can look at this later on.
> > To be honest, as I'm not really using udev myself, choice (1) seems to
> > have my preference. If udev users are not happy with the fact that they
> > must now use systemd, then they should work that out with upstream (and
> > I wish them good luck!).
> >
> > What do you think about this?
>
> I would also go with choice (1). But out of curiosity, I'll try to
> package eudev and implement choice (4) and see what comes out.
Excellent. I'm definitely looking forward to seeing your patches about
this.
> > runit ? s6 ? What are these ?
>
> Runit and s6 are Unix init systems with service supervision. They
> implement the same features as Systemd, but with less *cough*
> freedesktop bloat. They both derive from daemontools from D.J. Berstein
> (http://cr.yp.to/daemontools.html).
>
> Service supervision is very handy in embedded devices that have to be
> remotely administrated (like ADSL residential gateways, Femtocells, or
> smart meters).
>
> These systems also offer a cleaner way of defining services (I
> personally think that the unit file concept is the killer feature of
> systemd)
>
> The creator of s6 (http://skarnet.org/software/s6/) has a lengthy
> explanation about the history and benefits of these tools.
>
> Runit can be used as a replacement to systemd in Arch Linux
> (https://github.com/chneukirchen/ignite). It is also available in
> Busybox! But I prefer the original implementation.
>
> I've deployed products running s6, without any issues. But I lean
> towards runit because:
>
> - s6 depends on a set of libraries that follow the /package
> (slashpackage) hierarchy (http://cr.yp.to/slashpackage.html). You have
> to twist your brain a little bit to wrap around this concept when mixed
> with a traditional LSB. I've got a patch set to build these using an old
> Buildroot. I'll update them and post them if someone is interested.
> - it is a one-man-army project.
>
> Runit keeps the things simple and is also available in Debian.
>
> Both do fit in embedded devices. I'll try to evaluate OpenRC one day.
Wow, thanks a lot for those details. Looks really interesting indeed.
In this area, I had heard in the past of PCD (Process Control Daemon),
http://www.rt-embedded.com/blog/pcd-process-control-daemon/, but I
never had the opportunity to test it.
Best regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 1/1] systemd: bumped to version 206
2013-08-30 14:32 [Buildroot] [PATCH 1/1] systemd: bumped to version 206 eric.le.bihan.dev at free.fr
2013-08-30 14:36 ` Thomas Petazzoni
@ 2013-09-02 6:18 ` Arnout Vandecappelle
2013-09-02 9:18 ` Eric Le Bihan
1 sibling, 1 reply; 13+ messages in thread
From: Arnout Vandecappelle @ 2013-09-02 6:18 UTC (permalink / raw)
To: buildroot
On 08/30/13 16:32, eric.le.bihan.dev at free.fr wrote:
[snip]
> SYSTEMD_CONF_OPT += \
> - --with-distro=other \
> + --localstatedir=/var \
> + --enable-static=no \
> + --disable-manpages \
> --disable-selinux \
> --disable-pam \
> --disable-libcryptsetup \
> - --disable-gtk \
> - --disable-plymouth \
> - --with-rootdir=/ \
> --with-dbuspolicydir=/etc/dbus-1/system.d \
> --with-dbussessionservicedir=/usr/share/dbus-1/services \
> --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
> --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
> - --with-udevrulesdir=/etc/udev/rules.d \
> - --with-sysvinit-path=/etc/init.d/ \
Are these two really not needed anymore?
Regards,
Arnout
> - --without-sysvrcd-path \
> - --enable-split-usr
> + --enable-split-usr \
> + --enable-introspection=no \
> + --disable-efi \
> + --disable-myhostname \
> + --without-python
[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
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 1/1] systemd: bumped to version 206
2013-09-02 6:18 ` Arnout Vandecappelle
@ 2013-09-02 9:18 ` Eric Le Bihan
0 siblings, 0 replies; 13+ messages in thread
From: Eric Le Bihan @ 2013-09-02 9:18 UTC (permalink / raw)
To: buildroot
> > - --disable-gtk \
> > - --disable-plymouth \
> > - --with-rootdir=/ \
These ones have been removed from ./configure
> > - --with-udevrulesdir=/etc/udev/rules.d \
This one too.
> > - --with-sysvinit-path=/etc/init.d/ \
The default value generated by the ./configure is correct.
> > - --without-sysvrcd-path
This one has been replaced by '--with-sysvrcnd-path=PATH'.
The default value is also correct.
I have not tested SysV scripts compatibility, though.
> > - --enable-split-usr
This is one is need. I should have not removed it.
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 1/1] systemd: bumped to version 206
@ 2013-09-01 16:54 Olivier Schonken
2013-09-02 15:04 ` Eric Le Bihan
0 siblings, 1 reply; 13+ messages in thread
From: Olivier Schonken @ 2013-09-01 16:54 UTC (permalink / raw)
To: buildroot
Hi Eric
Great work on bumping systemd to version 206.
I have started to test building the new version(Using Codesourcery for
ARM). One thing I noticed is that with the SYSTEMD_AUTORECONF=YES,
autotools complains about undefined macro AM_PATH_LIBGCRYPT if libgcrypt or
libgcrypt-devel is not present on the build system. Not sure how to go
about pleasing autotools without the additional system dependency. Maybe
someone on the buildroot mailing list will know...?
Regards
Olivier Schonken
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130901/bd235995/attachment.html>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 1/1] systemd: bumped to version 206
2013-09-01 16:54 Olivier Schonken
@ 2013-09-02 15:04 ` Eric Le Bihan
2013-09-07 16:52 ` Olivier Schonken
0 siblings, 1 reply; 13+ messages in thread
From: Eric Le Bihan @ 2013-09-02 15:04 UTC (permalink / raw)
To: buildroot
On Sun, Sep 01, 2013 at 06:54:48PM +0200, Olivier Schonken wrote:
> I have started to test building the new version(Using Codesourcery for
> ARM). One thing I noticed is that with the SYSTEMD_AUTORECONF=YES,
> autotools complains about undefined macro AM_PATH_LIBGCRYPT if libgcrypt or
> libgcrypt-devel is not present on the build system. Not sure how to go
> about pleasing autotools without the additional system dependency. Maybe
> someone on the buildroot mailing list will know...?
I removed libgcrypt11-dev from my development machine and built an image for
QEMU arm-versatile using Code Sourcery 2013.05, but I have not seen this issue.
Can you send me a log file of the build with the error?
^ permalink raw reply [flat|nested] 13+ messages in thread
* [Buildroot] [PATCH 1/1] systemd: bumped to version 206
2013-09-02 15:04 ` Eric Le Bihan
@ 2013-09-07 16:52 ` Olivier Schonken
2013-09-08 11:30 ` Eric Le Bihan
0 siblings, 1 reply; 13+ messages in thread
From: Olivier Schonken @ 2013-09-07 16:52 UTC (permalink / raw)
To: buildroot
Hi Eric
Attached is the systemd build log for failure with AUTORECONF enabled for
systemd.
I first tried to apply your patch to buildroot 2013.08. Only when I
comment out 'SYSTEMD_AUTORECONF = YES' and not apply
'systemd-0005-core-fixed-ms-sscanf-modifier-not-being-available-in.patch'
do I get it to build successfully.
patch
'systemd-0005-core-fixed-ms-sscanf-modifier-not-being-available-in.patch'
causes below error because of configure.ac being updated by patch.
/home/olivier/Buildroot-test/output/build/systemd-206/build-aux/missing:
line 81: aclocal-1.13: command not found
WARNING: 'aclocal-1.13' is missing on your system.
You should only need it if you modified 'acinclude.m4' or
'configure.ac' or m4 files included by 'configure.ac'.
The 'aclocal' program is part of the GNU Automake package:
<http://www.gnu.org/software/automake>
It also requires GNU Autoconf, GNU m4 and Perl in order to run:
<http://www.gnu.org/software/autoconf>
<http://www.gnu.org/software/m4/>
<http://www.perl.org/>
make[1]: *** [aclocal.m4] Error 127
Regards
Olivier Schonken
On Mon, Sep 2, 2013 at 5:04 PM, Eric Le Bihan <eric.le.bihan.dev@free.fr>wrote:
> On Sun, Sep 01, 2013 at 06:54:48PM +0200, Olivier Schonken wrote:
> > I have started to test building the new version(Using Codesourcery for
> > ARM). One thing I noticed is that with the SYSTEMD_AUTORECONF=YES,
> > autotools complains about undefined macro AM_PATH_LIBGCRYPT if libgcrypt
> or
> > libgcrypt-devel is not present on the build system. Not sure how to go
> > about pleasing autotools without the additional system dependency. Maybe
> > someone on the buildroot mailing list will know...?
>
> I removed libgcrypt11-dev from my development machine and built an image
> for
> QEMU arm-versatile using Code Sourcery 2013.05, but I have not seen this
> issue.
> Can you send me a log file of the build with the error?
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130907/305dfcdc/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: systemd-206.log
Type: application/octet-stream
Size: 1006 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130907/305dfcdc/attachment-0003.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: master-config
Type: application/octet-stream
Size: 30789 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130907/305dfcdc/attachment-0004.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 2013.08-config
Type: application/octet-stream
Size: 30306 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130907/305dfcdc/attachment-0005.obj>
^ permalink raw reply [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 1/1] systemd: bumped to version 206
2013-09-07 16:52 ` Olivier Schonken
@ 2013-09-08 11:30 ` Eric Le Bihan
2013-09-15 18:15 ` Thomas Petazzoni
0 siblings, 1 reply; 13+ messages in thread
From: Eric Le Bihan @ 2013-09-08 11:30 UTC (permalink / raw)
To: buildroot
Le 07/09/2013 18:52, Olivier Schonken a ?crit :
> I first tried to apply your patch to buildroot 2013.08. Only when I
> comment out 'SYSTEMD_AUTORECONF = YES' and not apply
> 'systemd-0005-core-fixed-ms-sscanf-modifier-not-being-available-in.patch' do
> I get it to build successfully.
Yep, The 'patch
systemd-0005-core-fixed-ms-sscanf-modifier-not-being-available-in.patch'
replaces the use of the dynamic allocation conversion modifier %m when
using uClibc, as it is not implemented in it. You manage to build it
because you are using the Code Sourcery toolchain, which comes with glibc.
I made a mistake saying I had not seen the issue after removing
libgcrypt11-dev from my development machine: I had forgotten to perform
a proper clean of my environment ("D'Oh!").
See https://github.com/elebihan/buildroot/blob/udev-provider/ for a
Systemd on ARM with external toolchain configuration
(configs/elebihan_demo_systemd_arm_defconfig).
I posted an update of the systemd package. See '[PATCH 1/1] package:
udev is now provided by systemd or eudev.' In this version, I added
libgcrypt has a hard dependency for building Systemd. So it builds in
any case but it forces journal signature.
So, for AM_PATH_LIBGCRYPT to be found, you must have libgcrypt among
SYSTEMD_DEPENDENCIES, but I'd better have journal signature optional,
with something like:
ifeq ($(BR2_PACKAGE_SYSTEMD_SIGN_JOURNAL),y)
SYSTEMD_CONF_OPT += --enable-libgcrypt
else
SYSTEMD_CONF_OPT += --disable-libcgrypt
endif
Is there a way in Buildroot to have a library built for the target and
installed into 'staging', but not installed on the target (apart for
pruning the files in post-build.sh)?
^ permalink raw reply [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 1/1] systemd: bumped to version 206
2013-09-08 11:30 ` Eric Le Bihan
@ 2013-09-15 18:15 ` Thomas Petazzoni
0 siblings, 0 replies; 13+ messages in thread
From: Thomas Petazzoni @ 2013-09-15 18:15 UTC (permalink / raw)
To: buildroot
Dear Eric Le Bihan,
On Sun, 08 Sep 2013 13:30:46 +0200, Eric Le Bihan wrote:
> I posted an update of the systemd package. See '[PATCH 1/1] package:
> udev is now provided by systemd or eudev.' In this version, I added
> libgcrypt has a hard dependency for building Systemd. So it builds in
> any case but it forces journal signature.
>
> So, for AM_PATH_LIBGCRYPT to be found, you must have libgcrypt among
> SYSTEMD_DEPENDENCIES, but I'd better have journal signature optional,
> with something like:
>
> ifeq ($(BR2_PACKAGE_SYSTEMD_SIGN_JOURNAL),y)
> SYSTEMD_CONF_OPT += --enable-libgcrypt
> else
> SYSTEMD_CONF_OPT += --disable-libcgrypt
> endif
>
> Is there a way in Buildroot to have a library built for the target and
> installed into 'staging', but not installed on the target (apart for
> pruning the files in post-build.sh)?
No, that's not possible in a clean way.
In this situation, I believe the best option is:
(1) As a temporary measure, take the src/libgcrypt.m4 file from the
libgcrypt sources, and create a patch that adds it to the m4/
directory of systemd sources. This way, regardless of whether
libgcrypt is available or not, the AM_PATH_LIBGCRYPT m4 macro will be
available for autoreconf to use.
(2) As a permanent measure, upstream the other systemd patches so that
ultimately we can get rid of the SYSTEMD_AUTORECONF = YES.
Best regards,
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2013-09-15 18:15 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-30 14:32 [Buildroot] [PATCH 1/1] systemd: bumped to version 206 eric.le.bihan.dev at free.fr
2013-08-30 14:36 ` Thomas Petazzoni
2013-08-30 16:38 ` eric.le.bihan.dev at free.fr
2013-08-31 11:46 ` Thomas Petazzoni
2013-08-31 20:06 ` Eric Le Bihan
2013-09-01 7:24 ` Thomas Petazzoni
2013-09-02 6:18 ` Arnout Vandecappelle
2013-09-02 9:18 ` Eric Le Bihan
-- strict thread matches above, loose matches on Subject: below --
2013-09-01 16:54 Olivier Schonken
2013-09-02 15:04 ` Eric Le Bihan
2013-09-07 16:52 ` Olivier Schonken
2013-09-08 11:30 ` Eric Le Bihan
2013-09-15 18:15 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox