Skip to contentSkip to conversation

systemd: update to 204

PATCH Superseded Jonathan Liu 1 participant 2 messages May 20, 2013

v2 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 systemd: update to 204

Removed patches integrated upstream.
Added backport of fix for utmp not running at shutdown. Updated serial-getty service.

---
 .../systemd-serialgetty/[email protected]      |  16 +-
 ...se-AC_CHECK_TOOL-for-objcopy-strings-and-.patch |  41 ---
 ...ystemd-update-utmp-shutdown.service-into-.patch | 367 +++++++++++++++++++++
 .../0002-readahead-chunk-on-spinning-media.patch   | 142 --------
 .../systemd/systemd/0003-readahead-cleanups.patch  |  86 -----
 ...ctl-Handle-missing-etc-sysctl.conf-proper.patch |  33 --
 .../systemd/systemd/199-firmware.patch             |  98 ------
 .../systemd/{systemd_199.bb => systemd_204.bb}     |  12 +-
 8 files changed, 381 insertions(+), 414 deletions(-)
 delete mode 100644 meta/recipes-core/systemd/systemd/0001-configure-use-AC_CHECK_TOOL-for-objcopy-strings-and-.patch
 create mode 100644 meta/recipes-core/systemd/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0002-readahead-chunk-on-spinning-media.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0003-readahead-cleanups.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/0013-systemd-sysctl-Handle-missing-etc-sysctl.conf-proper.patch
 delete mode 100644 meta/recipes-core/systemd/systemd/199-firmware.patch
 rename meta/recipes-core/systemd/{systemd_199.bb => systemd_204.bb} (95%)
meta/recipes-core/systemd/systemd-serialgetty/[email protected] +10 -6
index 8eeaab6..1c14dfe 100644
@@ -1,23 +1,27 @@
 #  This file is part of systemd.
 #
 #  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 
 [Unit]
 Description=Serial Getty on %I
-BindTo=dev-%i.device
-After=dev-%i.device systemd-user-sessions.service
+Documentation=man:agetty(8) man:systemd-getty-generator(8)
+Documentation=http://0pointer.de/blog/projects/serial-console.html
+BindsTo=dev-%i.device
+After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
+After=rc-local.service
 
 # If additional gettys are spawned during boot then we should make
 # sure that this is synchronized before getty.target, even though
 # getty.target didn't actually pull it in.
 Before=getty.target
+IgnoreOnIsolate=yes
 
 [Service]
-Environment=TERM=vt100
-ExecStart=-/sbin/agetty -s %I @BAUDRATE@
+ExecStart=-/sbin/agetty -s %I @BAUDRATE@ vt102
+Type=idle
 Restart=always
 RestartSec=0
 UtmpIdentifier=%I
meta/recipes-core/systemd/systemd/0001-configure-use-AC_CHECK_TOOL-for-objcopy-strings-and-.patch deleted +0 -41

41 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch new file +367 -0

367 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0002-readahead-chunk-on-spinning-media.patch deleted +0 -142

142 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0003-readahead-cleanups.patch deleted +0 -86

86 lines not on this page · raw message

meta/recipes-core/systemd/systemd/0013-systemd-sysctl-Handle-missing-etc-sysctl.conf-proper.patch deleted +0 -33
deleted file mode 100644
index f2c8e02..0000000
@@ -1,33 +0,0 @@
-Upstream-Status: Backport
-
--Khem 2013/03/28
-
-From 6f6fad96addf6b00b55c98cc0d0d8026b0c1e7ca Mon Sep 17 00:00:00 2001
-From: Eelco Dolstra <[email protected]>
-Date: Wed, 27 Mar 2013 13:41:59 +0100
-Subject: [PATCH 13/17] systemd-sysctl: Handle missing /etc/sysctl.conf
- properly
-
-Since fabe5c0e5fce730aa66e10a9c4f9fdd443d7aeda, systemd-sysctl returns
-a non-zero exit code if /etc/sysctl.conf does not exist, due to a
-broken ENOENT check.
----
- src/sysctl/sysctl.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
-index 2d43660..79f3f77 100644
---- a/src/sysctl/sysctl.c
-+++ b/src/sysctl/sysctl.c
-@@ -125,7 +125,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
- 
-         r = search_and_fopen_nulstr(path, "re", conf_file_dirs, &f);
-         if (r < 0) {
--                if (ignore_enoent && errno == -ENOENT)
-+                if (ignore_enoent && r == -ENOENT)
-                         return 0;
- 
-                 log_error("Failed to open file '%s', ignoring: %s", path, strerror(-r));
--- 
-1.7.9.5
-
meta/recipes-core/systemd/systemd/199-firmware.patch deleted +0 -98

98 lines not on this page · raw message

meta/recipes-core/systemd/systemd_204.bb renamed from meta/recipes-core/systemd/systemd_199.bb +4 -8
similarity index 95%
rename from meta/recipes-core/systemd/systemd_199.bb
rename to meta/recipes-core/systemd/systemd_204.bb
index 5530528..ebcbe58 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
 PROVIDES = "udev"
 
 PE = "1"
-PR = "r5"
+PR = "r0"
 
 DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0 qemu-native"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
@@ -22,16 +22,12 @@ SRC_URI = "http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz \
            file://touchscreen.rules \
            file://modprobe.rules \
            ${UCLIBCPATCHES} \
+           file://0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch \
            file://00-create-volatile.conf \
-           file://0002-readahead-chunk-on-spinning-media.patch \
-           file://0003-readahead-cleanups.patch \
-           file://0013-systemd-sysctl-Handle-missing-etc-sysctl.conf-proper.patch \
-           file://0001-configure-use-AC_CHECK_TOOL-for-objcopy-strings-and-.patch \
-           file://199-firmware.patch \
            file://init \
           "
-SRC_URI[md5sum] = "4bb13f84ce211e93f0141774a90a2322"
-SRC_URI[sha256sum] = "8c4462a04f3ecf7f083782e5e0687913b1d33c6444bf20fa2f31df9222965fed"
+SRC_URI[md5sum] = "a07619bb19f48164fbf0761d12fd39a8"
+SRC_URI[sha256sum] = "072c393503c7c1e55ca7acf3db659cbd28c7fe5fa94fab3db95360bafd96731b"
 
 UCLIBCPATCHES = ""
 UCLIBCPATCHES_libc-uclibc = "file://systemd-pam-configure-check-uclibc.patch \
Signature · 1 line
1.8.2.3
#1 lore raw
Quoted 15 lines · Jonathan Liu

Removed patches integrated upstream.
Added backport of fix for utmp not running at shutdown. Updated serial-getty service.

---
  .../systemd-serialgetty/[email protected]      |  16 +-
  ...se-AC_CHECK_TOOL-for-objcopy-strings-and-.patch |  41 ---
  ...ystemd-update-utmp-shutdown.service-into-.patch | 367 +++++++++++++++++++++
  .../0002-readahead-chunk-on-spinning-media.patch   | 142 --------
  .../systemd/systemd/0003-readahead-cleanups.patch  |  86 -----
  ...ctl-Handle-missing-etc-sysctl.conf-proper.patch |  33 --
  .../systemd/systemd/199-firmware.patch             |  98 ------
  .../systemd/{systemd_199.bb => systemd_204.bb}     |  12 +-
  8 files changed, 381 insertions(+), 414 deletions(-)
Quoted 7 lines

delete mode 100644 meta/recipes-core/systemd/systemd/0001-configure-use-AC_CHECK_TOOL-for-objcopy-strings-and-.patch create mode 100644 meta/recipes-core/systemd/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch delete mode 100644 meta/recipes-core/systemd/systemd/0002-readahead-chunk-on-spinning-media.patch delete mode 100644 meta/recipes-core/systemd/systemd/0003-readahead-cleanups.patch
delete mode 100644 meta/recipes-core/systemd/systemd/0013-systemd-sysctl-Handle-missing-etc-sysctl.conf-proper.patch delete mode 100644 meta/recipes-core/systemd/systemd/199-firmware.patch
rename meta/recipes-core/systemd/{systemd_199.bb => systemd_204.bb} (95%)

Just a reminder this depends on the following commit:
- base-files: add /run directory from FHS 3 draft specification

Regards,
Jonathan