| Message ID | 1378476068-25300-1-git-send-email-eric.le.bihan.dev@free.fr |
|---|---|
| State | Superseded |
| Headers | show |
BTW, the changes introduced by this patch can be tested with images for QEMU
(arm and x86), using the configuration files
elebihan_demo_{eudev,systemd}_{arm,x86}_defconfig, available in the
udev-provider branch of https://github.com/elebihan/buildroot.
On 06/09/13 16:01, eric.le.bihan.dev@free.fr wrote: > From: Eric Le Bihan <eric.le.bihan.dev@free.fr> > > Udev is now a virtual package, which can be provided by either Systemd or Eudev. > > eudev is the Gentoo fork of git://anongit.freedesktop.org/systemd/systemd > with the aim of isolating udev from any particular flavor of system > initialization. In this case, the isolation is from systemd. > > From now on, if you choose to manage the device table with udev, you will have > to choose between two providers: systemd and eudev. > > These providers are mutually exclusive: > > - if systemd is chosen, the other methods (static, mdev) are not available. > - eudev is not available if systemd is chosen as the init system. Ack the idea. > > Systemd has been updated to version 206. Eudev v1.2 is forked from this > version. I don't know if it is important, but I would have split the systemd bump from the eudev patch. Or would systemd 44 fail to function with eudev? > > Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr> [snip] > diff --git a/package/eudev/Config.in b/package/eudev/Config.in > new file mode 100644 > index 0000000..40108ed > --- /dev/null > +++ b/package/eudev/Config.in > @@ -0,0 +1,36 @@ > +config BR2_PACKAGE_EUDEV > + bool "eudev" > + depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV > + depends on BR2_LARGEFILE # util-linux > + depends on BR2_USE_WCHAR # util-linux > + depends on !BR2_PACKAGE_SYSTEMD > + select BR2_PACKAGE_UTIL_LINUX > + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID > + select BR2_PACKAGE_KMOD > + help > + Userspace device daemon (Gentoo version) The essential info is that it is standalone. So I would write: Userspace device daemon. This is a standalone version, independent of systemd. It is a fork maintained by Gentoo. > + > + eudev requires a Linux kernel >= 2.6.34: it relies on devtmpfs. > + > + http://github.com/gentoo/eudev/ > + > +if BR2_PACKAGE_EUDEV > + > +config BR2_PACKAGE_EUDEV_ALL_EXTRAS > + bool "enable all extras" > + select BR2_PACKAGE_LIBGLIB2 > + depends on BR2_USE_WCHAR # libglib2 > + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 > + help > + Enable all extras with external dependencies like libglib2 > + > +comment "enabling all extras requires a toolchain with WCHAR and threading support" > + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS Since wchar is already required by eudev itself, putting it in the comment is redundant. Also, we're in the process of standardizing on: comment "enabling all extras needs a toolchain w/ thread, wchar" (which fits in the 70-column limit, unlike your version). > + > +endif > + > +comment "eudev requires /dev mgmnt set to udev under System configuration" > + depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV > + > +comment "eudev not available with Systemd as init system" > + depends on BR2_PACKAGE_SYSTEMD I think these comments are not really necessary. Actually, I would say that the only reason that eudev has a user-visible Config option is for the "enable all extras". And that config option is slightly redundant, since the additional size of gudev is almost nothing compared to libglib2, so you could just as well use an automatic dependency. But of course all this would probably be more appropriate for a separate patch. > diff --git a/package/udev/S10udev b/package/eudev/S10udev > old mode 100755 > new mode 100644 > similarity index 98% > rename from package/udev/S10udev > rename to package/eudev/S10udev > index 2c7b7e9..e4d28a2 > --- a/package/udev/S10udev > +++ b/package/eudev/S10udev > @@ -17,7 +17,7 @@ > # > > # Check for missing binaries > -UDEV_BIN=/lib/udev/udevd > +UDEV_BIN=/sbin/udevd > test -x $UDEV_BIN || exit 5 > > # Check for config file and read it > diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk > new file mode 100644 > index 0000000..f1952d4 > --- /dev/null > +++ b/package/eudev/eudev.mk > @@ -0,0 +1,41 @@ > +################################################################################ > +# > +# eudev > +# > +################################################################################ > + > +EUDEV_VERSION = v1.2 > +EUDEV_SITE = https://github.com/gentoo/eudev.git > +EUDEV_SITE_METHOD = git IIRC github supports URLs like http://github.com/gentoo/eudev/tarball/v1.2.tar.gz > +EUDEV_LICENSE = GPLv2 Did the Gentoo people remove the +? > +EUDEV_LICENSE_FILES = COPYING > +EUDEV_INSTALL_STAGING = YES > +EUDEV_AUTORECONF = YES Add a comment why autoreconf is needed (I guess because it's not a tarball). > + > +# mq_getattr is in librt > +EUDEV_CONF_ENV += LIBS=-lrt > + > +EUDEV_CONF_OPT = \ > + --sbindir=/sbin \ > + --with-rootlibdir=/lib \ > + --libexecdir=/lib \ > + --with-firmware-path=/lib/firmware \ > + --disable-introspection \ > + --enable-split-usr > + > +EUDEV_DEPENDENCIES = host-pkgconf util-linux kmod > + > +ifeq ($(BR2_PACKAGE_EUDEV_ALL_EXTRAS),y) > +EUDEV_DEPENDENCIES += libglib2 > +EUDEV_CONF_OPT += --enable-gudev > +else > +EUDEV_CONF_OPT += --disable-gudev > +endif > + > +define EUDEV_INSTALL_INITSCRIPT This should be called EUDEV_INSTALL_INIT_SYSV to fit with current buildroot standards. > + $(INSTALL) -m 0755 package/eudev/S10udev $(TARGET_DIR)/etc/init.d/S10udev > +endef > + > +EUDEV_POST_INSTALL_TARGET_HOOKS += EUDEV_INSTALL_INITSCRIPT And this should be removed. > + > +$(eval $(autotools-package)) > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index 86ab2cf..f346aa3 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -1,11 +1,17 @@ > config BR2_PACKAGE_SYSTEMD > bool "systemd" > + depends on BR2_INIT_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 > depends on BR2_USE_MMU # dbus > select BR2_PACKAGE_DBUS > select BR2_PACKAGE_LIBCAP > + select BR2_PACKAGE_LIBGCRYPT > + select BR2_PACKAGE_UTIL_LINUX > + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID > + select BR2_PACKAGE_KMOD > help > systemd is a system and service manager for Linux, compatible with > SysV and LSB init scripts. systemd provides aggressive parallelization > @@ -18,6 +24,42 @@ config BR2_PACKAGE_SYSTEMD > > http://freedesktop.org/wiki/Software/systemd > > -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 > +if BR2_PACKAGE_SYSTEMD > + > +config BR2_PACKAGE_SYSTEMD_ACL > + bool "Enable ACL" > + default n n is the default, so remove this line (same below). Is it really useful to have this option, rather than depending on acl automatically when BR2_PACKAGE_ACL is set? Same for some of the other config options below. > + select BR2_PACKAGE_ACL > + help > + Enable ACL support > + > +config BR2_PACKAGE_SYSTEMD_GUDEV > + bool "Build Gudev" > + default n > + select BR2_PACKAGE_LIBGLIB2 > + help > + Build GLib bindings for udev > + > +config BR2_PACKAGE_SYSTEMD_COMPRESS_JOURNAL > + bool "Compress journal" > + default n > + select BR2_PACKAGE_XZ > + help > + Compress the journal > + > +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 ipv6 support and thread support in toolchain)" > + depends on (!BR2_LARGEFILE || !BR2_INET_IPV6 || \ > + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INIT_SYSTEMD) Again, I think this comment is redundant. > 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 Preferably use git format-patch -N, because the 1/6 will be wrong if another patch is added later. Also add your signed-off-by. Any chance of upstreaming these patches? > + > +--- > + 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 I guess the fallocate check in patch 5/6 should move into this patch... > + 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 Wouldn't it be easier to just disable tests? > +@@ -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 > + This is basically a rewrite of Maxime Ripard's original systemd-fix-getty-unit.patch, so instead of claiming it as your own you should put him as the author and add yourself to the Signed-off-by. But actually, you can limit yourself to renaming Maxime's patch to something with a number. > +--- > + units/getty@.service.m4 | 2 +- > + units/serial-getty@.service.m4 | 2 +- > + 2 files changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 > +index 7853652..34cdf11 100644 > +--- a/units/getty@.service.m4 > ++++ b/units/getty@.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@.service.m4 b/units/serial-getty@.service.m4 > +index 5e16963..9657800 100644 > +--- a/units/serial-getty@.service.m4 > ++++ b/units/serial-getty@.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) Where is the mkostemp and execvpe used? Probably belongs to a different patch... > ++ > ++# 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])]) Err, what's the point of this one? It will always return no when cross-compiling, because it is not possible to run the compiled program. An buildroot always cross-compiles... Anyway, I think in our default uClibc configurations, the %ms option is enabled so this patch is not needed. > ++ > + # 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])], [snip] > 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. With this limited explanation, it smells like a feature patch to me. But do upstream it by all means. > +--- > + 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> As I said, this patch should probably stay, just renamed. > ---- > - units/getty@.service.m4 | 2 +- > - units/serial-getty@.service.m4 | 2 +- > - 2 files changed, 2 insertions(+), 2 deletions(-) > - > -Index: systemd-37/units/getty@.service.m4 > -=================================================================== > ---- systemd-37.orig/units/getty@.service.m4 > -+++ systemd-37/units/getty@.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@.service.m4 > -=================================================================== > ---- systemd-37.orig/units/serial-getty@.service.m4 > -+++ systemd-37/units/serial-getty@.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 [snip] > 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 So why is this no longer needed? > - #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..d5b5785 100644 > --- a/package/systemd/systemd.mk > +++ b/package/systemd/systemd.mk > @@ -4,15 +4,20 @@ > # > ################################################################################ > > -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 > SYSTEMD_DEPENDENCIES = \ > host-intltool \ > + host-pkgconf \ > libcap \ > - udev \ > - dbus > + dbus \ > + libgcrypt \ > + util-linux \ > + kmod > + > +SYSTEMD_AUTORECONF = YES Please add a comment why this is needed. > > # Make sure that systemd will always be built after busybox so that we have > # a consistent init setup between two builds > @@ -21,31 +26,52 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y) > endif > > SYSTEMD_CONF_OPT += \ > - --with-distro=other \ > + --with-rootprefix= \ > + --with-rootlibdir=/lib \ > + --localstatedir=/var \ Shouldn't that be /run? Or does systemd use ${localstatedir}/run? > + --enable-static=no \ > + --disable-manpages \ > --disable-selinux \ > --disable-pam \ > --disable-libcryptsetup \ > - --disable-gtk \ > - --disable-plymouth \ > - --with-rootdir=/ \ > + --enable-gcrypt \ > + --with-libgcrypt-prefix=$(STAGING_DIR)/usr \ > --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 \ > + --disable-tcpwrap \ > + --without-python > > -ifeq ($(BR2_PACKAGE_ACL),y) > +ifeq ($(BR2_PACKAGE_SYSTEMD_ACL),y) Ah, so what I suggested was there originally. Why did you change it? > SYSTEMD_CONF_OPT += --enable-acl > SYSTEMD_DEPENDENCIES += acl > else > SYSTEMD_CONF_OPT += --disable-acl > endif > > -ifneq ($(BR2_LARGEFILE),y) > - SYSTEMD_CONF_OPT += --disable-largefile > +ifeq ($(BR2_PACKAGE_SYSTEMD_GUDEV),y) > + SYSTEMD_CONF_OPT += --enable-gudev > + SYSTEMD_DEPENDENCIES += libglib2 > +else > + SYSTEMD_CONF_OPT += --disable-gudev > +endif > + > +ifeq ($(BR2_PACKAGE_SYSTEMD_COMPRESS_JOURNAL),y) > + SYSTEMD_DEPENDENCIES += xz > + SYSTEMD_CONF_OPT += --enable-xz > +else > + SYSTEMD_CONF_OPT += --disable-xz > +endif > + > +ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y) > + SYSTEMD_DEPENDENCIES += libmicrohttpd > +else > + SYSTEMD_CONF_OPT += --disable-microhttpd > endif > > # mq_getattr needs -lrt > @@ -53,21 +79,31 @@ SYSTEMD_MAKE_OPT += LIBS=-lrt > SYSTEMD_MAKE_OPT += LDFLAGS+=-ldl > > define SYSTEMD_INSTALL_INIT_HOOK > - ln -fs ../usr/lib/systemd/systemd $(TARGET_DIR)/sbin/init > - ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/halt > - ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/poweroff > - ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/reboot > + ln -fs ../lib/systemd/systemd $(TARGET_DIR)/sbin/init > + ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/halt > + ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/poweroff > + ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/reboot > > - ln -fs ../../../usr/lib/systemd/system/multi-user.target $(TARGET_DIR)/etc/systemd/system/default.target > + ln -fs ../../../lib/systemd/system/multi-user.target $(TARGET_DIR)/etc/systemd/system/default.target > endef > > define SYSTEMD_INSTALL_TTY_HOOK > rm -f $(TARGET_DIR)/etc/systemd/system/getty.target.wants/getty@tty1.service > - 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 > + ln -fs ../../../../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 > + > +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 Should that user only be added if BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY is selected? > +endef > > $(eval $(autotools-package)) > diff --git a/package/udev/Config.in b/package/udev/Config.in > index d4d97c1..7aa4483 100644 > --- a/package/udev/Config.in > +++ b/package/udev/Config.in > @@ -1,39 +1,33 @@ > config BR2_PACKAGE_UDEV > bool "udev" > depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV > - depends on BR2_LARGEFILE # util-linux > - depends on BR2_USE_WCHAR # util-linux > - depends on !BR2_PREFER_STATIC_LIB # kmod > - select BR2_PACKAGE_UTIL_LINUX > - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID > - select BR2_PACKAGE_KMOD > help > Userspace device daemon. > > udev requires a Linux kernel >= 2.6.34: it relies on devtmpfs. > > - ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ > - > if BR2_PACKAGE_UDEV > > -config BR2_PACKAGE_UDEV_RULES_GEN > - bool "enable rules generator" > - help > - Enable persistant rules generator > - > -config BR2_PACKAGE_UDEV_ALL_EXTRAS > - bool "enable all extras" > - select BR2_PACKAGE_ACL > - select BR2_PACKAGE_HWDATA > - select BR2_PACKAGE_LIBGLIB2 > - depends on BR2_USE_WCHAR # libglib2 > - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 > - help > - Enable all extras with external dependencies like > - libacl, hwdata and libglib2 > +choice > + prompt "udev provider" > + default BR2_PACKAGE_UDEV_PROVIDER_EUDEV > + > +config BR2_PACKAGE_UDEV_PROVIDER_EUDEV > + bool "Use udev from eudev" > + select BR2_PACKAGE_EUDEV > + depends on !BR2_PACKAGE_SYSTEMD > + > +comment "eudev not available with Systemd init system" > + depends on BR2_PACKAGE_SYSTEMD > + > +config BR2_PACKAGE_UDEV_PROVIDER_SYSTEMD > + bool "Use udev from Systemd" > + depends on BR2_PACKAGE_SYSTEMD > + > +comment "Original udev only available with Systemd init system" > + depends on !BR2_PACKAGE_SYSTEMD This is a kind of useless choice, don't you think? You always have only one choice... I would just make BR2_PACKAGE_UDEV a hidden option like this: config BR2_PACKAGE_UDEV bool select BR2_PACKAGE_EUDEV if !BR2_PACKAGE_SYSTEMD All the rest can be removed. > > -comment "enabling all extras requires a toolchain with WCHAR and threading support" > - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS > +endchoice > > endif > > diff --git a/package/udev/udev.mk b/package/udev/udev.mk > index 69f011f..39dc014 100644 > --- a/package/udev/udev.mk > +++ b/package/udev/udev.mk > @@ -4,48 +4,32 @@ > # > ################################################################################ > > -UDEV_VERSION = 182 > -UDEV_SOURCE = udev-$(UDEV_VERSION).tar.bz2 > -UDEV_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/ > -UDEV_LICENSE = GPLv2+ > -UDEV_LICENSE_FILES = COPYING > -UDEV_INSTALL_STAGING = YES > - > -# mq_getattr is in librt > -UDEV_CONF_ENV += LIBS=-lrt > - > -UDEV_CONF_OPT = \ > - --sbindir=/sbin \ > - --with-rootlibdir=/lib \ > - --libexecdir=/lib \ > - --with-usb-ids-path=/usr/share/hwdata/usb.ids \ > - --with-pci-ids-path=/usr/share/hwdata/pci.ids \ > - --with-firmware-path=/lib/firmware \ > - --disable-introspection > - > -UDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux kmod > - > -ifeq ($(BR2_PACKAGE_UDEV_RULES_GEN),y) > -UDEV_CONF_OPT += --enable-rule_generator > -endif > +UDEV_VERSION = 206 > +UDEV_SITE = http://www.freedesktop.org/software/systemd/ > +UDEV_SOURCE = systemd-$(UDEV_VERSION).tar.xz > > -ifeq ($(BR2_PACKAGE_UDEV_ALL_EXTRAS),y) > -UDEV_DEPENDENCIES += acl hwdata libglib2 > -UDEV_CONF_OPT += \ > - --enable-udev_acl > -else > -UDEV_CONF_OPT += \ > - --disable-gudev > +ifeq ($(BR2_PACKAGE_UDEV_PROVIDER_EUDEV),y) > +UDEV_DEPENDENCIES = eudev > endif > > -ifeq ($(BR2_PACKAGE_SYSTEMD),y) > - UDEV_CONF_OPT += --with-systemdsystemunitdir=/lib/systemd/system/ > +ifeq ($(BR2_PACKAGE_UDEV_PROVIDER_SYSTEMD),y) > +UDEV_DEPENDENCIES = systemd > endif > > -define UDEV_INSTALL_INITSCRIPT > - $(INSTALL) -m 0755 package/udev/S10udev $(TARGET_DIR)/etc/init.d/S10udev > +define UDEV_EXTRACT_CMDS > + @echo "Dummy package: nothing to extract" > +endef > + > +define UDEV_CONFIGURE_CMDS > + @echo "Dummy package: nothing to configure" > endef > > -UDEV_POST_INSTALL_TARGET_HOOKS += UDEV_INSTALL_INITSCRIPT > +define UDEV_BUILD_CMDS > + @echo "Dummy package: nothing to build" > +endef > + > +define UDEV_CLEAN_CMDS > + @echo "Dummy package: nothing to clean" > +endef No need to define all these dummy CMDS. Just leave them empty. Cfr. package/opengl/libopenmax/libopenmax.mk. You do have to set UDEV_SOURCE, and then set UDEV_DEPENDENCIES depending on whether eudev or systemd is selected. Note to list: we should add documentation about how to create a virtual package. > > -$(eval $(autotools-package)) > +$(eval $(generic-package)) > diff --git a/system/Config.in b/system/Config.in > index 401285b..17ec532 100644 > --- a/system/Config.in > +++ b/system/Config.in > @@ -72,14 +72,26 @@ choice > > config BR2_ROOTFS_DEVICE_CREATION_STATIC > bool "Static using device table" > + depends on !BR2_INIT_SYSTEMD > + > +comment "Static using device table not available with Systemd as init system" > + depends on BR2_INIT_SYSTEMD We currently have the reverse: systemd can only be selected if udev was selected. Any specific reason why you change that? I'm not opposed to modifying that, but then the INIT choice should probably come before the DEVICE_CREATION option. And it probably should be a separate patch. In this case, I would hide the choice if BR2_INIT_SYSTEMD is selected. Like so: choice prompt "/dev management" if !BR2_INIT_SYSTEMD default BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV if BR2_INIT_SYSTEMD default BR2_ROOTFS_DEVICE_CREATION_STATIC ... endchoice > > config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS > bool "Dynamic using devtmpfs only" > + depends on !BR2_INIT_SYSTEMD > + > +comment "Dynamic using devtmpfs not available with Systemd as init system" > + depends on BR2_INIT_SYSTEMD > > config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV > bool "Dynamic using mdev" > + depends on !BR2_INIT_SYSTEMD > select BR2_PACKAGE_BUSYBOX > > +comment "Dynamic using mdev not available with Systemd as init system" > + depends on BR2_INIT_SYSTEMD > + > config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV > bool "Dynamic using udev" > depends on BR2_LARGEFILE # udev > @@ -112,7 +124,6 @@ config BR2_INIT_SYSTEMD > depends on BR2_LARGEFILE > depends on BR2_USE_WCHAR > depends on BR2_INET_IPV6 > - depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV You'll also have to remove it from the comment a few lines lower. Regards, Arnout > depends on BR2_TOOLCHAIN_HAS_THREADS > depends on BR2_USE_MMU > select BR2_PACKAGE_DBUS >
Dear eric.le.bihan.dev@free.fr, On Fri, 6 Sep 2013 16:01:07 +0200, eric.le.bihan.dev@free.fr wrote: > From: Eric Le Bihan <eric.le.bihan.dev@free.fr> > > Udev is now a virtual package, which can be provided by either Systemd or Eudev. > > eudev is the Gentoo fork of git://anongit.freedesktop.org/systemd/systemd > with the aim of isolating udev from any particular flavor of system > initialization. In this case, the isolation is from systemd. > > From now on, if you choose to manage the device table with udev, you will have > to choose between two providers: systemd and eudev. > > These providers are mutually exclusive: > > - if systemd is chosen, the other methods (static, mdev) are not available. > - eudev is not available if systemd is chosen as the init system. > > Systemd has been updated to version 206. Eudev v1.2 is forked from this > version. Thanks a lot for doing this! I'm really happy to see this making progress! Besides some implementation details (below), I have two remaining main concerns: (1) All the existing BR2_PACKAGE_UDEV* options are being renamed, without them being added in Config.in.legacy to provide a smooth migration path for users upgrading Buildroot. I believe this should be fixed by migrating them to eudev automatically through Config.in.legacy logic. (2) I'm not sure I like the fact that the selection of eudev vs. systemd to be "hidden" within the udev virtual package Config.in option. It means that the user needs to go in Target packages -> ... -> udev to be able to select between eudev vs. systemd. I believe this choice should be part of some option within the more global 'System configuration' menu, or derived from the existing options. There are I believe a few possibilities. The first one is to decide automatically based on the /dev management solution + the init system being used. If the /dev management solution is udev and the init system is *not* systemd, then eudev can be used automatically, while if the /dev management solution is udev and the init system is systemd, then systemd should be used. Another option is to explicitly create another /dev management option: - Static /dev - /dev with devtmpfs - /dev with devtmpfs + mdev - /dev with devtmpfs + eudev - /dev with devtmpfs + systemd/udev I don't have a particular preference at the moment, but I reallly believe it should be handled as a global System configuration option rather than as a udev virtual package option. > diff --git a/package/systemd/Config.in b/package/systemd/Config.in > index 86ab2cf..f346aa3 100644 > --- a/package/systemd/Config.in > +++ b/package/systemd/Config.in > @@ -1,11 +1,17 @@ > config BR2_PACKAGE_SYSTEMD > bool "systemd" > + depends on BR2_INIT_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 > depends on BR2_USE_MMU # dbus > select BR2_PACKAGE_DBUS > select BR2_PACKAGE_LIBCAP > + select BR2_PACKAGE_LIBGCRYPT > + select BR2_PACKAGE_UTIL_LINUX > + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID > + select BR2_PACKAGE_KMOD > help > systemd is a system and service manager for Linux, compatible with > SysV and LSB init scripts. systemd provides aggressive parallelization > @@ -18,6 +24,42 @@ config BR2_PACKAGE_SYSTEMD > > http://freedesktop.org/wiki/Software/systemd > > -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 > +if BR2_PACKAGE_SYSTEMD > + > +config BR2_PACKAGE_SYSTEMD_ACL > + bool "Enable ACL" > + default n There's no need to put 'default n', since this is the default. > + select BR2_PACKAGE_ACL > + help > + Enable ACL support > + > +config BR2_PACKAGE_SYSTEMD_GUDEV > + bool "Build Gudev" > + default n > + select BR2_PACKAGE_LIBGLIB2 > + help > + Build GLib bindings for udev > + > +config BR2_PACKAGE_SYSTEMD_COMPRESS_JOURNAL > + bool "Compress journal" > + default n > + select BR2_PACKAGE_XZ > + help > + Compress the journal > + > +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 ipv6 support and thread support in toolchain)" and largefile. Also, this comment should be more in the style of the similar comments in other packages, like: comment "systemd requires IPv6, thread support and largefile support in toolchain" > + depends on (!BR2_LARGEFILE || !BR2_INET_IPV6 || \ > + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INIT_SYSTEMD) > 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 > + Missing Signed-off-by line on all the patches. > 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 This patch was originally done by Maxime Ripard, you should keep his authorship here (even though the patch is admittedly quite small). > +++ 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) I believe this new test has nothing to do with the %ms scanf logic that this patch is adding. > ++ > ++# check for %ms modifier support - assume always no if cross compiling > ++ > ++AC_MSG_CHECKING([whether %ms modifier is supported by *scanf]) > ++ > ++AC_RUN_IFELSE( An AC_RUN_IFELSE test? How does that work in cross-compilation mode? > 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. Just for curiosity, it'd be nice to expand a bit on what this is doing and why it is needed (which errors, etc.). > diff --git a/package/udev/udev.mk b/package/udev/udev.mk > index 69f011f..39dc014 100644 > --- a/package/udev/udev.mk > +++ b/package/udev/udev.mk > @@ -4,48 +4,32 @@ > # > ################################################################################ > > -UDEV_VERSION = 182 > -UDEV_SOURCE = udev-$(UDEV_VERSION).tar.bz2 > -UDEV_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/ > -UDEV_LICENSE = GPLv2+ > -UDEV_LICENSE_FILES = COPYING > -UDEV_INSTALL_STAGING = YES > - > -# mq_getattr is in librt > -UDEV_CONF_ENV += LIBS=-lrt > - > -UDEV_CONF_OPT = \ > - --sbindir=/sbin \ > - --with-rootlibdir=/lib \ > - --libexecdir=/lib \ > - --with-usb-ids-path=/usr/share/hwdata/usb.ids \ > - --with-pci-ids-path=/usr/share/hwdata/pci.ids \ > - --with-firmware-path=/lib/firmware \ > - --disable-introspection > - > -UDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux kmod > - > -ifeq ($(BR2_PACKAGE_UDEV_RULES_GEN),y) > -UDEV_CONF_OPT += --enable-rule_generator > -endif > +UDEV_VERSION = 206 > +UDEV_SITE = http://www.freedesktop.org/software/systemd/ > +UDEV_SOURCE = systemd-$(UDEV_VERSION).tar.xz > > -ifeq ($(BR2_PACKAGE_UDEV_ALL_EXTRAS),y) > -UDEV_DEPENDENCIES += acl hwdata libglib2 > -UDEV_CONF_OPT += \ > - --enable-udev_acl > -else > -UDEV_CONF_OPT += \ > - --disable-gudev > +ifeq ($(BR2_PACKAGE_UDEV_PROVIDER_EUDEV),y) > +UDEV_DEPENDENCIES = eudev > endif > > -ifeq ($(BR2_PACKAGE_SYSTEMD),y) > - UDEV_CONF_OPT += --with-systemdsystemunitdir=/lib/systemd/system/ > +ifeq ($(BR2_PACKAGE_UDEV_PROVIDER_SYSTEMD),y) > +UDEV_DEPENDENCIES = systemd > endif > > -define UDEV_INSTALL_INITSCRIPT > - $(INSTALL) -m 0755 package/udev/S10udev $(TARGET_DIR)/etc/init.d/S10udev > +define UDEV_EXTRACT_CMDS > + @echo "Dummy package: nothing to extract" > +endef > + > +define UDEV_CONFIGURE_CMDS > + @echo "Dummy package: nothing to configure" > endef > > -UDEV_POST_INSTALL_TARGET_HOOKS += UDEV_INSTALL_INITSCRIPT > +define UDEV_BUILD_CMDS > + @echo "Dummy package: nothing to build" > +endef > + > +define UDEV_CLEAN_CMDS > + @echo "Dummy package: nothing to clean" > +endef Just don't implement those comments. A virtual package should just fill in <foo>_DEPENDENCIES and that's pretty much it. > > -$(eval $(autotools-package)) > +$(eval $(generic-package)) > diff --git a/system/Config.in b/system/Config.in > index 401285b..17ec532 100644 > --- a/system/Config.in > +++ b/system/Config.in > @@ -72,14 +72,26 @@ choice > > config BR2_ROOTFS_DEVICE_CREATION_STATIC > bool "Static using device table" > + depends on !BR2_INIT_SYSTEMD > + > +comment "Static using device table not available with Systemd as init system" > + depends on BR2_INIT_SYSTEMD > > config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS > bool "Dynamic using devtmpfs only" > + depends on !BR2_INIT_SYSTEMD > + > +comment "Dynamic using devtmpfs not available with Systemd as init system" > + depends on BR2_INIT_SYSTEMD > > config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV > bool "Dynamic using mdev" > + depends on !BR2_INIT_SYSTEMD > select BR2_PACKAGE_BUSYBOX > > +comment "Dynamic using mdev not available with Systemd as init system" > + depends on BR2_INIT_SYSTEMD I am not sure those new comments are needed. The "/dev management" method is selected before the init system in the logic of the menuconfig, so the not possible init systems will not be visible if for example a static /dev is chosen. And if anyway the user tries to go back in the "/dev management" choice and changes his mind, then the init system selection will automatically be modified if needed. But well, it's true that a few more comments might help clarify what's happening, so it's not a strong opinion from me here. Thanks! Thomas
On Tue, Sep 10, 2013 at 10:24:40PM +0200, Arnout Vandecappelle wrote: Hi! Thanks for the review, it is very instructive. > >Systemd has been updated to version 206. Eudev v1.2 is forked from this > >version. > > I don't know if it is important, but I would have split the systemd > bump from the eudev patch. Or would systemd 44 fail to function with > eudev? Next time, I will make a series of patch, but I want to keep eudev and systemd in sync, as the developpers of eudev do: on Friday September 13th, Systemd v207 was released and the next day eudev was bumped to 1.3. Systemd v44 is supposed to be compliant with udev v182, but there is no eudev equivalent for this version. In order not to provide a broken system, I suggest: 1) first patch bumps systemd and replaces udev with a virtual package. 2) second patch adds eudev as a "udev provider". > The essential info is that it is standalone. So I would write: > > Userspace device daemon. This is a standalone version, > independent of systemd. It is a fork maintained by Gentoo. Ack. > Since wchar is already required by eudev itself, putting it in the > comment is redundant. > > Also, we're in the process of standardizing on: > > comment "enabling all extras needs a toolchain w/ thread, wchar" > > (which fits in the 70-column limit, unlike your version). Yes! This was annoying me too. > IIRC github supports URLs like > http://github.com/gentoo/eudev/tarball/v1.2.tar.gz I've found the correct URL: https://github.com/gentoo/eudev/archive/v1.2.tar.gz I will use it instead of the git tree. > >+EUDEV_LICENSE = GPLv2 > > Did the Gentoo people remove the +? Typo! > >+if BR2_PACKAGE_SYSTEMD > >+ > >+config BR2_PACKAGE_SYSTEMD_ACL > >+ bool "Enable ACL" > >+ default n > > n is the default, so remove this line (same below). > > Is it really useful to have this option, rather than depending on > acl automatically when BR2_PACKAGE_ACL is set? Same for some of the > other config options below. I was wondering what was the best for the user: 1) offering him some fine-grained choices. 2) offering only one "enable all extras" option. Besides, between Systemd extra feature and ACL, which depends on which? As a user, I prefer to choose explicitly the features of my system, not having them activated unknowingly because I selected other packages. Gudev, Gcrypt, ACL and journal compression can be grouped in "enable all extras", but I'll keep the journal gateway as a separate option, as adding it to a firmware image really eat up resources (image size and memory consumption): it is a big feature. Enabling all extras will select Gudev, Gcrypt, ACL, xz, not the other way round. About the patches I provided to have Systemd v206 compile with uClibc: 1) A truckload of patches for uClibc 0.9.33 has been added in 055f1c02d35068d0b089f3b29ffdd4fb2717bb5c: some of them are redundant with the ones I provided, so I'll clean them up. 2) For the Signed-off-by thing: I should have read contribute.txt and SubmittingPatches from Linux source code more carefully. > >+SYSTEMD_AUTORECONF = YES > > Please add a comment why this is needed. I'll see if I can get rid of the reconf step, as well as the build dependency on libgcrypt caused by AM_PATH_LIBGCRYPT. > > SYSTEMD_CONF_OPT += \ > >- --with-distro=other \ > >+ --with-rootprefix= \ > >+ --with-rootlibdir=/lib \ > >+ --localstatedir=/var \ > > Shouldn't that be /run? Or does systemd use ${localstatedir}/run? I'll check. I use /var in my skeleton. > >+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 > > Should that user only be added if > BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY is selected? I'll split it: I'll add "systemd-journal" by default and "systemd-journal-gateway" only if the "enable journal gateway" option is selected. > We currently have the reverse: systemd can only be selected if udev > was selected. Any specific reason why you change that? I'm not > opposed to modifying that, but then the INIT choice should probably > come before the DEVICE_CREATION option. And it probably should be a > separate patch. Yes. I'm in favor of selecting the init system first, then selecting the /dev management method. Also, the password encoding selection should be put before selecting the root password. > In this case, I would hide the choice if BR2_INIT_SYSTEMD is > selected. Like so: > > choice > prompt "/dev management" if !BR2_INIT_SYSTEMD > default BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV if BR2_INIT_SYSTEMD > default BR2_ROOTFS_DEVICE_CREATION_STATIC > > ... > endchoice I tried it, but the problem is that if the "prompt" is hidden, then the "config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV" variable will not get defined in the generated ".config": so some packages depending on it will not be selected. I want the selection of udev to be explicit to the user, not hidden. That's why I came up with this solution of providing only one choice for /dev management when systemd is selected. Maybe a comment will be better...
On Tue, Sep 17, 2013 at 07:17:37AM +0200, Thomas Petazzoni wrote: > (1) All the existing BR2_PACKAGE_UDEV* options are being renamed, > without them being added in Config.in.legacy to provide a smooth > migration path for users upgrading Buildroot. I believe this should be > fixed by migrating them to eudev automatically through > Config.in.legacy logic. I was not aware of this mechanism, as I was previously working with an old version of Buildroot (2012.08). > > (2) I'm not sure I like the fact that the selection of eudev vs. > systemd to be "hidden" within the udev virtual package Config.in > option. It means that the user needs to go in Target packages -> ... > -> udev to be able to select between eudev vs. systemd. I believe this > choice should be part of some option within the more global 'System > configuration' menu, or derived from the existing options. > > There are I believe a few possibilities. The first one is to decide > automatically based on the /dev management solution + the init system > being used. If the /dev management solution is udev and the init > system is *not* systemd, then eudev can be used automatically, while > if the /dev management solution is udev and the init system is > systemd, then systemd should be used. > > Another option is to explicitly create another /dev management option: > > - Static /dev > - /dev with devtmpfs > - /dev with devtmpfs + mdev > - /dev with devtmpfs + eudev > - /dev with devtmpfs + systemd/udev > > I don't have a particular preference at the moment, but I reallly > believe it should be handled as a global System configuration option > rather than as a udev virtual package option. As mentioned in my reply to Arnout, I think it is better to have the selection of the init system before the selection of the /dev management, because the first item to choose when building a system is how to start it, not how to manage the devices. Our constraints are: 1) we need to keep a virtual udev package to avoid breaking Pulseaudio, Weston, Udisks, etc: as eudev is identical to udev from systemd, it does not matter which one is selected to build these packages. 2) there is no need to offer a static /dev, mdev or eudev if systemd is selected. The opposite is allowed. I ack the idea of moving the choice between udev (from systemd) and eudev to the "System Configuration" menu. So I suggest that, when the user selects the init system: - if systemd is selected, then the menu to select /dev management is *not* displayed, but replaced by a comment as "/dev management with udev (from systemd)". The virtual package udev is selected. - if systemd is not selected, then the menu to select /dev management is displayed, with the following choices: * static /dev * /dev with devtmpfs * /dev with devtmpfs + mdev * /dev with devtmpfs + eudev Selecting eudev selects the udev virtual package. The user can configure the extras for eudev in the appropriate "Target packages" section. My reply to Arnout should contain the answers to the other questions.
Dear Arnout Vandecappelle, On Tue, 10 Sep 2013 22:24:40 +0200, Arnout Vandecappelle wrote: > > +comment "eudev requires /dev mgmnt set to udev under System configuration" > > + depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV > > + > > +comment "eudev not available with Systemd as init system" > > + depends on BR2_PACKAGE_SYSTEMD > > I think these comments are not really necessary. Actually, I would say > that the only reason that eudev has a user-visible Config option is for > the "enable all extras". And that config option is slightly redundant, > since the additional size of gudev is almost nothing compared to > libglib2, so you could just as well use an automatic dependency. No, I disagree with this. There are some other packages (currently udisks and network-manager) that explicitly need the udev extras. So I believe it's useful for these packages to be able to 'select BR2_PACKAGE_UDEV_ALL_EXTRAS'. Of course, they could 'select BR2_PACKAGE_LIBGLIB2' and depend on udev, but this means that they have internal knowledge of the fact that udev needs libglib2 to enable 'all extras', an internal knowledge that could very well be broken if tomorrow udev needs another dependency to build its 'all extras' things. So, the BR2_PACKAGE_(E)UDEV_ALL_EXTRAS option should remain in place, I believe. Best regards, Thomas
Dear Eric Le Bihan, On Tue, 17 Sep 2013 14:53:52 +0200, Eric Le Bihan wrote: > > (1) All the existing BR2_PACKAGE_UDEV* options are being renamed, > > without them being added in Config.in.legacy to provide a smooth > > migration path for users upgrading Buildroot. I believe this should be > > fixed by migrating them to eudev automatically through > > Config.in.legacy logic. > I was not aware of this mechanism, as I was previously working with an old > version of Buildroot (2012.08). No problem. > As mentioned in my reply to Arnout, I think it is better to have the selection > of the init system before the selection of the /dev management, because the > first item to choose when building a system is how to start it, not how to > manage the devices. Well, that's a matter of taste, but why not :) > Our constraints are: > > 1) we need to keep a virtual udev package to avoid breaking Pulseaudio, Weston, > Udisks, etc: as eudev is identical to udev from systemd, it does not > matter which one is selected to build these packages. Right. > 2) there is no need to offer a static /dev, mdev or eudev if systemd is > selected. The opposite is allowed. Sure. > I ack the idea of moving the choice between udev (from systemd) and eudev to > the "System Configuration" menu. So I suggest that, when the user selects > the init system: > > - if systemd is selected, then the menu to select /dev management is *not* > displayed, but replaced by a comment as "/dev management with udev > (from systemd)". The virtual package udev is selected. I don't think that the udev virtual package should have a Config.in option to select. It should most likely be like the OpenGL virtual package: it provides an invisible BR2_PACKAGE_HAS_UDEV, which gets selected by both systemd and eudev. All packages that need an udev implementation to be available will have to 'depends on BR2_PACKAGE_HAS_UDEV' and to do FOO_DEPENDENCIES += udev. > - if systemd is not selected, then the menu to select /dev management is > displayed, with the following choices: > > * static /dev > * /dev with devtmpfs > * /dev with devtmpfs + mdev > * /dev with devtmpfs + eudev Right. > Selecting eudev selects the udev virtual package. See above. I don't think udev should have a Config.in option to be selected. > The user can configure > the extras for eudev in the appropriate "Target packages" section. Right. Thomas
Dear Eric Le Bihan, On Tue, 17 Sep 2013 12:40:48 +0200, Eric Le Bihan wrote: > > I don't know if it is important, but I would have split the systemd > > bump from the eudev patch. Or would systemd 44 fail to function with > > eudev? > > Next time, I will make a series of patch, but I want to keep eudev and systemd > in sync, as the developpers of eudev do: on Friday September 13th, Systemd > v207 was released and the next day eudev was bumped to 1.3. Systemd v44 is > supposed to be compliant with udev v182, but there is no eudev equivalent for > this version. In order not to provide a broken system, I suggest: > > 1) first patch bumps systemd and replaces udev with a virtual package. > 2) second patch adds eudev as a "udev provider". I don't think it's worth the effort splitting the patch, to be honest. If patches are split, then they should be bisectable. However, with your suggestion, if patch (1) is applied but not patch (2), then all configurations that use udev but not systemd would be broken. > > IIRC github supports URLs like > > http://github.com/gentoo/eudev/tarball/v1.2.tar.gz > > I've found the correct URL: > https://github.com/gentoo/eudev/archive/v1.2.tar.gz > I will use it instead of the git tree. Strange, this doesn't match what http://buildroot.org/downloads/manual/manual.html#github-download-url says. But maybe it's different for eudev, I don't know. > > Is it really useful to have this option, rather than depending on > > acl automatically when BR2_PACKAGE_ACL is set? Same for some of the > > other config options below. > > I was wondering what was the best for the user: > > 1) offering him some fine-grained choices. > 2) offering only one "enable all extras" option. > > Besides, between Systemd extra feature and ACL, which depends on which? > As a user, I prefer to choose explicitly the features of my system, not having > them activated unknowingly because I selected other packages. Right, but we have to balance that with the problem of creating millions of configuration options to enable in each and every package whether the SSL support should be enabled, whether the ACL support should be enabled, etc. We had many discussions on how to draw the line between "automatically enable a feature if the needed dependencies are present" and "add a configuration sub-option to enable the feature", and the conclusions had always been: there's no way to draw a strict line, it's a matter of taste/compromise. > Gudev, Gcrypt, > ACL and journal compression can be grouped in "enable all extras", I don't think that is what Arnout was suggesting, he was suggesting that the ACL support should automatically be enabled if the ACL package is available. I.e, instead of: ifeq ($(BR2_PACKAGE_SYSTEMD_ACL_SUPPORT),y) SYSTEMD_CONF_OPT += --enable-acl SYSTEMD_DEPENDENCIES += acl else SYSTEMD_CONF_OPT += --disable-acl endif You just change this to: ifeq ($(BR2_PACKAGE_ACL),y) SYSTEMD_CONF_OPT += --enable-acl SYSTEMD_DEPENDENCIES += acl else SYSTEMD_CONF_OPT += --disable-acl endif > but I'll > keep the journal gateway as a separate option, as adding it to a firmware > image really eat up resources (image size and memory consumption): it is a big > feature. Enabling all extras will select Gudev, Gcrypt, ACL, xz, not the other > way round. See above. > About the patches I provided to have Systemd v206 compile with uClibc: > > 1) A truckload of patches for uClibc 0.9.33 has been added in > 055f1c02d35068d0b089f3b29ffdd4fb2717bb5c: some of them are redundant > with the ones I provided, so I'll clean them up. > 2) For the Signed-off-by thing: I should have read contribute.txt and > SubmittingPatches from Linux source code more carefully. Ah, right, posix_fallocate() support has been added, as well as support for %ms in scanf(). This means that I'll have to rebuild the autobuilder uClibc external toolchains, and also that Crosstool-NG uClibc toolchains (that won't have all the uClibc patches we apply) will fail to build. The uClibc community should really do releases more often, it seems. > > >+SYSTEMD_AUTORECONF = YES > > > > Please add a comment why this is needed. > I'll see if I can get rid of the reconf step, as well as the build dependency > on libgcrypt caused by AM_PATH_LIBGCRYPT. I believe I have already proposed a solution to this problem, if autoreconf is still neeeded. > > We currently have the reverse: systemd can only be selected if udev > > was selected. Any specific reason why you change that? I'm not > > opposed to modifying that, but then the INIT choice should probably > > come before the DEVICE_CREATION option. And it probably should be a > > separate patch. > > Yes. I'm in favor of selecting the init system first, then selecting the /dev > management method. Also, the password encoding selection should be put before > selecting the root password. Ok. Please add separate patches in your patch series to do those changes. I'm really glad to see this patch moving forward, bumping systemd and udev is long overdue, and it's great to have someone doing this! Thanks! Thomas
On 17/09/13 12:40, Eric Le Bihan wrote: > On Tue, Sep 10, 2013 at 10:24:40PM +0200, Arnout Vandecappelle wrote: > Hi! > > Thanks for the review, it is very instructive. > >>> Systemd has been updated to version 206. Eudev v1.2 is forked from this >>> version. >> >> I don't know if it is important, but I would have split the systemd >> bump from the eudev patch. Or would systemd 44 fail to function with >> eudev? > > Next time, I will make a series of patch, but I want to keep eudev and systemd > in sync, as the developpers of eudev do: on Friday September 13th, Systemd > v207 was released and the next day eudev was bumped to 1.3. Systemd v44 is > supposed to be compliant with udev v182, but there is no eudev equivalent for > this version. In order not to provide a broken system, I suggest: > > 1) first patch bumps systemd and replaces udev with a virtual package. > 2) second patch adds eudev as a "udev provider". No, in that case, don't bother. Splitting patches is good, but if it makes your life (much) harder: there are better ways to spend your time. [snip] >>> +if BR2_PACKAGE_SYSTEMD >>> + >>> +config BR2_PACKAGE_SYSTEMD_ACL >>> + bool "Enable ACL" >>> + default n >> >> n is the default, so remove this line (same below). >> >> Is it really useful to have this option, rather than depending on >> acl automatically when BR2_PACKAGE_ACL is set? Same for some of the >> other config options below. > > I was wondering what was the best for the user: > > 1) offering him some fine-grained choices. > 2) offering only one "enable all extras" option. > > Besides, between Systemd extra feature and ACL, which depends on which? > As a user, I prefer to choose explicitly the features of my system, not having > them activated unknowingly because I selected other packages. Gudev, Gcrypt, > ACL and journal compression can be grouped in "enable all extras", but I'll > keep the journal gateway as a separate option, as adding it to a firmware > image really eat up resources (image size and memory consumption): it is a big > feature. Enabling all extras will select Gudev, Gcrypt, ACL, xz, not the other > way round. Specifically for acl, the buildroot "standard" is to not give the user an option, but just build systemd with acl if BR2_PACKAGE_ACL is y. If we would make a general rule of creating Config options for all the optional dependencies of a package, the number of options would explode - and the .config is already close to 100K. For gudev, it is probably best to take a similar approach, i.e. enable it automatically if libglib2 is selected. Most likely gudev is pretty small compared to libglib2, and almost certainly you'll only need it when there is some other package that already selects libglib2. For the journal compression and the journal gateway, I agree that it makes sense to have config options for them. [snip] >> We currently have the reverse: systemd can only be selected if udev >> was selected. Any specific reason why you change that? I'm not >> opposed to modifying that, but then the INIT choice should probably >> come before the DEVICE_CREATION option. And it probably should be a >> separate patch. > > Yes. I'm in favor of selecting the init system first, then selecting the /dev > management method. Also, the password encoding selection should be put before > selecting the root password. About the init system, as Thomas said it's a matter of taste - though in the case of systemd it certainly does make a lot of sense to select that first and avoid an unnecessary choice of /dev system. Regarding the root password, you're probably right, and the method should probably depend on the password being non-empty. > >> In this case, I would hide the choice if BR2_INIT_SYSTEMD is >> selected. Like so: >> >> choice >> prompt "/dev management" if !BR2_INIT_SYSTEMD >> default BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV if BR2_INIT_SYSTEMD >> default BR2_ROOTFS_DEVICE_CREATION_STATIC >> >> ... >> endchoice > > I tried it, but the problem is that if the "prompt" is hidden, then the > "config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV" variable will not get defined > in the generated ".config": so some packages depending on it will not be > selected. Huh? I didn't expect that... But anyway, these packages should probably depend on BR2_PACKAGE_UDEV instead of the system option. I think depending on system options in packages is generally a bad idea. > I want the selection of udev to be explicit to the user, not hidden. That's > why I came up with this solution of providing only one choice for /dev > management when systemd is selected. Maybe a comment will be better... I'm not sure if that is needed. The user will either know about the udev dependency, or not care. Regards, Arnout
On 17/09/13 20:37, Thomas Petazzoni wrote: > Dear Arnout Vandecappelle, > > On Tue, 10 Sep 2013 22:24:40 +0200, Arnout Vandecappelle wrote: > >>> +comment "eudev requires /dev mgmnt set to udev under System configuration" >>> + depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV >>> + >>> +comment "eudev not available with Systemd as init system" >>> + depends on BR2_PACKAGE_SYSTEMD >> >> I think these comments are not really necessary. Actually, I would say >> that the only reason that eudev has a user-visible Config option is for >> the "enable all extras". And that config option is slightly redundant, >> since the additional size of gudev is almost nothing compared to >> libglib2, so you could just as well use an automatic dependency. > > No, I disagree with this. There are some other packages (currently > udisks and network-manager) that explicitly need the udev extras. So I > believe it's useful for these packages to be able to 'select > BR2_PACKAGE_UDEV_ALL_EXTRAS'. Of course, they could 'select > BR2_PACKAGE_LIBGLIB2' and depend on udev, but this means that they have > internal knowledge of the fact that udev needs libglib2 to enable 'all > extras', an internal knowledge that could very well be broken if > tomorrow udev needs another dependency to build its 'all extras' things. > > So, the BR2_PACKAGE_(E)UDEV_ALL_EXTRAS option should remain in place, I > believe. I didn't write the network-manager and udisks integration, but I think that they _actually_ need gudev, not some vague "all extras". And for gudev it's pretty darn obvious that there is a relation with libglib2. In fact, both of them should probably select libglib2 directly, because they are based on gobject classes. Regards, Arnout
On 17/09/13 20:45, Thomas Petazzoni wrote: >> >The user can configure >> >the extras for eudev in the appropriate "Target packages" section. > Right. Perhaps it makes more sense to include the extra config for eudev and systemd to the system menu? I think it's a bit strange to have to navigate to a completely different, hard to find menu to enable systemd's journal gateway... You can easily do this by moving the source "package/systemd/systemd.mk" line from package/Config.in to system/Config.in. But first check if it looks good, of course. Regards, Arnout
Dear Arnout Vandecappelle, On Wed, 18 Sep 2013 08:57:46 +0200, Arnout Vandecappelle wrote: > > No, I disagree with this. There are some other packages (currently > > udisks and network-manager) that explicitly need the udev extras. So I > > believe it's useful for these packages to be able to 'select > > BR2_PACKAGE_UDEV_ALL_EXTRAS'. Of course, they could 'select > > BR2_PACKAGE_LIBGLIB2' and depend on udev, but this means that they have > > internal knowledge of the fact that udev needs libglib2 to enable 'all > > extras', an internal knowledge that could very well be broken if > > tomorrow udev needs another dependency to build its 'all extras' things. > > > > So, the BR2_PACKAGE_(E)UDEV_ALL_EXTRAS option should remain in place, I > > believe. > > I didn't write the network-manager and udisks integration, but I think > that they _actually_ need gudev, not some vague "all extras". And for > gudev it's pretty darn obvious that there is a relation with libglib2. In > fact, both of them should probably select libglib2 directly, because they > are based on gobject classes. Right, that's one way of seeing things, indeed. It sounds a bit convoluted to me, though. When a package A needs a specific feature from package B (such as gudev), I believe it makes sense for package B to provide a sub-option that package A can select, rather than package A having intimate knowledge of the dependencies needed by package B to enable whatever feature package A needs to have from package B. No? Thomas
Dear Arnout Vandecappelle, On Wed, 18 Sep 2013 09:00:59 +0200, Arnout Vandecappelle wrote: > Perhaps it makes more sense to include the extra config for eudev and > systemd to the system menu? I think it's a bit strange to have to > navigate to a completely different, hard to find menu to enable systemd's > journal gateway... > > You can easily do this by moving the > source "package/systemd/systemd.mk" > line from package/Config.in to system/Config.in. I already suggested that the selection of eudev vs. systemd should not be in Target Packages, and Eric already made a proposal to solve this. In fact, we don't need any new configuration option: when the systemd init system is selected, then systemd is used. When another init systemd is used, but the selected /dev management method is udev, then we use eudev. There's no need for more options. The only thing that Eric proposed is to re-order the Init System selection vs. the /dev management selection to make things a bit more logical. Thomas
On 18/09/13 17:56, Thomas Petazzoni wrote: > Dear Arnout Vandecappelle, > > On Wed, 18 Sep 2013 08:57:46 +0200, Arnout Vandecappelle wrote: > >>> No, I disagree with this. There are some other packages (currently >>> udisks and network-manager) that explicitly need the udev extras. So I >>> believe it's useful for these packages to be able to 'select >>> BR2_PACKAGE_UDEV_ALL_EXTRAS'. Of course, they could 'select >>> BR2_PACKAGE_LIBGLIB2' and depend on udev, but this means that they have >>> internal knowledge of the fact that udev needs libglib2 to enable 'all >>> extras', an internal knowledge that could very well be broken if >>> tomorrow udev needs another dependency to build its 'all extras' things. >>> >>> So, the BR2_PACKAGE_(E)UDEV_ALL_EXTRAS option should remain in place, I >>> believe. >> >> I didn't write the network-manager and udisks integration, but I think >> that they _actually_ need gudev, not some vague "all extras". And for >> gudev it's pretty darn obvious that there is a relation with libglib2. In >> fact, both of them should probably select libglib2 directly, because they >> are based on gobject classes. > > Right, that's one way of seeing things, indeed. It sounds a bit > convoluted to me, though. When a package A needs a specific feature > from package B (such as gudev), I believe it makes sense for package B > to provide a sub-option that package A can select, rather than package > A having intimate knowledge of the dependencies needed by package B to > enable whatever feature package A needs to have from package B. Makes sense, but we probably already have tons of these already. If gudev would have been added in the normal way instead of introducing the all_extras option, then the implementors of network-manager and udisks wouldn't even have noticed that udev had to be compiled in a specific way: since these tools already select libglib2, udev would have been compiled with gudev support. Really, the all-extras is historical accident because a long time ago udev's configure had an EXTRAS=... option in its build commands. Regards, Arnout
On 18/09/13 17:58, Thomas Petazzoni wrote: > Dear Arnout Vandecappelle, > > On Wed, 18 Sep 2013 09:00:59 +0200, Arnout Vandecappelle wrote: > >> Perhaps it makes more sense to include the extra config for eudev and >> systemd to the system menu? I think it's a bit strange to have to >> navigate to a completely different, hard to find menu to enable systemd's >> journal gateway... >> >> You can easily do this by moving the >> source "package/systemd/systemd.mk" >> line from package/Config.in to system/Config.in. > > I already suggested that the selection of eudev vs. systemd should not > be in Target Packages, and Eric already made a proposal to solve this. > In fact, we don't need any new configuration option: when the systemd > init system is selected, then systemd is used. When another init > systemd is used, but the selected /dev management method is udev, then > we use eudev. > > There's no need for more options. The only thing that Eric proposed is > to re-order the Init System selection vs. the /dev management selection > to make things a bit more logical. For systemd, journal compression and journal gateway still have to be selectable. IMHO it is not nice for the user to have to navigate to a completely unrelated place in order to enable those. So my suggestion is to include the Config.in that has these extra options immediately below the systemd selection in the system menu. Regards, Arnout
Dear Arnout Vandecappelle, On Wed, 18 Sep 2013 18:04:34 +0200, Arnout Vandecappelle wrote: > > Right, that's one way of seeing things, indeed. It sounds a bit > > convoluted to me, though. When a package A needs a specific feature > > from package B (such as gudev), I believe it makes sense for > > package B to provide a sub-option that package A can select, rather > > than package A having intimate knowledge of the dependencies needed > > by package B to enable whatever feature package A needs to have > > from package B. > > Makes sense, but we probably already have tons of these already. If > gudev would have been added in the normal way instead of introducing > the all_extras option, then the implementors of network-manager and > udisks wouldn't even have noticed that udev had to be compiled in a > specific way: since these tools already select libglib2, udev would > have been compiled with gudev support. True. > Really, the all-extras is historical accident because a long time > ago udev's configure had an EXTRAS=... option in its build commands. Right. But the extras have more dependencies that just glib2: it also depends on hwdata and on acl. Will glib2 be sufficient to get gudev built, for use by udisks? Maybe. Thomas
Dear Arnout Vandecappelle, On Wed, 18 Sep 2013 18:06:13 +0200, Arnout Vandecappelle wrote: > > I already suggested that the selection of eudev vs. systemd should > > not be in Target Packages, and Eric already made a proposal to > > solve this. In fact, we don't need any new configuration option: > > when the systemd init system is selected, then systemd is used. > > When another init systemd is used, but the selected /dev management > > method is udev, then we use eudev. > > > > There's no need for more options. The only thing that Eric proposed > > is to re-order the Init System selection vs. the /dev management > > selection to make things a bit more logical. > > For systemd, journal compression and journal gateway still have to > be selectable. IMHO it is not nice for the user to have to navigate > to a completely unrelated place in order to enable those. So my > suggestion is to include the Config.in that has these extra options > immediately below the systemd selection in the system menu. Hum, right. Probably makes sense, yes. Thomas
Hi Just out of curiosity I tried to build using systemd : I think it will need a patch : src/macro.h:39:19: error: static declaration of 'execvpe' follows non-static declaration >>> systemd 44 Building PATH="/home/buildroot12git/output/host/bin:/home/buildroot12git/output/host/usr/bin:/home/buildroot12git/output/host/usr/sbin/:/usr/ local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/home/buildroot12git/output/host/usr/bin" PERLLIB="/home/buildroot12git/output/host/usr/lib/perl" /usr/bin/make -j5 LIBS=-lrt LDFLAGS+=-ldl -C /home/buildroot12git/output/build/systemd-44/ make[1]: Entering directory `/home/buildroot12git/output/build/systemd-44' /usr/bin/make all-recursive make[2]: Entering directory `/home/buildroot12git/output/build/systemd-44' Making all in po make[3]: Entering directory `/home/buildroot12git/output/build/systemd-44/po' make[3]: Nothing to be done for `all'. make[3]: Leaving directory `/home/buildroot12git/output/build/systemd-44/po' make[3]: Entering directory `/home/buildroot12git/output/build/systemd-44' CC src/libsystemd_login_la-cgroup-util.lo CC src/libsystemd_core_la-unit.lo CC src/libsystemd_core_la-job.lo CC src/libsystemd_core_la-manager.lo CC src/libsystemd_core_la-path-lookup.lo In file included from src/util.h:38:0, from src/def.h:25, from src/cgroup-util.h:30, from src/cgroup-util.c:32: src/macro.h:39:19: error: static declaration of 'execvpe' follows non-static declaration /home/buildroot12git/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/unistd.h:553:12: note: previous declaration of 'execvpe' was here make[3]: *** [src/libsystemd_login_la-cgroup-util.lo] Error 1 make[3]: *** Waiting for unfinished jobs.... Regards, Johan -----Oorspronkelijk bericht----- Van: buildroot-bounces@busybox.net [mailto:buildroot-bounces@busybox.net] Namens Thomas Petazzoni Verzonden: woensdag 18 september 2013 18:41 Aan: Arnout Vandecappelle CC: buildroot@busybox.net Onderwerp: Re: [Buildroot] [PATCH 1/1] package: udev is now provided by systemd or eudev. Dear Arnout Vandecappelle, On Wed, 18 Sep 2013 18:06:13 +0200, Arnout Vandecappelle wrote: > > I already suggested that the selection of eudev vs. systemd should > > not be in Target Packages, and Eric already made a proposal to solve > > this. In fact, we don't need any new configuration option: > > when the systemd init system is selected, then systemd is used. > > When another init systemd is used, but the selected /dev management > > method is udev, then we use eudev. > > > > There's no need for more options. The only thing that Eric proposed > > is to re-order the Init System selection vs. the /dev management > > selection to make things a bit more logical. > > For systemd, journal compression and journal gateway still have to > be selectable. IMHO it is not nice for the user to have to navigate to > a completely unrelated place in order to enable those. So my > suggestion is to include the Config.in that has these extra options > immediately below the systemd selection in the system menu. Hum, right. Probably makes sense, yes. Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
Dear Sagaert Johan, On Wed, 18 Sep 2013 19:34:20 +0200, Sagaert Johan wrote: > Just out of curiosity I tried to build using systemd : > > I think it will need a patch : > src/macro.h:39:19: error: static declaration of 'execvpe' follows non-static declaration Which toolchain are you using? Our internal uClibc toolchain has a patch to add execvpe(). That said, I am not sure packages should make the assumption that execvpe() is available, because it means that we won't support any external uClibc toolchain. Also, Johan, systemd 44 is precisely going to be updated significantly by the patch set you are replying. Best regards, Thomas
Hi Thomas , Okay, my reply just crossed your answer... Yes I was using the internal toolchain with uClibc 0.9.33.2 I will give it another try when systemd rework is finished. Regards Johan -----Oorspronkelijk bericht----- Van: buildroot-bounces@busybox.net [mailto:buildroot-bounces@busybox.net] Namens Thomas Petazzoni Verzonden: woensdag 18 september 2013 19:39 Aan: Sagaert Johan CC: buildroot@busybox.net Onderwerp: Re: [Buildroot] [PATCH 1/1] package: udev is now provided by systemd or eudev. Dear Sagaert Johan, On Wed, 18 Sep 2013 19:34:20 +0200, Sagaert Johan wrote: > Just out of curiosity I tried to build using systemd : > > I think it will need a patch : > src/macro.h:39:19: error: static declaration of 'execvpe' follows > non-static declaration Which toolchain are you using? Our internal uClibc toolchain has a patch to add execvpe(). That said, I am not sure packages should make the assumption that execvpe() is available, because it means that we won't support any external uClibc toolchain. Also, Johan, systemd 44 is precisely going to be updated significantly by the patch set you are replying. Best regards, Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
On 18/09/13 18:40, Thomas Petazzoni wrote: > Dear Arnout Vandecappelle, > > On Wed, 18 Sep 2013 18:04:34 +0200, Arnout Vandecappelle wrote: > >>> Right, that's one way of seeing things, indeed. It sounds a bit >>> convoluted to me, though. When a package A needs a specific feature >>> from package B (such as gudev), I believe it makes sense for >>> package B to provide a sub-option that package A can select, rather >>> than package A having intimate knowledge of the dependencies needed >>> by package B to enable whatever feature package A needs to have >>> from package B. >> >> Makes sense, but we probably already have tons of these already. If >> gudev would have been added in the normal way instead of introducing >> the all_extras option, then the implementors of network-manager and >> udisks wouldn't even have noticed that udev had to be compiled in a >> specific way: since these tools already select libglib2, udev would >> have been compiled with gudev support. > > True. > >> Really, the all-extras is historical accident because a long time >> ago udev's configure had an EXTRAS=... option in its build commands. > > Right. But the extras have more dependencies that just glib2: it also > depends on hwdata and on acl. Will glib2 be sufficient to get gudev > built, for use by udisks? Maybe. For eudev this doesn't seem to be the case anymore. Or else the patch was wrong :-) Regards, Arnout
diff --git a/package/Config.in b/package/Config.in index a94cb62..1f834b8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -249,6 +249,7 @@ source "package/dmraid/Config.in" source "package/dvb-apps/Config.in" source "package/dvbsnoop/Config.in" source "package/eeprog/Config.in" +source "package/eudev/Config.in" source "package/evtest/Config.in" source "package/fan-ctrl/Config.in" source "package/flashrom/Config.in" diff --git a/package/eudev/Config.in b/package/eudev/Config.in new file mode 100644 index 0000000..40108ed --- /dev/null +++ b/package/eudev/Config.in @@ -0,0 +1,36 @@ +config BR2_PACKAGE_EUDEV + bool "eudev" + depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV + depends on BR2_LARGEFILE # util-linux + depends on BR2_USE_WCHAR # util-linux + depends on !BR2_PACKAGE_SYSTEMD + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + select BR2_PACKAGE_KMOD + help + Userspace device daemon (Gentoo version) + + eudev requires a Linux kernel >= 2.6.34: it relies on devtmpfs. + + http://github.com/gentoo/eudev/ + +if BR2_PACKAGE_EUDEV + +config BR2_PACKAGE_EUDEV_ALL_EXTRAS + bool "enable all extras" + select BR2_PACKAGE_LIBGLIB2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + help + Enable all extras with external dependencies like libglib2 + +comment "enabling all extras requires a toolchain with WCHAR and threading support" + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS + +endif + +comment "eudev requires /dev mgmnt set to udev under System configuration" + depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV + +comment "eudev not available with Systemd as init system" + depends on BR2_PACKAGE_SYSTEMD diff --git a/package/udev/S10udev b/package/eudev/S10udev old mode 100755 new mode 100644 similarity index 98% rename from package/udev/S10udev rename to package/eudev/S10udev index 2c7b7e9..e4d28a2 --- a/package/udev/S10udev +++ b/package/eudev/S10udev @@ -17,7 +17,7 @@ # # Check for missing binaries -UDEV_BIN=/lib/udev/udevd +UDEV_BIN=/sbin/udevd test -x $UDEV_BIN || exit 5 # Check for config file and read it diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk new file mode 100644 index 0000000..f1952d4 --- /dev/null +++ b/package/eudev/eudev.mk @@ -0,0 +1,41 @@ +################################################################################ +# +# eudev +# +################################################################################ + +EUDEV_VERSION = v1.2 +EUDEV_SITE = https://github.com/gentoo/eudev.git +EUDEV_SITE_METHOD = git +EUDEV_LICENSE = GPLv2 +EUDEV_LICENSE_FILES = COPYING +EUDEV_INSTALL_STAGING = YES +EUDEV_AUTORECONF = YES + +# mq_getattr is in librt +EUDEV_CONF_ENV += LIBS=-lrt + +EUDEV_CONF_OPT = \ + --sbindir=/sbin \ + --with-rootlibdir=/lib \ + --libexecdir=/lib \ + --with-firmware-path=/lib/firmware \ + --disable-introspection \ + --enable-split-usr + +EUDEV_DEPENDENCIES = host-pkgconf util-linux kmod + +ifeq ($(BR2_PACKAGE_EUDEV_ALL_EXTRAS),y) +EUDEV_DEPENDENCIES += libglib2 +EUDEV_CONF_OPT += --enable-gudev +else +EUDEV_CONF_OPT += --disable-gudev +endif + +define EUDEV_INSTALL_INITSCRIPT + $(INSTALL) -m 0755 package/eudev/S10udev $(TARGET_DIR)/etc/init.d/S10udev +endef + +EUDEV_POST_INSTALL_TARGET_HOOKS += EUDEV_INSTALL_INITSCRIPT + +$(eval $(autotools-package)) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 86ab2cf..f346aa3 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -1,11 +1,17 @@ config BR2_PACKAGE_SYSTEMD bool "systemd" + depends on BR2_INIT_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 depends on BR2_USE_MMU # dbus select BR2_PACKAGE_DBUS select BR2_PACKAGE_LIBCAP + select BR2_PACKAGE_LIBGCRYPT + select BR2_PACKAGE_UTIL_LINUX + select BR2_PACKAGE_UTIL_LINUX_LIBBLKID + select BR2_PACKAGE_KMOD help systemd is a system and service manager for Linux, compatible with SysV and LSB init scripts. systemd provides aggressive parallelization @@ -18,6 +24,42 @@ config BR2_PACKAGE_SYSTEMD http://freedesktop.org/wiki/Software/systemd -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 +if BR2_PACKAGE_SYSTEMD + +config BR2_PACKAGE_SYSTEMD_ACL + bool "Enable ACL" + default n + select BR2_PACKAGE_ACL + help + Enable ACL support + +config BR2_PACKAGE_SYSTEMD_GUDEV + bool "Build Gudev" + default n + select BR2_PACKAGE_LIBGLIB2 + help + Build GLib bindings for udev + +config BR2_PACKAGE_SYSTEMD_COMPRESS_JOURNAL + bool "Compress journal" + default n + select BR2_PACKAGE_XZ + help + Compress the journal + +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 ipv6 support and thread support in toolchain)" + depends on (!BR2_LARGEFILE || !BR2_INET_IPV6 || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INIT_SYSTEMD) 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@.service.m4 | 2 +- + units/serial-getty@.service.m4 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 +index 7853652..34cdf11 100644 +--- a/units/getty@.service.m4 ++++ b/units/getty@.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@.service.m4 b/units/serial-getty@.service.m4 +index 5e16963..9657800 100644 +--- a/units/serial-getty@.service.m4 ++++ b/units/serial-getty@.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@.service.m4 | 2 +- - units/serial-getty@.service.m4 | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: systemd-37/units/getty@.service.m4 -=================================================================== ---- systemd-37.orig/units/getty@.service.m4 -+++ systemd-37/units/getty@.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@.service.m4 -=================================================================== ---- systemd-37.orig/units/serial-getty@.service.m4 -+++ systemd-37/units/serial-getty@.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..d5b5785 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,15 +4,20 @@ # ################################################################################ -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 SYSTEMD_DEPENDENCIES = \ host-intltool \ + host-pkgconf \ libcap \ - udev \ - dbus + dbus \ + libgcrypt \ + util-linux \ + kmod + +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,31 +26,52 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y) endif SYSTEMD_CONF_OPT += \ - --with-distro=other \ + --with-rootprefix= \ + --with-rootlibdir=/lib \ + --localstatedir=/var \ + --enable-static=no \ + --disable-manpages \ --disable-selinux \ --disable-pam \ --disable-libcryptsetup \ - --disable-gtk \ - --disable-plymouth \ - --with-rootdir=/ \ + --enable-gcrypt \ + --with-libgcrypt-prefix=$(STAGING_DIR)/usr \ --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 \ + --disable-tcpwrap \ + --without-python -ifeq ($(BR2_PACKAGE_ACL),y) +ifeq ($(BR2_PACKAGE_SYSTEMD_ACL),y) SYSTEMD_CONF_OPT += --enable-acl SYSTEMD_DEPENDENCIES += acl else SYSTEMD_CONF_OPT += --disable-acl endif -ifneq ($(BR2_LARGEFILE),y) - SYSTEMD_CONF_OPT += --disable-largefile +ifeq ($(BR2_PACKAGE_SYSTEMD_GUDEV),y) + SYSTEMD_CONF_OPT += --enable-gudev + SYSTEMD_DEPENDENCIES += libglib2 +else + SYSTEMD_CONF_OPT += --disable-gudev +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD_COMPRESS_JOURNAL),y) + SYSTEMD_DEPENDENCIES += xz + SYSTEMD_CONF_OPT += --enable-xz +else + SYSTEMD_CONF_OPT += --disable-xz +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y) + SYSTEMD_DEPENDENCIES += libmicrohttpd +else + SYSTEMD_CONF_OPT += --disable-microhttpd endif # mq_getattr needs -lrt @@ -53,21 +79,31 @@ SYSTEMD_MAKE_OPT += LIBS=-lrt SYSTEMD_MAKE_OPT += LDFLAGS+=-ldl define SYSTEMD_INSTALL_INIT_HOOK - ln -fs ../usr/lib/systemd/systemd $(TARGET_DIR)/sbin/init - ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/halt - ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/poweroff - ln -fs ../usr/bin/systemctl $(TARGET_DIR)/sbin/reboot + ln -fs ../lib/systemd/systemd $(TARGET_DIR)/sbin/init + ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/halt + ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/poweroff + ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/reboot - ln -fs ../../../usr/lib/systemd/system/multi-user.target $(TARGET_DIR)/etc/systemd/system/default.target + ln -fs ../../../lib/systemd/system/multi-user.target $(TARGET_DIR)/etc/systemd/system/default.target endef define SYSTEMD_INSTALL_TTY_HOOK rm -f $(TARGET_DIR)/etc/systemd/system/getty.target.wants/getty@tty1.service - 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 + ln -fs ../../../../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 + +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 +endef $(eval $(autotools-package)) diff --git a/package/udev/Config.in b/package/udev/Config.in index d4d97c1..7aa4483 100644 --- a/package/udev/Config.in +++ b/package/udev/Config.in @@ -1,39 +1,33 @@ config BR2_PACKAGE_UDEV bool "udev" depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV - depends on BR2_LARGEFILE # util-linux - depends on BR2_USE_WCHAR # util-linux - depends on !BR2_PREFER_STATIC_LIB # kmod - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - select BR2_PACKAGE_KMOD help Userspace device daemon. udev requires a Linux kernel >= 2.6.34: it relies on devtmpfs. - ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ - if BR2_PACKAGE_UDEV -config BR2_PACKAGE_UDEV_RULES_GEN - bool "enable rules generator" - help - Enable persistant rules generator - -config BR2_PACKAGE_UDEV_ALL_EXTRAS - bool "enable all extras" - select BR2_PACKAGE_ACL - select BR2_PACKAGE_HWDATA - select BR2_PACKAGE_LIBGLIB2 - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - help - Enable all extras with external dependencies like - libacl, hwdata and libglib2 +choice + prompt "udev provider" + default BR2_PACKAGE_UDEV_PROVIDER_EUDEV + +config BR2_PACKAGE_UDEV_PROVIDER_EUDEV + bool "Use udev from eudev" + select BR2_PACKAGE_EUDEV + depends on !BR2_PACKAGE_SYSTEMD + +comment "eudev not available with Systemd init system" + depends on BR2_PACKAGE_SYSTEMD + +config BR2_PACKAGE_UDEV_PROVIDER_SYSTEMD + bool "Use udev from Systemd" + depends on BR2_PACKAGE_SYSTEMD + +comment "Original udev only available with Systemd init system" + depends on !BR2_PACKAGE_SYSTEMD -comment "enabling all extras requires a toolchain with WCHAR and threading support" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS +endchoice endif diff --git a/package/udev/udev.mk b/package/udev/udev.mk index 69f011f..39dc014 100644 --- a/package/udev/udev.mk +++ b/package/udev/udev.mk @@ -4,48 +4,32 @@ # ################################################################################ -UDEV_VERSION = 182 -UDEV_SOURCE = udev-$(UDEV_VERSION).tar.bz2 -UDEV_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/hotplug/ -UDEV_LICENSE = GPLv2+ -UDEV_LICENSE_FILES = COPYING -UDEV_INSTALL_STAGING = YES - -# mq_getattr is in librt -UDEV_CONF_ENV += LIBS=-lrt - -UDEV_CONF_OPT = \ - --sbindir=/sbin \ - --with-rootlibdir=/lib \ - --libexecdir=/lib \ - --with-usb-ids-path=/usr/share/hwdata/usb.ids \ - --with-pci-ids-path=/usr/share/hwdata/pci.ids \ - --with-firmware-path=/lib/firmware \ - --disable-introspection - -UDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux kmod - -ifeq ($(BR2_PACKAGE_UDEV_RULES_GEN),y) -UDEV_CONF_OPT += --enable-rule_generator -endif +UDEV_VERSION = 206 +UDEV_SITE = http://www.freedesktop.org/software/systemd/ +UDEV_SOURCE = systemd-$(UDEV_VERSION).tar.xz -ifeq ($(BR2_PACKAGE_UDEV_ALL_EXTRAS),y) -UDEV_DEPENDENCIES += acl hwdata libglib2 -UDEV_CONF_OPT += \ - --enable-udev_acl -else -UDEV_CONF_OPT += \ - --disable-gudev +ifeq ($(BR2_PACKAGE_UDEV_PROVIDER_EUDEV),y) +UDEV_DEPENDENCIES = eudev endif -ifeq ($(BR2_PACKAGE_SYSTEMD),y) - UDEV_CONF_OPT += --with-systemdsystemunitdir=/lib/systemd/system/ +ifeq ($(BR2_PACKAGE_UDEV_PROVIDER_SYSTEMD),y) +UDEV_DEPENDENCIES = systemd endif -define UDEV_INSTALL_INITSCRIPT - $(INSTALL) -m 0755 package/udev/S10udev $(TARGET_DIR)/etc/init.d/S10udev +define UDEV_EXTRACT_CMDS + @echo "Dummy package: nothing to extract" +endef + +define UDEV_CONFIGURE_CMDS + @echo "Dummy package: nothing to configure" endef -UDEV_POST_INSTALL_TARGET_HOOKS += UDEV_INSTALL_INITSCRIPT +define UDEV_BUILD_CMDS + @echo "Dummy package: nothing to build" +endef + +define UDEV_CLEAN_CMDS + @echo "Dummy package: nothing to clean" +endef -$(eval $(autotools-package)) +$(eval $(generic-package)) diff --git a/system/Config.in b/system/Config.in index 401285b..17ec532 100644 --- a/system/Config.in +++ b/system/Config.in @@ -72,14 +72,26 @@ choice config BR2_ROOTFS_DEVICE_CREATION_STATIC bool "Static using device table" + depends on !BR2_INIT_SYSTEMD + +comment "Static using device table not available with Systemd as init system" + depends on BR2_INIT_SYSTEMD config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS bool "Dynamic using devtmpfs only" + depends on !BR2_INIT_SYSTEMD + +comment "Dynamic using devtmpfs not available with Systemd as init system" + depends on BR2_INIT_SYSTEMD config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV bool "Dynamic using mdev" + depends on !BR2_INIT_SYSTEMD select BR2_PACKAGE_BUSYBOX +comment "Dynamic using mdev not available with Systemd as init system" + depends on BR2_INIT_SYSTEMD + config BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV bool "Dynamic using udev" depends on BR2_LARGEFILE # udev @@ -112,7 +124,6 @@ config BR2_INIT_SYSTEMD depends on BR2_LARGEFILE depends on BR2_USE_WCHAR depends on BR2_INET_IPV6 - depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU select BR2_PACKAGE_DBUS