systemd: Upgrade 219 -> 224
PATCH v2 1/1 systemd: Upgrade 219 -> 224
MIT licence was unused and dropped in source itself
commit 8f1e0c5f38cdf7e401ab4d2bb93ad816d08e7715
Author: Kay Sievers <[email protected]>
Date: Tue Apr 21 19:21:56 2015 +0200
delete unused LICENSE.MIT
libudev API documentation has been converted from gtkdoc into man pages.
see
commit 2375607039517c88df51ef16ddbb624ec1c10654
Author: Kay Sievers <[email protected]>
Date: Wed Jun 3 00:09:23 2015 +0200
remove gudev and gtk-doc
The library moved to:
https://git.gnome.org/browse/libgudev/
package newly added xorg information
commit 1401ec2d34bcde406ced531a72dc46ebaf332594
Author: Kay Sievers <[email protected]> Date: Fri Jan 9 21:23:48 2015 +0100
push xorg information to the systemd --user instance
There are many reasons, for me its overlay support for systemd-nspawn, networkd has got many new features that is now usable w.r.t. IP forwarding, vxlan etc.
and it has many bug fixed in those 2000 odd commits since 219
---
...-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_224.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_224.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_224.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 = "b2a0ac5e5b29c73ca7c0da23369a4769d5a91ddd" -PV = "219-stable+git${SRCPV}" +PV = "224+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 \
@@ -108,8 +103,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} \
@@ -210,7 +203,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"
@@ -224,8 +217,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"
@@ -245,6 +236,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.1.4
Quoted 29 lines
MIT licence was unused and dropped in source itself
commit
8f1e0c5f38cdf7e401ab4d2bb93ad816d08e7715
Author: Kay Sievers <[email protected]>
Date: Tue Apr 21 19:21:56 2015 +0200delete unused LICENSE.MIT
libudev API documentation has been converted from gtkdoc into man pages.
see
commit
2375607039517c88df51ef16ddbb624ec1c10654
Author: Kay Sievers <[email protected]>
Date: Wed Jun 3 00:09:23 2015 +0200remove gudev and gtk-doc
The library moved to:
https://git.gnome.org/browse/libgudev/package newly added xorg information
commit
1401ec2d34bcde406ced531a72dc46ebaf332594Author: Kay Sievers <[email protected]> Date: Fri Jan 9 21:23:48 2015 +0100push xorg information to the systemd --user instance
Quoted 7 lines
There are many reasons, for me its overlay support for systemd-nspawn, networkd has got many new features that is now usable w.r.t. IP forwarding, vxlan etc.
and it has many bug fixed in those 2000 odd commits since 219Change-Id I998e652382950a3c74c4839f3767ef8bef23d88fSigned-off-by Khem Raj <[email protected]>
My apologies, but this is a really poor commit log message. Please write complete English sentences that make it clear *what* was changed by you and *why*, with attribution when work has been copied from elsewhere. Don't just copy-paste snippets from your email response to Ross.
This will help anyone who will make changes to this recipe in the future and will need to find out why certain things were done in the past.
Regards,
Alex
Quoted 2 lines · On Thu, Aug 20, 2015 at 2:39 AM, <[email protected]> wrote:
This will help anyone who will make changes to this recipe in the future and will need to find out why certain things were done in the past.
yeah, I have added pointers to commits instead.
Thanks
-Khem
Quoted 4 lines
Quoted 2 lines
This will help anyone who will make changes to this recipe in the future and will need to find out why certain things were done in the past.
yeah, I have added pointers to commits instead.
Thanks, it looks much better now!
Alex