Systemd Upgrade
v2 cover Systemd Upgrade
Changes Since V1:
Install update-rc.d conditionally when both systemd and sysvinit are in distro features and we are not building r/o image
The following changes since commit 56c5fa106eeccda2ca92dbeb73ff01ba40992e7d:
ptest: use fakeroot for do_install_ptest_base (2015-09-09 14:25:09 +0100)
are available in the git repository at:
git://github.com/kraj/openembedded-core kraj/systemd-225
https://github.com/kraj/openembedded-core/tree/kraj/systemd-225
Khem Raj (3):
rootfs: Conditionally uninstall update-rc.d
systemd: Upgrade 219 -> 225
systemd: Implement OE-Specific systemd-sysv-install
meta/lib/oe/rootfs.py | 10 +-
...-mount-add-dependencies-to-dynamically-mo.patch | 36 ----
...ed-missing.h-fall-back-to-insecure-getenv.patch | 25 ---
...t-install-dependency-links-at-install-tim.patch | 35 ++--
...heck-for-additional-features-that-uclibc-.patch | 23 ++-
...wn-Use-execvpe-only-when-libc-supports-it.patch | 37 ++---
...til-Use-mkostemp-only-if-libc-supports-it.patch | 8 +-
...-unimplemented-_SC_PHYS_PAGES-system-conf.patch | 8 +-
...0-Make-root-s-home-directory-configurable.patch | 136 ++++++++-------
...0012-implment-systemd-sysv-install-for-OE.patch | 40 +++++
...files.c-Honor-ordering-within-files-as-th.patch | 185 ---------------------
...-remove-userspace-firmware-loading-suppor.patch | 99 ++++++-----
.../systemd/systemd/tmpfiles-pam.patch | 30 ----
.../systemd/{systemd_219.bb => systemd_225.bb} | 29 ++--
14 files changed, 226 insertions(+), 475 deletions(-)
delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-core-mount-add-dependencies-to-dynamically-mo.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0002-shared-missing.h-fall-back-to-insecure-getenv.patch
create mode 100644 meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch
delete mode 100644 meta/recipes-core/systemd/systemd/tmpfiles-pam.patch
rename meta/recipes-core/systemd/{systemd_219.bb => systemd_225.bb} (95%)Signature · 1 line
2.5.1
PATCH v2 1/3 rootfs: Conditionally uninstall update-rc.d
update-rc.d is now needed by systemd to interact with sysv scripts, so if we have a mixed system, then we can not uninstall update-rc.d as it is going to break systemd functionality, we check for sysvinit and sytemd in distro and also ensure that its not building an image with readonly rootfs
--- meta/lib/oe/rootfs.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
meta/lib/oe/rootfs.py +9 -1
@@ -230,6 +230,14 @@ class Rootfs(object): runtime_pkgmanage = bb.utils.contains("IMAGE_FEATURES", "package-management", True, False, self.d) + sysvcompat_in_distro = bb.utils.contains("DISTRO_FEATURES", [ "systemd", "sysvinit" ], + True, False, self.d) + image_rorfs = bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", + True, False, self.d) + if sysvcompat_in_distro and not image_rorfs: + pkg_to_remove = "" + else: + pkg_to_remove = "update-rc.d" if not runtime_pkgmanage: # Remove components that we don't need if we're not going to install # additional packages at runtime
@@ -242,7 +250,7 @@ class Rootfs(object): pkg = pkg_installed.split()[0] if pkg in ["base-passwd", "shadow", - "update-alternatives", + "update-alternatives", pkg_to_remove, self.d.getVar("ROOTFS_BOOTSTRAP_INSTALL", True) ]: pkgs_to_remove.append(pkg)
Signature · 1 line
2.5.1
PATCH v2 2/3 systemd: Upgrade 219 -> 225
Drop patches that were straight backports from upstream
MIT licence was unused and dropped from systemd sources for more details see
https://github.com/systemd/systemd/commit/8f1e0c5f38cdf7e401ab4d2bb93ad816d08e7715
Drop gtkdoc dependency since libudev API documentation has been converted from gtkdoc into man pages Remove packaging gudev as it has moved to separate repository outside
systemd
For more details see
https://github.com/systemd/systemd/commit/2375607039517c88df51ef16ddbb624ec1c10654
package newly added script for xorg to be usable with systemd --user intance
For more details see
https://github.com/systemd/systemd/commit/1401ec2d34bcde406ced531a72dc46ebaf332594
machinectl now has shell support
private-zone DHCP options are supported by systemd-networkd
For complete differences between two releases run
git log --oneline v219..v225
in systemd git clone
---
...-mount-add-dependencies-to-dynamically-mo.patch | 36 ----
...ed-missing.h-fall-back-to-insecure-getenv.patch | 25 ---
...t-install-dependency-links-at-install-tim.patch | 35 ++--
...heck-for-additional-features-that-uclibc-.patch | 23 ++-
...wn-Use-execvpe-only-when-libc-supports-it.patch | 37 ++---
...til-Use-mkostemp-only-if-libc-supports-it.patch | 8 +-
...-unimplemented-_SC_PHYS_PAGES-system-conf.patch | 8 +-
...0-Make-root-s-home-directory-configurable.patch | 136 ++++++++-------
...files.c-Honor-ordering-within-files-as-th.patch | 185 ---------------------
...-remove-userspace-firmware-loading-suppor.patch | 99 ++++++-----
.../systemd/systemd/tmpfiles-pam.patch | 30 ----
.../systemd/{systemd_219.bb => systemd_225.bb} | 25 +--
12 files changed, 174 insertions(+), 473 deletions(-)
delete mode 100644 meta/recipes-core/systemd/systemd/0001-Revert-core-mount-add-dependencies-to-dynamically-mo.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0002-shared-missing.h-fall-back-to-insecure-getenv.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch
delete mode 100644 meta/recipes-core/systemd/systemd/tmpfiles-pam.patch
rename meta/recipes-core/systemd/{systemd_219.bb => systemd_225.bb} (95%)meta/recipes-core/systemd/systemd/0001-Revert-core-mount-add-dependencies-to-dynamically-mo.patch deleted +0 -36
@@ -1,36 +0,0 @@ -From eb7a760052667c5a35637901de9359c377263804 Mon Sep 17 00:00:00 2001 -From: Colin Walters <[email protected]> -Date: Tue, 24 Feb 2015 10:12:28 -0500 -Subject: [PATCH] Revert "core/mount: add dependencies to dynamically mounted - mounts too" - -This reverts commit 06e97888883e2cc12eb6514e80c7f0014295f59b. - -This patch was imported from Fedora (http://pkgs.fedoraproject.org/cgit/systemd.git/commit/?h=f22&id=9bbe0e92dc59d5a42258c729b105a7d9901eb35e). - -It fixes an issue where mount points not listed in fstab are immediately -unmounted after a call to mount. - -Upstream-Status: Inappropriate [fixed upstream] - -Signed-off-by: Joshua Lock <[email protected]> ---- - src/core/mount.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/mount.c b/src/core/mount.c -index 40037e7..cddb5e2 100644 ---- a/src/core/mount.c -+++ b/src/core/mount.c -@@ -295,7 +295,7 @@ static int mount_add_device_links(Mount *m) { - - assert(m); - -- p = get_mount_parameters(m); -+ p = get_mount_parameters_fragment(m); - if (!p) - return 0; - --- -1.8.3.1 -
meta/recipes-core/systemd/systemd/0002-shared-missing.h-fall-back-to-insecure-getenv.patch deleted +0 -25
@@ -1,25 +0,0 @@ -From 03baade6db2cf83b44a157818ba827d725449bb0 Mon Sep 17 00:00:00 2001 -From: Emil Renner Berthing <[email protected]> -Date: Thu, 18 Sep 2014 15:24:47 +0200 -Subject: [PATCH 02/11] shared/missing.h: fall back to insecure getenv - ---- - src/shared/missing.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/shared/missing.h b/src/shared/missing.h -index b33a70c..11cca04 100644 ---- a/src/shared/missing.h -+++ b/src/shared/missing.h -@@ -366,7 +366,7 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle - # ifdef HAVE___SECURE_GETENV - # define secure_getenv __secure_getenv - # else --# error "neither secure_getenv nor __secure_getenv are available" -+# define secure_getenv getenv - # endif - #endif - --- -2.1.4 -
meta/recipes-core/systemd/systemd/0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch +16 -19
@@ -23,11 +23,11 @@ Signed-off-by: Khem Raj <[email protected]> units/systemd-binfmt.service.in | 5 +++++ 3 files changed, 8 insertions(+), 4 deletions(-) -diff --git a/Makefile.am b/Makefile.am -index ba63f68..0fb3f9f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -4838,10 +4838,6 @@ INSTALL_DIRS += \ +Index: git/Makefile.am +=================================================================== +--- git.orig/Makefile.am ++++ git/Makefile.am +@@ -4271,10 +4271,6 @@ INSTALL_DIRS += \ $(prefix)/lib/binfmt.d \ $(sysconfdir)/binfmt.d
@@ -38,10 +38,10 @@ index ba63f68..0fb3f9f 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 +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 @@ ConditionPathIsReadWrite=/proc/sys/ [Automount]
@@ -49,11 +49,11 @@ index 6be3893..709adef 100644 + +[Install] +WantedBy=sysinit.target -diff --git a/units/systemd-binfmt.service.in b/units/systemd-binfmt.service.in -index 34a5d52..617462b 100644 ---- a/units/systemd-binfmt.service.in -+++ b/units/systemd-binfmt.service.in -@@ -11,6 +11,8 @@ 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=man:systemd-binfmt.service Documentation=https://www.kernel.org/doc/Documentation/binfmt_misc.txt DefaultDependencies=no Conflicts=shutdown.target
@@ -62,13 +62,10 @@ index 34a5d52..617462b 100644 After=proc-sys-fs-binfmt_misc.automount Before=sysinit.target shutdown.target ConditionPathIsReadWrite=/proc/sys/ -@@ -24,3 +26,6 @@ ConditionDirectoryNotEmpty=|/run/binfmt.d - Type=oneshot +@@ -25,3 +27,6 @@ Type=oneshot RemainAfterExit=yes ExecStart=@rootlibexecdir@/systemd-binfmt + TimeoutSec=90s + +[Install] +WantedBy=sysinit.target --- -2.1.4 -
meta/recipes-core/systemd/systemd/0004-configure-Check-for-additional-features-that-uclibc-.patch +10 -13
@@ -14,13 +14,13 @@ Signed-off-by: Khem Raj <[email protected]> configure.ac | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) -diff --git a/configure.ac b/configure.ac -index 9a2235b..a5b2e6e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -103,6 +103,24 @@ AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't s +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac ++++ git/configure.ac +@@ -110,6 +110,24 @@ AC_PATH_PROG([UMOUNT_PATH], [umount], [/ - M4_DEFINES= + AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])]) +# check for few functions not implemented in uClibc +
@@ -31,7 +31,7 @@ index 9a2235b..a5b2e6e 100644 +AC_MSG_CHECKING([whether %ms format is supported by *scanf]) + +AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM([ ++ [AC_LANG_PROGRAM([ + #include <stdio.h> + ],[ + char *buf1, *buf2, *buf3, str="1 2.3 abcde" ;
@@ -40,9 +40,6 @@ index 9a2235b..a5b2e6e 100644 + [AC_DEFINE([HAVE_MSFORMAT], [1], [Define if %ms format is supported by *scanf.])], + [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])], --- -2.1.4 - + M4_DEFINES= + + AC_CHECK_TOOL(OBJCOPY, objcopy)
meta/recipes-core/systemd/systemd/0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch +17 -20
@@ -10,32 +10,29 @@ Signed-off-by: Khem Raj <[email protected]> src/nspawn/nspawn.c | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 0d8d199..b597edb 100644 ---- a/src/nspawn/nspawn.c -+++ b/src/nspawn/nspawn.c -@@ -129,6 +129,8 @@ typedef enum Volatile { - VOLATILE_STATE, - } Volatile; +Index: git/src/nspawn/nspawn.c +=================================================================== +--- git.orig/src/nspawn/nspawn.c ++++ git/src/nspawn/nspawn.c +@@ -143,6 +143,8 @@ typedef struct CustomMount { + char **lower; + } CustomMount; +#include "config.h" + static char *arg_directory = NULL; static char *arg_template = NULL; static char *arg_user = NULL; -@@ -4257,7 +4259,12 @@ int main(int argc, char *argv[]) { - a[0] = (char*) "/sbin/init"; - execve(a[0], a, env_use); - } else if (argc > optind) +@@ -4238,7 +4240,12 @@ static int inner_child( + a[0] = (char*) "/sbin/init"; + execve(a[0], a, env_use); + } else if (argc > optind) +#ifdef HAVE_EXECVPE - execvpe(argv[optind], argv + optind, env_use); + execvpe(argv[optind], argv + optind, env_use); +#else -+ environ = env_use; -+ execvp(argv[optind], argv + optind); ++ environ = env_use; ++ execvp(argv[optind], argv + optind); +#endif /* HAVE_EXECVPE */ - else { - chdir(home ? home : "/root"); - execle("/bin/bash", "-bash", NULL, env_use); --- -2.1.4 - + else { + chdir(home ? home : "/root"); + execle("/bin/bash", "-bash", NULL, env_use);
meta/recipes-core/systemd/systemd/0007-util-Use-mkostemp-only-if-libc-supports-it.patch +4 -4
@@ -7,13 +7,13 @@ Upstream-Status: Denied [no desire for uclibc support] Signed-off-by: Khem Raj <[email protected]> --- - src/shared/util.c | 8 ++++++++ + src/basic/util.c | 8 ++++++++ 1 file changed, 8 insertions(+) -diff --git a/src/shared/util.c b/src/shared/util.c +diff --git a/src/basic/util.c b/src/basic/util.c index dc65280..72f4665 100644 ---- a/src/shared/util.c -+++ b/src/shared/util.c +--- a/src/basic/util.c ++++ b/src/basic/util.c @@ -97,6 +97,8 @@ #include "def.h" #include "sparse-endian.h"
meta/recipes-core/systemd/systemd/0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch +4 -4
@@ -8,13 +8,13 @@ Upstream-Status: Inappropriate [uclibc-specific] Signed-off-by: Khem Raj <[email protected]> --- - src/shared/util.c | 15 +++++++++++++++ + src/basic/util.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) -diff --git a/src/shared/util.c b/src/shared/util.c +diff --git a/src/basic/util.c b/src/basic/util.c index 72f4665..cbbe3b1 100644 ---- a/src/shared/util.c -+++ b/src/shared/util.c +--- a/src/basic/util.c ++++ b/src/basic/util.c @@ -6793,10 +6793,25 @@ uint64_t physical_memory(void) { /* We return this as uint64_t in case we are running as 32bit * process on a 64bit kernel with huge amounts of memory */
meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch +66 -70
215 lines not on this page · raw message
meta/recipes-core/systemd/systemd/0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch deleted +0 -185
185 lines not on this page · raw message
meta/recipes-core/systemd/systemd/0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch +48 -51
177 lines not on this page · raw message
meta/recipes-core/systemd/systemd/tmpfiles-pam.patch deleted +0 -30
@@ -1,30 +0,0 @@ -Upstream-Status: Submitted -Signed-off-by: Ross Burton <[email protected]> - -From 0802aaaa9784813d318d045c79533a044eedf542 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Tue, 3 Mar 2015 11:32:29 +0000 -Subject: [PATCH] tmpfiles.d: only copy /etc/pam.d if PAM is present - -If HAVE_PAM isn't set then don't attempt to copy /etc/pam.d from the factory, as -it doesn't get installed. - -Signed-off-by: Ross Burton <[email protected]> ---- - tmpfiles.d/etc.conf.m4 | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 -index 9b0e080..ab5cd16 100644 ---- a/tmpfiles.d/etc.conf.m4 -+++ b/tmpfiles.d/etc.conf.m4 -@@ -14,4 +14,6 @@ m4_ifdef(`ENABLE_RESOLVED', - L /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf - )m4_dnl - C /etc/nsswitch.conf - - - - -+m4_ifdef(`HAVE_PAM', - C /etc/pam.d - - - - -+)m4_dnl --- -1.7.10.4 -
meta/recipes-core/systemd/systemd_225.bb renamed from meta/recipes-core/systemd/systemd_219.bb +9 -16
@@ -10,10 +10,9 @@ 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" +LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \ - file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \ - file://LICENSE.MIT;md5=544799d0b492f119fa04641d1b8868ed" + file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c" PROVIDES = "udev"
@@ -23,14 +22,13 @@ DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl rea SECTION = "base/shell" -inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext +inherit useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest gettext -SRCREV = "85a6fabdd3e43cfab0fc6359e9f2a9e368d4a3ed" +SRCREV = "e1439a1472c5f691733b8ef10e702beac2496a63" -PV = "219-stable+git${SRCPV}" +PV = "225+git${SRCPV}" -SRC_URI = "git://github.com/systemd/systemd-stable;branch=v219-stable;protocol=git \ - file://0002-shared-missing.h-fall-back-to-insecure-getenv.patch \ +SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \ file://0003-binfmt-Don-t-install-dependency-links-at-install-tim.patch \ file://0004-configure-Check-for-additional-features-that-uclibc-.patch \ file://0005-nspawn-Use-execvpe-only-when-libc-supports-it.patch \
@@ -40,11 +38,8 @@ SRC_URI = "git://github.com/systemd/systemd-stable;branch=v219-stable;protocol=g file://0009-sysv-generator-add-support-for-executing-scripts-und.patch \ file://0010-Make-root-s-home-directory-configurable.patch \ file://0011-systemd-user-avoid-using-system-auth.patch \ - file://0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch \ file://0014-Revert-rules-remove-firmware-loading-rules.patch \ file://0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch \ - file://tmpfiles-pam.patch \ - file://0001-Revert-core-mount-add-dependencies-to-dynamically-mo.patch \ file://touchscreen.rules \ file://00-create-volatile.conf \ file://init \
@@ -119,8 +114,6 @@ EXTRA_OECONF = " --with-rootprefix=${rootprefix} \ --with-rootlibdir=${rootlibdir} \ --with-roothomedir=${ROOT_HOME} \ --disable-coredump \ - --disable-introspection \ - --disable-kdbus \ --enable-split-usr \ --without-python \ --with-sysvrcnd-path=${sysconfdir} \
@@ -220,7 +213,7 @@ python populate_packages_prepend (){ PACKAGES_DYNAMIC += "^lib(udev|systemd).*" PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install \ - ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh libgudev" + ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh ${PN}-xorg-xinitrc" SYSTEMD_PACKAGES = "${PN}-binfmt" SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"
@@ -234,8 +227,6 @@ FILES_${PN}-analyze = "${bindir}/systemd-analyze" FILES_${PN}-initramfs = "/init" RDEPENDS_${PN}-initramfs = "${PN}" -FILES_libgudev = "${libdir}/libgudev*${SOLIBS}" - RDEPENDS_${PN}-ptest += "perl python bash" FILES_${PN}-ptest += "${libdir}/udev/rules.d"
@@ -255,6 +246,8 @@ FILES_${PN}-kernel-install = "${bindir}/kernel-install \ FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \ " +FILES_${PN}-xorg-xinitrc = "${sysconfdir}/X11/xinit/xinitrc.d/*" + FILES_${PN}-zsh = "${datadir}/zsh/site-functions" FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \
Signature · 1 line
2.5.1
PATCH v2 3/3 systemd: Implement OE-Specific systemd-sysv-install
In reply to Khem RajSupport for chkconfig (--enable-chkconfig) was removed in favour of calling an abstraction /lib/systemd/systemd-sysv-install. This needs to be implemented for OE.
--- ...0012-implment-systemd-sysv-install-for-OE.patch | 40 ++++++++++++++++++++++ meta/recipes-core/systemd/systemd_225.bb | 4 ++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch
meta/recipes-core/systemd/systemd/0012-implment-systemd-sysv-install-for-OE.patch new file +40 -0
@@ -0,0 +1,40 @@ +From 5f8b9f2d276c0ddbcbf5423733a23f043d688009 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 5 Sep 2015 06:31:47 +0000 +Subject: [PATCH] implment systemd-sysv-install for OE + +Use update-rc.d for enabling/disabling and status command +to check the status of the sysv service + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <[email protected]> +--- + src/systemctl/systemd-sysv-install.SKELETON | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +Index: git/src/systemctl/systemd-sysv-install.SKELETON +=================================================================== +--- git.orig/src/systemctl/systemd-sysv-install.SKELETON ++++ git/src/systemctl/systemd-sysv-install.SKELETON +@@ -30,17 +30,17 @@ case "$1" in + enable) + # call the command to enable SysV init script $NAME here + # (consider optional $ROOT) +- echo "IMPLEMENT ME: enabling SysV init.d script $NAME" ++ update-rc.d -f $NAME defaults + ;; + disable) + # call the command to disable SysV init script $NAME here + # (consider optional $ROOT) +- echo "IMPLEMENT ME: disabling SysV init.d script $NAME" ++ update-rc.d -f $NAME remove + ;; + is-enabled) + # exit with 0 if $NAME is enabled, non-zero if it is disabled + # (consider optional $ROOT) +- echo "IMPLEMENT ME: checking SysV init.d script $NAME" ++ /etc/init.d/$NAME status + ;; + *) + usage ;;
meta/recipes-core/systemd/systemd_225.bb +3 -1
@@ -38,6 +38,7 @@ SRC_URI = "git://github.com/systemd/systemd.git;protocol=git \ file://0009-sysv-generator-add-support-for-executing-scripts-und.patch \ file://0010-Make-root-s-home-directory-configurable.patch \ file://0011-systemd-user-avoid-using-system-auth.patch \ + file://0012-implment-systemd-sysv-install-for-OE.patch \ file://0014-Revert-rules-remove-firmware-loading-rules.patch \ file://0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch \ file://touchscreen.rules \
@@ -188,6 +189,7 @@ do_install() { if [ -s ${D}${libdir}/tmpfiles.d/systemd.conf ]; then ${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${libdir}/tmpfiles.d/systemd.conf', d)} fi + install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install } do_install_ptest () {
@@ -309,7 +311,7 @@ FILES_${PN}-dbg += "${rootlibdir}/.debug ${systemd_unitdir}/.debug ${systemd_uni FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" RDEPENDS_${PN} += "kmod dbus util-linux-mount udev (= ${EXTENDPKGV})" -RDEPENDS_${PN} += "volatile-binds" +RDEPENDS_${PN} += "volatile-binds update-rc.d" RRECOMMENDS_${PN} += "systemd-serialgetty systemd-vconsole-setup \ systemd-compat-units udev-hwdb \
Signature · 1 line
2.5.1
Re: [PATCH V2 2/3] systemd: Upgrade 219 -> 225
In reply to Khem RajQuoted 10 lines · Khem Raj
Drop patches that were straight backports from upstream
MIT licence was unused and dropped from systemd sources for more details see
https://github.com/systemd/systemd/commit/8f1e0c5f38cdf7e401ab4d2bb93ad816d08e7715Drop gtkdoc dependency since libudev API documentation has been converted from gtkdoc into man pages Remove packaging gudev as it has moved to separate repository outside
systemd
Is anybody preparing patches for gudev (many packets in meta-oe require it)?
If not I can do so. Is the home for libgudev oe-core or better meta-oe?
Andreas
Re: [PATCH V2 2/3] systemd: Upgrade 219 -> 225
Quoted 3 lines · Andreas Müller
Is anybody preparing patches for gudev (many packets in meta-oe require it)?
If not I can do so. Is the home for libgudev oe-core or better meta-oe?
meta-oe is better for now. I am not working on it.
Re: [PATCH V2 2/3] systemd: Upgrade 219 -> 225
Hi Andreas
Here is a first patchset ready for pulling...
https://github.com/openembedded/meta-openembedded/pull/16
Von: "Khem Raj" <[email protected]>
An: "Andreas Müller" <[email protected]>
CC: [email protected], "Patches and discussions about the oe-core layer" <[email protected]>
Gesendet: Mittwoch, 16. September 2015 23:18:50
Betreff: Re: [OE-core] [PATCH V2 2/3] systemd: Upgrade 219 -> 225
Quoted 3 lines · Andreas Müller
Is anybody preparing patches for gudev (many packets in meta-oe require it)?
If not I can do so. Is the home for libgudev oe-core or better meta-oe?
meta-oe is better for now. I am not working on it.
Signature · 4 lines
_______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH V2 2/3] systemd: Upgrade 219 -> 225
Hi Adrian,
we're not accepting github's pull requests, see README.
Andreas already send many fixes for gudev, please check master-next if something is missing from your changes and resend to ML.
Quoted 34 lines · Adrian Freihofer
Hi Andreas
Here is a first patchset ready for pulling...
https://github.com/openembedded/meta-openembedded/pull/16------------------------------
*Von: *"Khem Raj" <[email protected]>
*An: *"Andreas Müller" <[email protected]>
*CC: *[email protected], "Patches and discussions about the oe-core layer" <[email protected]> *Gesendet: *Mittwoch, 16. September 2015 23:18:50
*Betreff: *Re: [OE-core] [PATCH V2 2/3] systemd: Upgrade 219 -> 225Quoted 1 line · Andreas Müller
Is anybody preparing patches for gudev (many packets in meta-oe require
it)?
Quoted 2 lines
If not I can do so. Is the home for libgudev oe-core or better meta-oe?
meta-oe is better for now. I am not working on it. --
_______________________________________________
Openembedded-core mailing list [email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH V2 2/3] systemd: Upgrade 219 -> 225
Hi Martin, hi Andreas
You are right, my patches are almost obsolete. Just some details might be worth to be noticed:
libgudev might be improved by adding:
RCONFLICTS_${PN} = "systemd (<= 220)"
NetworkManager and ModemManager depend on udev instead of libgudev as well.
Von: "Martin Jansa" <[email protected]>
An: "Adrian Freihofer" <[email protected]>
CC: "Khem Raj" <[email protected]>, "openembedded-devel" <[email protected]>, "Patches and discussions about the oe-core layer" <[email protected]>
Gesendet: Freitag, 18. September 2015 11:02:35
Betreff: Re: [OE-core] [PATCH V2 2/3] systemd: Upgrade 219 -> 225
Hi Adrian,
we're not accepting github's pull requests, see README.
Andreas already send many fixes for gudev, please check master-next if something is missing from your changes and resend to ML.
On Fri, Sep 18, 2015 at 9:46 AM, Adrian Freihofer < [email protected] > wrote:
Hi Andreas
Here is a first patchset ready for pulling...
https://github.com/openembedded/meta-openembedded/pull/16
Von: "Khem Raj" < [email protected] >
An: "Andreas Müller" < [email protected] >
CC: [email protected] , "Patches and discussions about the oe-core layer" < [email protected] >
Gesendet: Mittwoch, 16. September 2015 23:18:50
Betreff: Re: [OE-core] [PATCH V2 2/3] systemd: Upgrade 219 -> 225
Quoted 3 lines · Andreas Müller
Is anybody preparing patches for gudev (many packets in meta-oe require it)?
If not I can do so. Is the home for libgudev oe-core or better meta-oe?
meta-oe is better for now. I am not working on it.
Signature · 10 lines
_______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [PATCH V2 2/3] systemd: Upgrade 219 -> 225
Quoted 10 lines · Adrian Freihofer
Hi Martin, hi Andreas
You are right, my patches are almost obsolete. Just some details might be worth to be noticed:
libgudev might be improved by adding:
RCONFLICTS_${PN} = "systemd (<= 220)"NetworkManager and ModemManager depend on udev instead of libgudev as well.
Hi Adrian,
Checked the configure.ac of NetworkManager and ModemManager: You are right - guess I missed the rdepends warnings due to bloated log. For RCONFLICTS I have no strong opinion. I think it is correct but am not sure if it is really necessary. On the other hands no harm is expected
- so why not? other opinions?
Can you please send patches with improvements based on master-next?
Andreas