Skip to contentSkip to conversation

util-linux: disable systemd

PATCH In review Ross Burton 4 participants 9 messages Feb 24, 2015 – Feb 25, 2015 exec and binfmt

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 util-linux: disable systemd

systemd has a build-dependency on util-linux for libmount, and util-linux has an optional build dependency on systemd.

The features in util-linux that enabling systemd gives you are:
* lslogins can show recent journal entries from the user
* uuidd can use socket activation and has a service file
* fstrim has a service file
* logger can write journal entries

These are not worth the overhead of maintaining two util-linux recipes to bootstrap the cycle, so disable systemd support in util-linux.

---
 meta/recipes-core/util-linux/util-linux.inc |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
meta/recipes-core/util-linux/util-linux.inc +2 -3
index b4f51e9..3d8a4d0 100644
@@ -48,8 +48,7 @@ SHARED_EXTRA_OECONF = "--disable-use-tty-group \
 
 EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}"
 
-PACKAGECONFIG_class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
-                                ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} "
+PACKAGECONFIG_class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
 PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam,"
 
 # Respect the systemd feature for uuidd
@@ -117,7 +116,7 @@ RDEPENDS_${PN}_class-nativesdk = ""
 
 RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev"
 
-SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim"
+#SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim"
 SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.socket uuidd.service"
 SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable"
 SYSTEMD_SERVICE_${PN}-fstrim = "fstrim.timer fstrim.service"
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 2/2 systemd: Upgrade 216 -> 218

From: Khem Raj <[email protected]>

Remove upstreamed patches as well as patches which arent needed anymore since features are dropped from systemd e.g. userspace firmware download Tested on qemux86

Change-Id Ic53aaad198998de146c3a7702ef17de871de9de6
---
 ...1-Make-root-s-home-directory-configurable.patch |  121 +++++++-------
 ...onfigure-the-list-of-system-users-files-a.patch |  176 --------------------
 ...o-not-install-tmpfiles-and-sysusers-files.patch |   56 -------
 ...-Fix-navigating-backwards-missing-entries.patch |   34 ----
 ...ing.h-add-fake-__NR_memfd_create-for-MIPS.patch |   29 ----
 ...ke-resolv.conf-entry-conditional-on-resol.patch |  142 ----------------
 .../systemd/systemd/binfmt-install.patch           |   35 ++--
 .../systemd/systemd-pam-fix-fallocate.patch        |   50 +++---
 .../systemd/systemd/uclibc-sysinfo_h.patch         |   19 ---
 .../systemd/{systemd_216.bb => systemd_218.bb}     |   34 ++--
 10 files changed, 114 insertions(+), 582 deletions(-)
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-journal-Fix-navigating-backwards-missing-entries.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/uclibc-sysinfo_h.patch
 rename meta/recipes-core/systemd/{systemd_216.bb => systemd_218.bb} (93%)
meta/recipes-core/systemd/systemd/0001-Make-root-s-home-directory-configurable.patch +59 -62
index c5ad291..a86c841 100644
@@ -21,11 +21,11 @@ Signed-off-by: Dan McGregor <[email protected]>
  units/rescue.service.m4.in        | 4 ++--
  8 files changed, 20 insertions(+), 11 deletions(-)
 
-diff --git a/Makefile.am b/Makefile.am
-index 4028112..5d18f5c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -191,6 +191,7 @@ AM_CPPFLAGS = \
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am
++++ git/Makefile.am
+@@ -195,6 +195,7 @@ AM_CPPFLAGS = \
  	-DKEXEC=\"$(KEXEC)\" \
  	-DLIBDIR=\"$(libdir)\" \
  	-DROOTLIBDIR=\"$(rootlibdir)\" \
@@ -33,7 +33,7 @@ index 4028112..5d18f5c 100644
  	-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
  	-I $(top_srcdir)/src \
  	-I $(top_builddir)/src/shared \
-@@ -5584,6 +5585,7 @@ EXTRA_DIST += \
+@@ -5830,6 +5831,7 @@ EXTRA_DIST += \
  substitutions = \
         '|rootlibexecdir=$(rootlibexecdir)|' \
         '|rootbindir=$(rootbindir)|' \
@@ -41,14 +41,14 @@ index 4028112..5d18f5c 100644
         '|bindir=$(bindir)|' \
         '|SYSTEMCTL=$(rootbindir)/systemctl|' \
         '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \
-diff --git a/configure.ac b/configure.ac
-index 18b7198..365bc73 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1272,6 +1272,11 @@ AC_ARG_WITH([rootlibdir],
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac
++++ git/configure.ac
+@@ -1310,6 +1310,11 @@ AC_ARG_WITH([rootlibdir],
          [],
          [with_rootlibdir=${libdir}])
-
+ 
 +AC_ARG_WITH([roothomedir],
 +        AS_HELP_STRING([--with-roothomedir=DIR], [Home directory for the root user]),
 +        [],
@@ -57,15 +57,15 @@ index 18b7198..365bc73 100644
  AC_ARG_WITH([pamlibdir],
          AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]),
          [],
-@@ -1317,6 +1322,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir])
+@@ -1362,6 +1367,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir])
  AC_SUBST([pamconfdir], [$with_pamconfdir])
  AC_SUBST([rootprefix], [$with_rootprefix])
  AC_SUBST([rootlibdir], [$with_rootlibdir])
 +AC_SUBST([roothomedir], [$with_roothomedir])
-
+ 
  AC_CONFIG_FILES([
          Makefile po/Makefile.in
-@@ -1400,6 +1406,7 @@ AC_MSG_RESULT([
+@@ -1446,6 +1452,7 @@ AC_MSG_RESULT([
          include_prefix:          ${INCLUDE_PREFIX}
          lib dir:                 ${libdir}
          rootlib dir:             ${with_rootlibdir}
@@ -73,55 +73,55 @@ index 18b7198..365bc73 100644
          SysV init scripts:       ${SYSTEM_SYSVINIT_PATH}
          SysV rc?.d directories:  ${SYSTEM_SYSVRCND_PATH}
          Build Python:            ${PYTHON}
-diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c
-index 62599d0..852d34c 100644
---- a/src/core/unit-printf.c
-+++ b/src/core/unit-printf.c
-@@ -259,7 +259,7 @@ static int specifier_user_home(char specifier, void *data, void *userdata, char
+Index: git/src/core/unit-printf.c
+===================================================================
+--- git.orig/src/core/unit-printf.c
++++ git/src/core/unit-printf.c
+@@ -259,7 +259,7 @@ static int specifier_user_home(char spec
                   * best of it if we can, but fail if we can't */
-
+ 
                  if (!c->user || streq(c->user, "root") || streq(c->user, "0"))
 -                        n = strdup("/root");
 +                        n = strdup(ROOTHOMEDIR);
                  else
                          return -ENOTSUP;
-
-diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index d01da45..3e876d5 100644
---- a/src/nspawn/nspawn.c
-+++ b/src/nspawn/nspawn.c
-@@ -3312,7 +3312,7 @@ int main(int argc, char *argv[]) {
+ 
+Index: git/src/nspawn/nspawn.c
+===================================================================
+--- git.orig/src/nspawn/nspawn.c
++++ git/src/nspawn/nspawn.c
+@@ -3183,7 +3183,7 @@ int main(int argc, char *argv[]) {
                          if (r < 0)
                                  _exit(EXIT_FAILURE);
-
+ 
 -                        if ((asprintf((char**)(envp + n_env++), "HOME=%s", home ? home: "/root") < 0) ||
 +                        if ((asprintf((char**)(envp + n_env++), "HOME=%s", home ? home: ROOTHOMEDIR) < 0) ||
                              (asprintf((char**)(envp + n_env++), "USER=%s", arg_user ? arg_user : "root") < 0) ||
                              (asprintf((char**)(envp + n_env++), "LOGNAME=%s", arg_user ? arg_user : "root") < 0)) {
                                  log_oom();
-@@ -3402,7 +3402,7 @@ int main(int argc, char *argv[]) {
-                         } else if (argc > optind)
-                                 execvpe(argv[optind], argv + optind, env_use);
+@@ -3278,7 +3278,7 @@ int main(int argc, char *argv[]) {
+                                 execvp(argv[optind], argv + optind);
+ #endif /* HAVE_EXECVPE */                      
                          else {
 -                                chdir(home ? home : "/root");
 +                                chdir(home ? home : ROOTHOMEDIR);
                                  execle("/bin/bash", "-bash", NULL, env_use);
                                  execle("/bin/sh", "-sh", NULL, env_use);
                          }
-diff --git a/src/shared/util.c b/src/shared/util.c
-index 85a570a..aef6033 100644
---- a/src/shared/util.c
-+++ b/src/shared/util.c
-@@ -4377,7 +4377,7 @@ int get_user_creds(
+Index: git/src/shared/util.c
+===================================================================
+--- git.orig/src/shared/util.c
++++ git/src/shared/util.c
+@@ -4523,7 +4523,7 @@ int get_user_creds(
                          *gid = 0;
-
+ 
                  if (home)
 -                        *home = "/root";
 +                        *home = ROOTHOMEDIR;
-
+ 
                  if (shell)
                          *shell = "/bin/sh";
-@@ -5363,7 +5363,7 @@ int get_home_dir(char **_h) {
+@@ -5491,7 +5491,7 @@ int get_home_dir(char **_h) {
          /* Hardcode home directory for root to avoid NSS */
          u = getuid();
          if (u == 0) {
@@ -129,14 +129,14 @@ index 85a570a..aef6033 100644
 +                h = strdup(ROOTHOMEDIR);
                  if (!h)
                          return -ENOMEM;
-
-diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in
-index 3f4904a..e2af652 100644
---- a/units/console-shell.service.m4.in
-+++ b/units/console-shell.service.m4.in
+ 
+Index: git/units/console-shell.service.m4.in
+===================================================================
+--- git.orig/units/console-shell.service.m4.in
++++ git/units/console-shell.service.m4.in
 @@ -15,8 +15,8 @@ After=rc-local.service
  Before=getty.target
-
+ 
  [Service]
 -Environment=HOME=/root
 -WorkingDirectory=/root
@@ -145,36 +145,33 @@ index 3f4904a..e2af652 100644
  ExecStart=-/sbin/sulogin
  ExecStopPost=-@SYSTEMCTL@ poweroff
  Type=idle
-diff --git a/units/emergency.service.in b/units/emergency.service.in
-index 91fc1bb..659547e 100644
---- a/units/emergency.service.in
-+++ b/units/emergency.service.in
-@@ -13,8 +13,8 @@ Conflicts=shutdown.target
+Index: git/units/emergency.service.in
+===================================================================
+--- git.orig/units/emergency.service.in
++++ git/units/emergency.service.in
+@@ -14,8 +14,8 @@ Conflicts=rescue.service
  Before=shutdown.target
-
+ 
  [Service]
 -Environment=HOME=/root
 -WorkingDirectory=/root
 +Environment=HOME=@roothomedir@
 +WorkingDirectory=@roothomedir@
  ExecStartPre=-/bin/plymouth quit
- ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" to try again\\nto boot into default mode.'
+ ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\ntry again to boot into default mode.'
  ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default"
-diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
-index ef54369..7aad86f 100644
---- a/units/rescue.service.m4.in
-+++ b/units/rescue.service.m4.in
-@@ -14,8 +14,8 @@ After=sysinit.target plymouth-start.service
+Index: git/units/rescue.service.in
+===================================================================
+--- git.orig/units/rescue.service.in
++++ git/units/rescue.service.in
+@@ -14,8 +14,8 @@ After=sysinit.target plymouth-start.serv
  Before=shutdown.target
-
+ 
  [Service]
 -Environment=HOME=/root
 -WorkingDirectory=/root
 +Environment=HOME=@roothomedir@
 +WorkingDirectory=@roothomedir@
  ExecStartPre=-/bin/plymouth quit
- ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.'
+ ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\nboot into default mode.'
  ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default"
--- 
-1.9.3
-
meta/recipes-core/systemd/systemd/0001-build-sys-configure-the-list-of-system-users-files-a.patch deleted +0 -176

176 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch deleted +0 -56

56 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0001-journal-Fix-navigating-backwards-missing-entries.patch deleted +0 -34
deleted file mode 100644
index 621a0da..0000000
@@ -1,34 +0,0 @@
-From 2173cbf847fc53ca24950e77958c902edecfc207 Mon Sep 17 00:00:00 2001
-From: Olivier Brunel <[email protected]>
-Date: Fri, 5 Dec 2014 16:06:45 +0100
-Subject: [PATCH] journal: Fix navigating backwards missing entries
-
-With DIRECTION_UP (i.e. navigating backwards) in generic_array_bisect() when the
-needle was found as the last item in the array, it wasn't actually processed as
-match, resulting in entries being missed.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=86855
-
-Upstream-Status: Backport
-
-Signed-off-by: Jonathan Liu <[email protected]>
----
- src/journal/journal-file.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
-index 7858435..c5d2d19 100644
---- a/src/journal/journal-file.c
-+++ b/src/journal/journal-file.c
-@@ -1657,7 +1657,7 @@ static int generic_array_bisect(
-                         }
-                 }
- 
--                if (k > n) {
-+                if (k >= n) {
-                         if (direction == DIRECTION_UP) {
-                                 i = n;
-                                 subtract_one = true;
--- 
-2.1.3
-
meta/recipes-core/systemd/systemd/0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch deleted +0 -29
deleted file mode 100644
index 448ef1a..0000000
@@ -1,29 +0,0 @@
-Upstream-Status: Backport
-
-Subject: missing.h: add fake __NR_memfd_create for MIPS
-
-We don't have the correct __NR_memfd_create syscall number yet, so set it to
-0xffffffff for now to prevent compile time errors.
-
-Signed-off-by: Chen Qi <[email protected]>
----
- src/shared/missing.h | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/shared/missing.h b/src/shared/missing.h
-index 3ff1a21..3051cb5 100644
---- a/src/shared/missing.h
-+++ b/src/shared/missing.h
-@@ -167,6 +167,9 @@ static inline int pivot_root(const char *new_root, const char *put_old) {
- #      define __NR_fanotify_mark 5296
- #    endif
- #  endif
-+#  ifndef __NR_memfd_create
-+#    define __NR_memfd_create 0xffffffff /* FIXME */
-+#  endif
- #else
- #  ifndef __NR_fanotify_init
- #    define __NR_fanotify_init 338
--- 
-1.9.1
-
meta/recipes-core/systemd/systemd/0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch deleted +0 -142

142 lines not on this page · raw message

meta/recipes-core/systemd/systemd/binfmt-install.patch +18 -17
index c2d5099..93b8e3c 100644
@@ -9,11 +9,11 @@ however can do that in a postinst.
 Upstream-Status: Denied
 Signed-off-by: Ross Burton <[email protected]>
 
-diff --git a/Makefile.am b/Makefile.am
-index 7933de6..78acb6f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3133,10 +3133,6 @@ INSTALL_DIRS += \
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am
++++ git/Makefile.am
+@@ -4495,10 +4495,6 @@
  	$(prefix)/lib/binfmt.d \
  	$(sysconfdir)/binfmt.d
  
@@ -24,30 +24,31 @@ index 7933de6..78acb6f 100644
  endif
  
  EXTRA_DIST += \
-diff --git a/units/proc-sys-fs-binfmt_misc.automount b/units/proc-sys-fs-binfmt_misc.automount
-index 6be3893..709adef 100644
---- a/units/proc-sys-fs-binfmt_misc.automount
-+++ b/units/proc-sys-fs-binfmt_misc.automount
-@@ -16,3 +16,6 @@ ConditionPathIsReadWrite=/proc/sys/
+Index: git/units/proc-sys-fs-binfmt_misc.automount
+===================================================================
+--- git.orig/units/proc-sys-fs-binfmt_misc.automount
++++ git/units/proc-sys-fs-binfmt_misc.automount
+@@ -16,3 +16,6 @@
  
  [Automount]
  Where=/proc/sys/fs/binfmt_misc
 +
 +[Install]
 +WantedBy=sysinit.target
-diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in
-index 02dfe77..86d3481 100644
---- a/units/systemd-binfmt.service.in
-+++ b/units/systemd-binfmt.service.in
-@@ -11,6 +11,7 @@ Documentation=man:systemd-binfmt.service(8) man:binfmt.d(5)
+Index: git/units/systemd-binfmt.service.in
+===================================================================
+--- git.orig/units/systemd-binfmt.service.in
++++ git/units/systemd-binfmt.service.in
+@@ -11,6 +11,8 @@
  Documentation=https://www.kernel.org/doc/Documentation/binfmt_misc.txt
  DefaultDependencies=no
  Conflicts=shutdown.target
 +Wants=proc-sys-fs-binfmt_misc.automount
- After=systemd-readahead-collect.service systemd-readahead-replay.service proc-sys-fs-binfmt_misc.automount
++
+ After=proc-sys-fs-binfmt_misc.automount
  Before=sysinit.target shutdown.target
  ConditionPathIsReadWrite=/proc/sys/
-@@ -24,3 +25,6 @@ ConditionDirectoryNotEmpty=|/run/binfmt.d
+@@ -24,3 +26,6 @@
  Type=oneshot
  RemainAfterExit=yes
  ExecStart=@rootlibexecdir@/systemd-binfmt
meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch +23 -27

86 lines not on this page · raw message

meta/recipes-core/systemd/systemd/uclibc-sysinfo_h.patch deleted +0 -19
deleted file mode 100644
index 15645de..0000000
@@ -1,19 +0,0 @@
-Dont include sys/sysinfo.h on uclibc it conflicts with linux/sysinfo.h
-
-Signed-off-by: Khem Raj <[email protected]>
-Upstream-Status: Inappropriate [uclibc specific]
-
-Index: systemd-209/src/readahead/readahead-common.c
-===================================================================
---- systemd-209.orig/src/readahead/readahead-common.c	2014-02-12 18:42:33.810685053 -0800
-+++ systemd-209/src/readahead/readahead-common.c	2014-02-19 23:49:31.856661142 -0800
-@@ -22,7 +22,9 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef __UCLIBC__
- #include <sys/sysinfo.h>
-+#endif
- #include <sys/inotify.h>
- #include <fcntl.h>
- #include <sys/mman.h>
meta/recipes-core/systemd/systemd_218.bb renamed from meta/recipes-core/systemd/systemd_216.bb +14 -20
similarity index 93%
rename from meta/recipes-core/systemd/systemd_216.bb
rename to meta/recipes-core/systemd/systemd_218.bb
index 569e88c..221c2cc 100644
@@ -1,6 +1,15 @@
-SUMMARY = "System and service manager for Linux, replacing SysVinit"
+SUMMARY = "A System and service manager"
 HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd"
 
+DESCRIPTION = "systemd is a system and service manager for Linux, compatible with \
+SysV and LSB init scripts. systemd provides aggressive parallelization \
+capabilities, uses socket and D-Bus activation for starting services, \
+offers on-demand starting of daemons, keeps track of processes using \
+Linux cgroups, supports snapshotting and restoring of the system \
+state, maintains mount and automount points and implements an \
+elaborate transactional dependency-based service control logic. It can \
+work as a drop-in replacement for sysvinit."
+
 LICENSE = "GPLv2 & LGPLv2.1 & MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
                     file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \
@@ -10,16 +19,16 @@ PROVIDES = "udev"
 
 PE = "1"
 
-DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native"
+DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux"
 DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 SECTION = "base/shell"
 
 inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext
 
-SRCREV = "5d0ae62c665262c4c55536457e84e278c252cc0b"
+SRCREV = "820aced6f6067a6b7c57b7d36e44f64378870cbf"
 
-PV = "216+git${SRCPV}"
+PV = "218+git${SRCPV}"
 
 SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=git \
            file://binfmt-install.patch \
@@ -28,16 +37,10 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=
            file://systemd-pam-fix-fallocate.patch \
            file://systemd-pam-fix-mkostemp.patch \
            file://optional_secure_getenv.patch \
-           file://uclibc-sysinfo_h.patch \
            file://uclibc-get-physmem.patch \
            file://0001-add-support-for-executing-scripts-under-etc-rcS.d.patch \
-           file://0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch \
            file://0001-Make-root-s-home-directory-configurable.patch \
            file://0001-systemd-user-avoid-using-system-auth.patch \
-           file://0001-journal-Fix-navigating-backwards-missing-entries.patch \
-           file://0001-tmpfiles-make-resolv.conf-entry-conditional-on-resol.patch \
-           file://0001-build-sys-do-not-install-tmpfiles-and-sysusers-files.patch \
-           file://0001-build-sys-configure-the-list-of-system-users-files-a.patch \
            file://touchscreen.rules \
            file://00-create-volatile.conf \
            file://init \
@@ -90,8 +93,6 @@ EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
                  --enable-split-usr \
                  --without-python \
                  --with-sysvrcnd-path=${sysconfdir} \
-                 --with-firmware-path=/lib/firmware \
-                 ac_cv_path_KILL=${base_bindir}/kill \
                "
 # uclibc does not have NSS
 EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname "
@@ -309,14 +310,7 @@ FILES_udev += "${base_sbindir}/udevd \
                ${rootlibexecdir}/udev/scsi_id \
                ${rootlibexecdir}/udev/v4l_id \
                ${rootlibexecdir}/udev/keymaps \
-               ${rootlibexecdir}/udev/rules.d/4*.rules \
-               ${rootlibexecdir}/udev/rules.d/5*.rules \
-               ${rootlibexecdir}/udev/rules.d/6*.rules \
-               ${rootlibexecdir}/udev/rules.d/70-power-switch.rules \
-               ${rootlibexecdir}/udev/rules.d/75*.rules \
-               ${rootlibexecdir}/udev/rules.d/78*.rules \
-               ${rootlibexecdir}/udev/rules.d/8*.rules \
-               ${rootlibexecdir}/udev/rules.d/95*.rules \
+               ${rootlibexecdir}/udev/rules.d/*.rules \
                ${sysconfdir}/udev \
                ${sysconfdir}/init.d/systemd-udevd \
                ${systemd_unitdir}/system/*udev* \
Signature · 1 line
1.7.10.4
#2 lore raw
In reply to Ross Burton
Quoted 6 lines · Ross Burton

systemd has a build-dependency on util-linux for libmount, and util-linux has an optional build dependency on systemd.

Quoted 8 lines

The features in util-linux that enabling systemd gives you are:
* lslogins can show recent journal entries from the user
* uuidd can use socket activation and has a service file
* fstrim has a service file
* logger can write journal entries

These are not worth the overhead of maintaining two util-linux recipes to bootstrap the cycle, so disable systemd support in util-linux.

I feel we are going out of way here since now on systemd based systemd you have to undo this change partly via re-introducing service files in some fashion
how about just building and packaging uuidd and fstrim separately ?

atleast it should be reported to util-linux maintainers.

Quoted 37 lines

---
meta/recipes-core/util-linux/util-linux.inc | 5 ++---

1 file changed, 2 insertions(+), 3 deletions(-)
meta/recipes-core/util-linux/util-linux.inc +0 -0
index b4f51e9..3d8a4d0 100644
@@ -48,8 +48,7 @@ SHARED_EXTRA_OECONF = "--disable-use-tty-group \
 

EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}"

meta/recipes-core/util-linux/util-linux.inc +1 -2
-PACKAGECONFIG_class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
-                                ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} "
+PACKAGECONFIG_class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"

PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam,"

# Respect the systemd feature for uuidd

meta/recipes-core/util-linux/util-linux.inc +0 -0
@@ -117,7 +116,7 @@ RDEPENDS_${PN}_class-nativesdk = ""
 

RPROVIDES_${PN}-dev = "util-linux-libblkid-dev util-linux-libmount-dev util-linux-libuuid-dev"

meta/recipes-core/util-linux/util-linux.inc +1 -1
-SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim"
+#SYSTEMD_PACKAGES = "${PN}-uuidd ${PN}-fstrim"

SYSTEMD_SERVICE_${PN}-uuidd = "uuidd.socket uuidd.service" SYSTEMD_AUTO_ENABLE_${PN}-uuidd = "disable" SYSTEMD_SERVICE_${PN}-fstrim = "fstrim.timer fstrim.service"

Signature · 7 lines
1.7.10.4

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
#3 lore raw
Quoted 5 lines · Khem Raj

I feel we are going out of way here since now on systemd based systemd you have to undo this change
partly via re-introducing service files in some fashion
how about just building and packaging uuidd and fstrim separately ?

Well the question is how popular is uuidd and fstrim? I can totally see that installing the service files if systemd is enabled is the obvious half-way and upstream supporting this would be good but I've no idea if they'd accept this.

We are *very* close to M3 cut-off and landing the new systemd depends on something fixing the circular dependency. I believe this patch is the path with the least impact that can be fixed post-M3 to install service files where appropriate without causing a circular build dependency.

Ross

#4 lore raw
Quoted 10 lines · Ross
Quoted 1 line · Khem Raj

I feel we are going out of way here since now on systemd based

systemd you

Quoted 4 lines

have to undo this change
partly via re-introducing service files in some fashion how about just building and packaging uuidd and fstrim separately ?

Well the question is how popular is uuidd and fstrim? I can totally

I think fstrim is very popular these days.

The busybox version of fstrim is about 800b with all the fancy stuff turned on, IIRC.

Thanks,

Quoted 17 lines

see
that installing the service files if systemd is enabled is the obvious half-way and upstream supporting this would be good but I've no idea if they'd accept this.

We are *very* close to M3 cut-off and landing the new systemd depends on
something fixing the circular dependency. I believe this patch is the path
with the least impact that can be fixed post-M3 to install service files
where appropriate without causing a circular build dependency.

Ross

------------------------------------------------------------------------

#5 lore raw
In reply to Khem Raj
Quoted 11 lines · Khem Raj
Quoted 11 lines · Ross Burton

systemd has a build-dependency on util-linux for libmount, and util-linux has an optional build dependency on systemd.

The features in util-linux that enabling systemd gives you are:
* lslogins can show recent journal entries from the user
* uuidd can use socket activation and has a service file
* fstrim has a service file
* logger can write journal entries

Quoted 8 lines
Quoted 2 lines

These are not worth the overhead of maintaining two util-linux recipes to bootstrap the cycle, so disable systemd support in util-linux.

I feel we are going out of way here since now on systemd based systemd you have to undo this change partly via re-introducing service files in some fashion
how about just building and packaging uuidd and fstrim separately ?

atleast it should be reported to util-linux maintainers.

I'm going to merge this patch and I want to clearly explain why.

With systemd it does seem to pay to be one something approximating the latest version. I can't do that without doing something about util-linux.

In history we have no good example of successfully splitting one piece of source over multiple recipes, apart from perhaps gcc which we'd all agree is horrible in a variety of ways. Any time we have attempted this, we've tended to revert or have calls to revert (e.g. avahi).

We're at M3 cutoff and we need to make some decision. If I choose not to take this, nothing will make 1.8. If I take this, there is the possibility we can fix up systemd util-linux in some way if it proves to be that critical.

So whilst I don't think this is perfect and I agree it needs discussion with the util-linux/systemd folks, I think its perhaps the least worst option available to me and there are ways we can likely improve things if/as needed.

Cheers,

Richard

#6 lore raw
Quoted 5 lines · Richard Purdie

In history we have no good example of successfully splitting one piece of source over multiple recipes, apart from perhaps gcc which we'd all agree is horrible in a variety of ways. Any time we have attempted this, we've tended to revert or have calls to revert (e.g. avahi).

I asked for specific problems/issues observed with split builds. I got no concrete examples, yes it has to be done carefully but then I dont think its something that can not be fixed destabilize the release so much. We are building it twice identically and just changing the packaging. In any case, sometimes we should try to tackle the issues out of milestone pressures too.

#7 lore raw
Quoted 7 lines · Khem Raj
Quoted 5 lines · Richard Purdie

In history we have no good example of successfully splitting one piece of source over multiple recipes, apart from perhaps gcc which we'd all agree is horrible in a variety of ways. Any time we have attempted this, we've tended to revert or have calls to revert (e.g. avahi).

Quoted 6 lines

I asked for specific problems/issues observed with split builds. I got no concrete examples, yes it has to be done carefully but then I dont think its something that can not be fixed destabilize the release so much. We are building it twice identically and just changing the packaging. In any case, sometimes we should try to tackle the issues out of milestone pressures too.

You're not building it twice identically, if you were doing that we wouldn't have this problem. You're trying to split it into two separate chunks and ensuing they are independent, yet they do inter-depend correctly when needed too.

If this is just a packaging problem, we should just ship the extra systemd unit parts as part of a separate recipe and then have the main util-linux recipe RDEPEND on it.

Specific examples:

You need to ensure that the PACKAGES generated by both sides of the split have consistent naming (maybe overriding and doing what debian packaging would have done should the split not been there). The PACKAGES need to be careful about the contents of default PN for example. There have been issues cleanly separating things into two -dev packages and exposing two similar but slightly differently named -dev packages for the same piece of software.

You have to ensure that the appropriate recipes each register as the correct shlibs providers and that things DEPENDing on the recipe now depend on the correct recipe.

We end up with two separate do_install tasks which are fragile and that changes during version upgrades get handled correctly with changes being made to both functions equally and carefully. avahi has tended to break more readily than other recipes duing upgrades.

The PROVIDER namespaces must not overlap and MLPREFIX needs to be correctly injected into the correct places, particularly given the more hardcoded package names.

Now, I agree we can probably hand craft a recipe which works and doesn't have any problem above. Is it maintainable? Will issues come up in the future? Am I going to get 101 questions and complaints about it?

I don't believe it is as easy as you think to take this forward long term, much a I wish it were otherwise...

Cheers,

Richard

#8 lore raw
Quoted 18 lines · Richard Purdie
Quoted 7 lines · Khem Raj
Quoted 5 lines · Richard Purdie

In history we have no good example of successfully splitting one piece of source over multiple recipes, apart from perhaps gcc which we'd all agree is horrible in a variety of ways. Any time we have attempted this, we've tended to revert or have calls to revert (e.g. avahi).

Quoted 6 lines

I asked for specific problems/issues observed with split builds. I got no concrete examples, yes it has to be done carefully but then I dont think its something that can not be fixed destabilize the release so much. We are building it twice identically and just changing the packaging. In any case, sometimes we should try to tackle the issues out of milestone pressures too.

Quoted 4 lines

You're not building it twice identically, if you were doing that we wouldn't have this problem. You're trying to split it into two separate chunks and ensuing they are independent, yet they do inter-depend correctly when needed too.

yes we are look at

http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/misc&id=c53322e9e587ef9a88c050f21aa98604deeeeb1f

just install and packaging are differing.

Quoted 4 lines

If this is just a packaging problem, we should just ship the extra systemd unit parts as part of a separate recipe and then have the main util-linux recipe RDEPEND on it.

util-linux provides service files and its better to keep using those for maintenance reasons if we strip them out into auxiliary packages its same amount of hassle during upgrade as splitting is.

Quoted 11 lines

Specific examples:

You need to ensure that the PACKAGES generated by both sides of the split have consistent naming (maybe overriding and doing what debian packaging would have done should the split not been there). The PACKAGES need to be careful about the contents of default PN for example. There have been issues cleanly separating things into two -dev packages and exposing two similar but slightly differently named -dev packages for the same piece of software.

there are separate sub-targets which avoids this issue.

Quoted 3 lines

You have to ensure that the appropriate recipes each register as the correct shlibs providers and that things DEPENDing on the recipe now depend on the correct recipe.

isn’t that automatic ? it informed me of the changing providers for shared libs, util-linux packaging is quite granular and the move to libs is at output PACKAGES boundary, just the recipe provider is changing.

Quoted 5 lines

We end up with two separate do_install tasks which are fragile and that changes during version upgrades get handled correctly with changes being made to both functions equally and carefully. avahi has tended to break more readily than other recipes duing upgrades.

We could use common include. I did not bother in version 1 but it certainly is possible.

Quoted 9 lines

The PROVIDER namespaces must not overlap and MLPREFIX needs to be correctly injected into the correct places, particularly given the more hardcoded package names.

Now, I agree we can probably hand craft a recipe which works and doesn't have any problem above. Is it maintainable? Will issues come up in the future? Am I going to get 101 questions and complaints about it?

While I agree its a bit of more work but its future safe. and the patch I mentioned above does not address all concerns but it can be made to do so. The steps you describe are all valid but we have a better case with util-linux than other examples you mentioned.

Quoted 9 lines

I don't believe it is as easy as you think to take this forward long term, much a I wish it were otherwise...

Cheers,

Richard