<div dir="ltr">On 23 May 2013 09:53, Saul Wold <span dir="ltr"><<a href="mailto:sgw@linux.intel.com" target="_blank">sgw@linux.intel.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div class="im">On 05/22/2013 04:39 PM, Jonathan Liu wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Removed patches integrated upstream.<br>
Added backport of fix for utmp not running at shutdown.<br>
Updated serial-getty service.<br>
<br>
Signed-off-by: Jonathan Liu <<a href="mailto:net147@gmail.com" target="_blank">net147@gmail.com</a>><br>
---<br>
.../systemd-serialgetty/<u></u>serial-getty@.service | 16 +-<br>
...se-AC_CHECK_TOOL-for-<u></u>objcopy-strings-and-.patch | 41 ---<br>
...ystemd-update-utmp-<u></u>shutdown.service-into-.patch | 367 +++++++++++++++++++++<br>
.../0002-readahead-chunk-on-<u></u>spinning-media.patch | 142 --------<br>
.../systemd/systemd/0003-<u></u>readahead-cleanups.patch | 86 -----<br>
...ctl-Handle-missing-etc-<u></u>sysctl.conf-proper.patch | 33 --<br>
.../systemd/systemd/199-<u></u>firmware.patch | 98 ------<br>
.../systemd/{<a href="http://systemd_199.bb" target="_blank">systemd_199.bb</a> => <a href="http://systemd_204.bb" target="_blank">systemd_204.bb</a>} | 11 +-<br>
8 files changed, 380 insertions(+), 414 deletions(-)<br>
delete mode 100644 meta/recipes-core/systemd/<u></u>systemd/0001-configure-use-AC_<u></u>CHECK_TOOL-for-objcopy-<u></u>strings-and-.patch<br>
create mode 100644 meta/recipes-core/systemd/<u></u>systemd/0001-utmp-turn-<u></u>systemd-update-utmp-shutdown.<u></u>service-into-.patch<br>
delete mode 100644 meta/recipes-core/systemd/<u></u>systemd/0002-readahead-chunk-<u></u>on-spinning-media.patch<br>
delete mode 100644 meta/recipes-core/systemd/<u></u>systemd/0003-readahead-<u></u>cleanups.patch<br>
delete mode 100644 meta/recipes-core/systemd/<u></u>systemd/0013-systemd-sysctl-<u></u>Handle-missing-etc-sysctl.<u></u>conf-proper.patch<br>
delete mode 100644 meta/recipes-core/systemd/<u></u>systemd/199-firmware.patch<br>
rename meta/recipes-core/systemd/{<a href="http://systemd_199.bb" target="_blank">sys<u></u>temd_199.bb</a> => <a href="http://systemd_204.bb" target="_blank">systemd_204.bb</a>} (95%)<br>
<br>
</blockquote>
<br></div>
I am having some trouble applying this patch to both my MUT and master branches.<br>
<br>
Sau!</blockquote><div style>It looks like it still depends on the FHS patch. The patch rename <a href="http://systemd_199.bb">systemd_199.bb</a> while FHS patch modified <a href="http://systemd_199.bb">systemd_199.bb</a>.</div>
<div style>I have rebased the systemd patch to come before the FHS patch and submitted V4 which should allow you to apply to master.</div><div style><br></div><div style>Regards,</div><div style>Jonathan</div><div> </div>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5"><br>
<br>
<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
diff --git a/meta/recipes-core/systemd/<u></u>systemd-serialgetty/serial-<u></u>getty@.service b/meta/recipes-core/systemd/<u></u>systemd-serialgetty/serial-<u></u>getty@.service<br>
index 8eeaab6..1c14dfe 100644<br>
--- a/meta/recipes-core/systemd/<u></u>systemd-serialgetty/serial-<u></u>getty@.service<br>
+++ b/meta/recipes-core/systemd/<u></u>systemd-serialgetty/serial-<u></u>getty@.service<br>
@@ -1,23 +1,27 @@<br>
# This file is part of systemd.<br>
#<br>
# systemd is free software; you can redistribute it and/or modify it<br>
-# under the terms of the GNU General Public License as published by<br>
-# the Free Software Foundation; either version 2 of the License, or<br>
+# under the terms of the GNU Lesser General Public License as published by<br>
+# the Free Software Foundation; either version 2.1 of the License, or<br>
# (at your option) any later version.<br>
<br>
[Unit]<br>
Description=Serial Getty on %I<br>
-BindTo=dev-%i.device<br>
-After=dev-%i.device systemd-user-sessions.service<br>
+Documentation=man:agetty(8) man:systemd-getty-generator(8)<br>
+Documentation=<a href="http://0pointer.de/blog/projects/serial-console.html" target="_blank">http://<u></u>0pointer.de/blog/projects/<u></u>serial-console.html</a><br>
+BindsTo=dev-%i.device<br>
+After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service<br>
+After=rc-local.service<br>
<br>
# If additional gettys are spawned during boot then we should make<br>
# sure that this is synchronized before getty.target, even though<br>
# getty.target didn't actually pull it in.<br>
Before=getty.target<br>
+IgnoreOnIsolate=yes<br>
<br>
[Service]<br>
-Environment=TERM=vt100<br>
-ExecStart=-/sbin/agetty -s %I @BAUDRATE@<br>
+ExecStart=-/sbin/agetty -s %I @BAUDRATE@ vt102<br>
+Type=idle<br>
Restart=always<br>
RestartSec=0<br>
UtmpIdentifier=%I<br>
diff --git a/meta/recipes-core/systemd/<u></u>systemd/0001-configure-use-AC_<u></u>CHECK_TOOL-for-objcopy-<u></u>strings-and-.patch b/meta/recipes-core/systemd/<u></u>systemd/0001-configure-use-AC_<u></u>CHECK_TOOL-for-objcopy-<u></u>strings-and-.patch<br>
deleted file mode 100644<br>
index d847bbc..0000000<br>
--- a/meta/recipes-core/systemd/<u></u>systemd/0001-configure-use-AC_<u></u>CHECK_TOOL-for-objcopy-<u></u>strings-and-.patch<br>
+++ /dev/null<br>
@@ -1,41 +0,0 @@<br>
-From d6f92bcbbae9a577adb9588c7b2783<u></u>a5d0bf343d Mon Sep 17 00:00:00 2001<br>
-From: Martin Jansa <<a href="mailto:Martin.Jansa@gmail.com" target="_blank">Martin.Jansa@gmail.com</a>><br>
-Date: Tue, 16 Apr 2013 14:20:41 +0200<br>
-Subject: [PATCH] configure: use AC_CHECK_TOOL for objcopy, strings and gperf<br>
-<br>
-* using AC_PATH_TOOL does not allow to override it from shell environment<br>
- which is useful when cross-compiling<br>
-* with external toolchain I have different HOST_PREFIX and HOST_SYS<br>
- AC_PATH_TOOL is using HOST_SYS as prefix and fails to find objcopy<br>
- which is available only as ${TARGET_PREFIX}objcopy then it tries<br>
- objcopy without prefix which is found on host, but that objcopy<br>
- does not work for !host (e.g. arm when building on x86) libs<br>
-<br>
-Signed-off-by: Martin Jansa <<a href="mailto:Martin.Jansa@gmail.com" target="_blank">Martin.Jansa@gmail.com</a>><br>
-Upstream-Status: Submitted<br>
-<a href="http://lists.freedesktop.org/archives/systemd-devel/2013-April/010468.html" target="_blank">http://lists.freedesktop.org/<u></u>archives/systemd-devel/2013-<u></u>April/010468.html</a><br>
-<br>
----<br>
- <a href="http://configure.ac" target="_blank">configure.ac</a> | 6 +++---<br>
- 1 file changed, 3 insertions(+), 3 deletions(-)<br>
-<br>
-diff --git a/<a href="http://configure.ac" target="_blank">configure.ac</a> b/<a href="http://configure.ac" target="_blank">configure.ac</a><br>
-index 33b0ca9..519f1a9 100644<br>
---- a/<a href="http://configure.ac" target="_blank">configure.ac</a><br>
-+++ b/<a href="http://configure.ac" target="_blank">configure.ac</a><br>
-@@ -86,9 +86,9 @@ GOBJECT_INTROSPECTION_CHECK([<u></u>1.31.1])<br>
- AM_CONDITIONAL([HAVE_<u></u>INTROSPECTION], [false])<br>
- enable_introspection=no])<br>
-<br>
--AC_PATH_TOOL(OBJCOPY, objcopy)<br>
--AC_PATH_TOOL(STRINGS, strings)<br>
--AC_PATH_TOOL(GPERF, gperf)<br>
-+AC_CHECK_TOOL(OBJCOPY, objcopy)<br>
-+AC_CHECK_TOOL(STRINGS, strings)<br>
-+AC_CHECK_TOOL(GPERF, gperf)<br>
- if test -z "$GPERF" ; then<br>
- AC_MSG_ERROR([*** gperf not found])<br>
- fi<br>
---<br>
-1.8.1.5<br>
-<br>
diff --git a/meta/recipes-core/systemd/<u></u>systemd/0001-utmp-turn-<u></u>systemd-update-utmp-shutdown.<u></u>service-into-.patch b/meta/recipes-core/systemd/<u></u>systemd/0001-utmp-turn-<u></u>systemd-update-utmp-shutdown.<u></u>service-into-.patch<br>
new file mode 100644<br>
index 0000000..86fab97<br>
--- /dev/null<br>
+++ b/meta/recipes-core/systemd/<u></u>systemd/0001-utmp-turn-<u></u>systemd-update-utmp-shutdown.<u></u>service-into-.patch<br>
@@ -0,0 +1,367 @@<br>
+Upstream-Status: Backport<br>
+Signed-off-by: Jonathan Liu <<a href="mailto:net147@gmail.com" target="_blank">net147@gmail.com</a>><br>
+<br>
+From 3f92e4b4b61042391bd44de4dceb18<u></u>177df0dd57 Mon Sep 17 00:00:00 2001<br>
+From: Lennart Poettering <<a href="mailto:lennart@poettering.net" target="_blank">lennart@poettering.net</a>><br>
+Date: Thu, 16 May 2013 00:19:03 +0200<br>
+Subject: [PATCH] utmp: turn systemd-update-utmp-shutdown.<u></u>service into a normal<br>
+ runtime service<br>
+<br>
+With this change systemd-update-utmp-shutdown.<u></u>service is replaced by<br>
+systemd-update-utmp.service which is started at boot and stays around<br>
+until shutdown. This allows us to properly order the unit against both<br>
+/var/log and auditd.<br>
+<br>
+<a href="https://bugzilla.redhat.com/show_bug.cgi?id=853104" target="_blank">https://bugzilla.redhat.com/<u></u>show_bug.cgi?id=853104</a><br>
+<a href="https://bugs.freedesktop.org/show_bug.cgi?id=64365" target="_blank">https://bugs.freedesktop.org/<u></u>show_bug.cgi?id=64365</a><br>
+---<br>
+ Makefile-man.am | 12 ++---<br>
+ Makefile.am | 8 +--<br>
+ man/systemd-update-utmp-<u></u>runlevel.service.xml | 76 ---------------------------<br>
+ man/systemd-update-utmp.<u></u>service.xml | 76 +++++++++++++++++++++++++++<br>
+ src/update-utmp/update-utmp.c | 2 +-<br>
+ units/.gitignore | 2 +-<br>
+ units/<a href="http://systemd-update-utmp-runlevel.service.in" target="_blank">systemd-update-utmp-<u></u>runlevel.service.in</a> | 8 +--<br>
+ units/<a href="http://systemd-update-utmp-shutdown.service.in" target="_blank">systemd-update-utmp-<u></u>shutdown.service.in</a> | 19 -------<br>
+ units/<a href="http://systemd-update-utmp.service.in" target="_blank">systemd-update-utmp.<u></u>service.in</a> | 21 ++++++++<br>
+ 9 files changed, 114 insertions(+), 110 deletions(-)<br>
+ delete mode 100644 man/systemd-update-utmp-<u></u>runlevel.service.xml<br>
+ create mode 100644 man/systemd-update-utmp.<u></u>service.xml<br>
+ delete mode 100644 units/<a href="http://systemd-update-utmp-shutdown.service.in" target="_blank">systemd-update-utmp-<u></u>shutdown.service.in</a><br>
+ create mode 100644 units/<a href="http://systemd-update-utmp.service.in" target="_blank">systemd-update-utmp.<u></u>service.in</a><br>
+<br>
+diff --git a/Makefile-man.am b/Makefile-man.am<br>
+index 7d62094..5888158 100644<br>
+--- a/Makefile-man.am<br>
++++ b/Makefile-man.am<br>
+@@ -72,7 +72,7 @@ MANPAGES += \<br>
+ man/systemd-tmpfiles.8 \<br>
+ man/systemd-tty-ask-password-<u></u>agent.1 \<br>
+ man/systemd-udevd.service.8 \<br>
+- man/systemd-update-utmp-<u></u>runlevel.service.8 \<br>
++ man/systemd-update-utmp.<u></u>service.8 \<br>
+ man/systemd.1 \<br>
+ man/systemd.automount.5 \<br>
+ man/systemd.device.5 \<br>
+@@ -191,7 +191,7 @@ MANPAGES_ALIAS += \<br>
+ man/systemd-udevd-control.<u></u>socket.8 \<br>
+ man/systemd-udevd-kernel.<u></u>socket.8 \<br>
+ man/systemd-udevd.8 \<br>
+- man/systemd-update-utmp-<u></u>shutdown.service.8 \<br>
++ man/systemd-update-utmp-<u></u>runlevel.service.8 \<br>
+ man/systemd-update-utmp.8 \<br>
+ man/systemd-user.conf.5<br>
+ man/SD_ALERT.3: man/sd-daemon.3<br>
+@@ -289,8 +289,8 @@ man/systemd-tmpfiles-setup.<u></u>service.8: man/systemd-tmpfiles.8<br>
+ man/systemd-udevd-control.<u></u>socket.8: man/systemd-udevd.service.8<br>
+ man/systemd-udevd-kernel.<u></u>socket.8: man/systemd-udevd.service.8<br>
+ man/systemd-udevd.8: man/systemd-udevd.service.8<br>
+-man/systemd-update-utmp-<u></u>shutdown.service.8: man/systemd-update-utmp-<u></u>runlevel.service.8<br>
+-man/systemd-update-utmp.8: man/systemd-update-utmp-<u></u>runlevel.service.8<br>
++man/systemd-update-utmp-<u></u>runlevel.service.8: man/systemd-update-utmp.<u></u>service.8<br>
++man/systemd-update-utmp.8: man/systemd-update-utmp.<u></u>service.8<br>
+ man/systemd-user.conf.5: man/systemd-system.conf.5<br>
+ man/SD_ALERT.html: man/sd-daemon.html<br>
+ $(html-alias)<br>
+@@ -577,10 +577,10 @@ man/systemd-udevd-kernel.<u></u>socket.html: man/systemd-udevd.service.html<br>
+ man/systemd-udevd.html: man/systemd-udevd.service.html<br>
+ $(html-alias)<br>
+<br>
+-man/systemd-update-utmp-<u></u>shutdown.service.html: man/systemd-update-utmp-<u></u>runlevel.service.html<br>
++man/systemd-update-utmp-<u></u>runlevel.service.html: man/systemd-update-utmp.<u></u>service.html<br>
+ $(html-alias)<br>
+<br>
+-man/systemd-update-utmp.<u></u>html: man/systemd-update-utmp-<u></u>runlevel.service.html<br>
++man/systemd-update-utmp.<u></u>html: man/systemd-update-utmp.<u></u>service.html<br>
+ $(html-alias)<br>
+<br>
+ man/systemd-user.conf.html: man/systemd-system.conf.html<br>
+diff --git a/Makefile.am b/Makefile.am<br>
+index 8d8139c..4c5e6fc 100644<br>
+--- a/Makefile.am<br>
++++ b/Makefile.am<br>
+@@ -417,8 +417,8 @@ nodist_systemunit_DATA = \<br>
+ units/systemd-initctl.service \<br>
+ units/systemd-shutdownd.<u></u>service \<br>
+ units/systemd-remount-fs.<u></u>service \<br>
++ units/systemd-update-utmp.<u></u>service \<br>
+ units/systemd-update-utmp-<u></u>runlevel.service \<br>
+- units/systemd-update-utmp-<u></u>shutdown.service \<br>
+ units/systemd-tmpfiles-setup-<u></u>dev.service \<br>
+ units/systemd-tmpfiles-setup.<u></u>service \<br>
+ units/systemd-tmpfiles-clean.<u></u>service \<br>
+@@ -463,8 +463,8 @@ EXTRA_DIST += \<br>
+ units/<a href="http://systemd-initctl.service.in" target="_blank">systemd-initctl.service.<u></u>in</a> \<br>
+ units/<a href="http://systemd-shutdownd.service.in" target="_blank">systemd-shutdownd.<u></u>service.in</a> \<br>
+ units/<a href="http://systemd-remount-fs.service.in" target="_blank">systemd-remount-fs.<u></u>service.in</a> \<br>
++ units/<a href="http://systemd-update-utmp.service.in" target="_blank">systemd-update-utmp.<u></u>service.in</a> \<br>
+ units/<a href="http://systemd-update-utmp-runlevel.service.in" target="_blank">systemd-update-utmp-<u></u>runlevel.service.in</a> \<br>
+- units/<a href="http://systemd-update-utmp-shutdown.service.in" target="_blank">systemd-update-utmp-<u></u>shutdown.service.in</a> \<br>
+ units/<a href="http://systemd-tmpfiles-setup-dev.service.in" target="_blank">systemd-tmpfiles-setup-<u></u>dev.service.in</a> \<br>
+ units/<a href="http://systemd-tmpfiles-setup.service.in" target="_blank">systemd-tmpfiles-setup.<u></u>service.in</a> \<br>
+ units/<a href="http://systemd-tmpfiles-clean.service.in" target="_blank">systemd-tmpfiles-clean.<u></u>service.in</a> \<br>
+@@ -4070,8 +4070,8 @@ RUNLEVEL4_TARGET_WANTS += \<br>
+ RUNLEVEL5_TARGET_WANTS += \<br>
+ systemd-update-utmp-runlevel.<u></u>service<br>
+ endif<br>
+-SHUTDOWN_TARGET_WANTS += \<br>
+- systemd-update-utmp-shutdown.<u></u>service<br>
++SYSINIT_TARGET_WANTS += \<br>
++ systemd-update-utmp.service<br>
+ LOCAL_FS_TARGET_WANTS += \<br>
+ systemd-remount-fs.service \<br>
+ systemd-fsck-root.service \<br>
+diff --git a/man/systemd-update-utmp-<u></u>runlevel.service.xml b/man/systemd-update-utmp-<u></u>runlevel.service.xml<br>
+deleted file mode 100644<br>
+index 867b958..0000000<br>
+--- a/man/systemd-update-utmp-<u></u>runlevel.service.xml<br>
++++ /dev/null<br>
+@@ -1,76 +0,0 @@<br>
+-<?xml version="1.0"?><br>
+-<!--*-nxml-*--><br>
+-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "<a href="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" target="_blank">http://www.oasis-open.org/<u></u>docbook/xml/4.2/docbookx.dtd</a>"><br>
+-<!--<br>
+- This file is part of systemd.<br>
+-<br>
+- Copyright 2012 Lennart Poettering<br>
+-<br>
+- systemd is free software; you can redistribute it and/or modify it<br>
+- under the terms of the GNU Lesser General Public License as published by<br>
+- the Free Software Foundation; either version 2.1 of the License, or<br>
+- (at your option) any later version.<br>
+-<br>
+- systemd is distributed in the hope that it will be useful, but<br>
+- WITHOUT ANY WARRANTY; without even the implied warranty of<br>
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU<br>
+- Lesser General Public License for more details.<br>
+-<br>
+- You should have received a copy of the GNU Lesser General Public License<br>
+- along with systemd; If not, see <<a href="http://www.gnu.org/licenses/" target="_blank">http://www.gnu.org/licenses/</a>><u></u>.<br>
+---><br>
+-<refentry id="systemd-update-utmp-<u></u>runlevel.service"><br>
+-<br>
+- <refentryinfo><br>
+- <title>systemd-update-utmp-<u></u>runlevel.service</title><br>
+- <productname>systemd</<u></u>productname><br>
+-<br>
+- <authorgroup><br>
+- <author><br>
+- <contrib>Developer</contrib><br>
+- <firstname>Lennart</firstname><br>
+- <surname>Poettering</surname><br>
+- <email><a href="mailto:lennart@poettering.net" target="_blank">lennart@poettering.net</a><<u></u>/email><br>
+- </author><br>
+- </authorgroup><br>
+- </refentryinfo><br>
+-<br>
+- <refmeta><br>
+- <refentrytitle>systemd-update-<u></u>utmp-runlevel.service</<u></u>refentrytitle><br>
+- <manvolnum>8</manvolnum><br>
+- </refmeta><br>
+-<br>
+- <refnamediv><br>
+- <refname>systemd-update-utmp-<u></u>runlevel.service</refname><br>
+- <refname>systemd-update-utmp-<u></u>shutdown.service</refname><br>
+- <refname>systemd-update-utmp</<u></u>refname><br>
+- <refpurpose>Write audit and utmp updates at runlevel<br>
+- changes and shutdown</refpurpose><br>
+- </refnamediv><br>
+-<br>
+- <refsynopsisdiv><br>
+- <para><filename>systemd-<u></u>update-utmp-runlevel.service</<u></u>filename></para><br>
+- <para><filename>systemd-<u></u>update-utmp-shutdown.service</<u></u>filename></para><br>
+- <para><filename>/usr/lib/<u></u>systemd/systemd-update-utmp</<u></u>filename></para><br>
+- </refsynopsisdiv><br>
+-<br>
+- <refsect1><br>
+- <title>Description</title><br>
+-<br>
+- <para><filename>systemd-<u></u>update-utmp-runlevel.service</<u></u>filename><br>
+- is a service that writes SysV runlevel changes to utmp<br>
+- and wtmp, as well as the audit logs, as they<br>
+- occur. <filename>systemd-update-utmp-<u></u>shutdown.service</filename><br>
+- does the same for shut-down requests.</para><br>
+- </refsect1><br>
+-<br>
+- <refsect1><br>
+- <title>See Also</title><br>
+- <para><br>
+- <citerefentry><refentrytitle><u></u>systemd</refentrytitle><<u></u>manvolnum>1</manvolnum></<u></u>citerefentry>,<br>
+- <citerefentry><refentrytitle><u></u>utmp</refentrytitle><<u></u>manvolnum>5</manvolnum></<u></u>citerefentry>,<br>
+- <citerefentry><refentrytitle><u></u>auditd</refentrytitle><<u></u>manvolnum>8</manvolnum></<u></u>citerefentry><br>
+- </para><br>
+- </refsect1><br>
+-<br>
+-</refentry><br>
+diff --git a/man/systemd-update-utmp.<u></u>service.xml b/man/systemd-update-utmp.<u></u>service.xml<br>
+new file mode 100644<br>
+index 0000000..846fc95<br>
+--- /dev/null<br>
++++ b/man/systemd-update-utmp.<u></u>service.xml<br>
+@@ -0,0 +1,76 @@<br>
++<?xml version="1.0"?><br>
++<!--*-nxml-*--><br>
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "<a href="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" target="_blank">http://www.oasis-open.org/<u></u>docbook/xml/4.2/docbookx.dtd</a>"><br>
++<!--<br>
++ This file is part of systemd.<br>
++<br>
++ Copyright 2012 Lennart Poettering<br>
++<br>
++ systemd is free software; you can redistribute it and/or modify it<br>
++ under the terms of the GNU Lesser General Public License as published by<br>
++ the Free Software Foundation; either version 2.1 of the License, or<br>
++ (at your option) any later version.<br>
++<br>
++ systemd is distributed in the hope that it will be useful, but<br>
++ WITHOUT ANY WARRANTY; without even the implied warranty of<br>
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU<br>
++ Lesser General Public License for more details.<br>
++<br>
++ You should have received a copy of the GNU Lesser General Public License<br>
++ along with systemd; If not, see <<a href="http://www.gnu.org/licenses/" target="_blank">http://www.gnu.org/licenses/</a>><u></u>.<br>
++--><br>
++<refentry id="systemd-update-utmp.<u></u>service"><br>
++<br>
++ <refentryinfo><br>
++ <title>systemd-update-utmp.<u></u>service</title><br>
++ <productname>systemd</<u></u>productname><br>
++<br>
++ <authorgroup><br>
++ <author><br>
++ <contrib>Developer</contrib><br>
++ <firstname>Lennart</firstname><br>
++ <surname>Poettering</surname><br>
++ <email><a href="mailto:lennart@poettering.net" target="_blank">lennart@poettering.net</a><<u></u>/email><br>
++ </author><br>
++ </authorgroup><br>
++ </refentryinfo><br>
++<br>
++ <refmeta><br>
++ <refentrytitle>systemd-update-<u></u>utmp.service</refentrytitle><br>
++ <manvolnum>8</manvolnum><br>
++ </refmeta><br>
++<br>
++ <refnamediv><br>
++ <refname>systemd-update-utmp.<u></u>service</refname><br>
++ <refname>systemd-update-utmp-<u></u>runlevel.service</refname><br>
++ <refname>systemd-update-utmp</<u></u>refname><br>
++ <refpurpose>Write audit and utmp updates at bootup, runlevel<br>
++ changes and shutdown</refpurpose><br>
++ </refnamediv><br>
++<br>
++ <refsynopsisdiv><br>
++ <para><filename>systemd-<u></u>update-utmp.service</filename><u></u></para><br>
++ <para><filename>systemd-<u></u>update-utmp-runlevel.service</<u></u>filename></para><br>
++ <para><filename>/usr/lib/<u></u>systemd/systemd-update-utmp</<u></u>filename></para><br>
++ </refsynopsisdiv><br>
++<br>
++ <refsect1><br>
++ <title>Description</title><br>
++<br>
++ <para><filename>systemd-<u></u>update-utmp-runlevel.service</<u></u>filename><br>
++ is a service that writes SysV runlevel changes to utmp<br>
++ and wtmp, as well as the audit logs, as they<br>
++ occur. <filename>systemd-update-utmp.<u></u>service</filename><br>
++ does the same for system reboots and shut-down requests.</para><br>
++ </refsect1><br>
++<br>
++ <refsect1><br>
++ <title>See Also</title><br>
++ <para><br>
++ <citerefentry><refentrytitle><u></u>systemd</refentrytitle><<u></u>manvolnum>1</manvolnum></<u></u>citerefentry>,<br>
++ <citerefentry><refentrytitle><u></u>utmp</refentrytitle><<u></u>manvolnum>5</manvolnum></<u></u>citerefentry>,<br>
++ <citerefentry><refentrytitle><u></u>auditd</refentrytitle><<u></u>manvolnum>8</manvolnum></<u></u>citerefentry><br>
++ </para><br>
++ </refsect1><br>
++<br>
++</refentry><br>
+diff --git a/src/update-utmp/update-utmp.<u></u>c b/src/update-utmp/update-utmp.<u></u>c<br>
+index 9184025..202aa98 100644<br>
+--- a/src/update-utmp/update-utmp.<u></u>c<br>
++++ b/src/update-utmp/update-utmp.<u></u>c<br>
+@@ -104,7 +104,7 @@ static int get_current_runlevel(Context *c) {<br>
+ { '3', SPECIAL_RUNLEVEL3_TARGET },<br>
+ { '4', SPECIAL_RUNLEVEL4_TARGET },<br>
+ { '2', SPECIAL_RUNLEVEL2_TARGET },<br>
+- { 'S', SPECIAL_RESCUE_TARGET },<br>
++ { '1', SPECIAL_RESCUE_TARGET },<br>
+ };<br>
+ const char<br>
+ *interface = "org.freedesktop.systemd1.<u></u>Unit",<br>
+diff --git a/units/<a href="http://systemd-update-utmp-runlevel.service.in" target="_blank">systemd-update-utmp-<u></u>runlevel.service.in</a> b/units/<a href="http://systemd-update-utmp-runlevel.service.in" target="_blank">systemd-update-utmp-<u></u>runlevel.service.in</a><br>
+index 27fae2c..99783e2 100644<br>
+--- a/units/<a href="http://systemd-update-utmp-runlevel.service.in" target="_blank">systemd-update-utmp-<u></u>runlevel.service.in</a><br>
++++ b/units/<a href="http://systemd-update-utmp-runlevel.service.in" target="_blank">systemd-update-utmp-<u></u>runlevel.service.in</a><br>
+@@ -7,12 +7,14 @@<br>
+<br>
+ [Unit]<br>
+ Description=Update UTMP about System Runlevel Changes<br>
+-Documentation=man:systemd-<u></u>update-utmp-runlevel.service(<u></u>8) man:utmp(5)<br>
++Documentation=man:systemd-<u></u>update-utmp.service(8) man:utmp(5)<br>
+ DefaultDependencies=no<br>
+ RequiresMountsFor=/var/log/<u></u>wtmp<br>
+-After=systemd-remount-fs.<u></u>service systemd-tmpfiles-setup.service auditd.service<br>
++Conflicts=shutdown.target<br>
++Requisite=systemd-update-<u></u>utmp.service<br>
++After=systemd-update-utmp.<u></u>service<br>
+ After=runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target<br>
+-Before=final.target<br>
++Before=shutdown.target<br>
+<br>
+ [Service]<br>
+ Type=oneshot<br>
+diff --git a/units/<a href="http://systemd-update-utmp-shutdown.service.in" target="_blank">systemd-update-utmp-<u></u>shutdown.service.in</a> b/units/<a href="http://systemd-update-utmp-shutdown.service.in" target="_blank">systemd-update-utmp-<u></u>shutdown.service.in</a><br>
+deleted file mode 100644<br>
+index aa93562..0000000<br>
+--- a/units/<a href="http://systemd-update-utmp-shutdown.service.in" target="_blank">systemd-update-utmp-<u></u>shutdown.service.in</a><br>
++++ /dev/null<br>
+@@ -1,19 +0,0 @@<br>
+-# This file is part of systemd.<br>
+-#<br>
+-# systemd is free software; you can redistribute it and/or modify it<br>
+-# under the terms of the GNU Lesser General Public License as published by<br>
+-# the Free Software Foundation; either version 2.1 of the License, or<br>
+-# (at your option) any later version.<br>
+-<br>
+-[Unit]<br>
+-Description=Update UTMP about System Shutdown<br>
+-Documentation=man:systemd-<u></u>update-utmp-runlevel.service(<u></u>8) man:utmp(5)<br>
+-DefaultDependencies=no<br>
+-RequiresMountsFor=/var/log/<u></u>wtmp<br>
+-After=systemd-remount-fs.<u></u>service systemd-tmpfiles-setup.service auditd.service<br>
+-After=systemd-update-utmp-<u></u>runlevel.service<br>
+-Before=final.target<br>
+-<br>
+-[Service]<br>
+-Type=oneshot<br>
+-ExecStart=@rootlibexecdir@/<u></u>systemd-update-utmp shutdown<br>
+diff --git a/units/<a href="http://systemd-update-utmp.service.in" target="_blank">systemd-update-utmp.<u></u>service.in</a> b/units/<a href="http://systemd-update-utmp.service.in" target="_blank">systemd-update-utmp.<u></u>service.in</a><br>
+new file mode 100644<br>
+index 0000000..e7c20a5<br>
+--- /dev/null<br>
++++ b/units/<a href="http://systemd-update-utmp.service.in" target="_blank">systemd-update-utmp.<u></u>service.in</a><br>
+@@ -0,0 +1,21 @@<br>
++# This file is part of systemd.<br>
++#<br>
++# systemd is free software; you can redistribute it and/or modify it<br>
++# under the terms of the GNU Lesser General Public License as published by<br>
++# the Free Software Foundation; either version 2.1 of the License, or<br>
++# (at your option) any later version.<br>
++<br>
++[Unit]<br>
++Description=Update UTMP about System Reboot/Shutdown<br>
++Documentation=man:systemd-<u></u>update-utmp.service(8) man:utmp(5)<br>
++DefaultDependencies=no<br>
++RequiresMountsFor=/var/log/<u></u>wtmp<br>
++Conflicts=shutdown.target<br>
++After=systemd-readahead-<u></u>collect.service systemd-readahead-replay.<u></u>service systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service<br>
++Before=sysinit.target shutdown.target<br>
++<br>
++[Service]<br>
++Type=oneshot<br>
++RemainAfterExit=yes<br>
++ExecStart=@rootlibexecdir@/<u></u>systemd-update-utmp reboot<br>
++ExecStop=@rootlibexecdir@/<u></u>systemd-update-utmp shutdown<br>
+--<br>
+1.8.2.3<br>
+<br>
diff --git a/meta/recipes-core/systemd/<u></u>systemd/0002-readahead-chunk-<u></u>on-spinning-media.patch b/meta/recipes-core/systemd/<u></u>systemd/0002-readahead-chunk-<u></u>on-spinning-media.patch<br>
deleted file mode 100644<br>
index d57a01c..0000000<br>
--- a/meta/recipes-core/systemd/<u></u>systemd/0002-readahead-chunk-<u></u>on-spinning-media.patch<br>
+++ /dev/null<br>
@@ -1,142 +0,0 @@<br>
-Upstream-Status: Backport<br>
-<br>
--Khem 2013/03/28<br>
-<br>
-From 94243ef299425d6c7089a7a05c48c9<u></u>bb8f6cf3da Mon Sep 17 00:00:00 2001<br>
-From: Auke Kok <<a href="mailto:auke-jan.h.kok@intel.com" target="_blank">auke-jan.h.kok@intel.com</a>><br>
-Date: Fri, 22 Mar 2013 15:09:45 -0700<br>
-Subject: [PATCH 02/17] readahead: chunk on spinning media<br>
-<br>
-Readahead has all sorts of bad side effects depending on your<br>
-storage media. On rotating disks, it may be degrading startup<br>
-performance if enough requests are queued spanning linearly<br>
-over all blocks early at boot, and mount, blkid and friends<br>
-want to insert reads to the start of these block devices after.<br>
-<br>
-The end result is that on spinning disks with ext3/4 that udev<br>
-and mounts take a very long time, and nothing really happens until<br>
-readahead is completely finished.<br>
-<br>
-This has the net effect that the CPU is almost entirely idle<br>
-for the entire period that readahead is working. We could have<br>
-finished starting up quite a lot of services in this time if<br>
-we were smarter at how we do readahead.<br>
-<br>
-This patch sorts all requests into 2 second "chunks" and sub-sorts<br>
-each chunk by block. This adds a single cross-drive seek per "chunk"<br>
-but has the benefit that we will have a lot of the blocks we need<br>
-early on in the boot sequence loaded into memory faster.<br>
-<br>
-For a comparison of how before/after bootcharts look (ext4 on a<br>
-mobile 5400rpm 250GB drive) please look at:<br>
-<br>
- <a href="http://foo-projects.org/~sofar/blocked-tests/" target="_blank">http://foo-projects.org/~<u></u>sofar/blocked-tests/</a><br>
-<br>
-There are bootcharts in the "before" and "after" folders where you<br>
-should be able to see that many low-level services finish 5-7<br>
-seconds earlier with the patch applied (after).<br>
----<br>
- Makefile.am | 2 +-<br>
- src/readahead/readahead-<u></u>collect.c | 28 +++++++++++++++++++++++++---<br>
- 2 files changed, 26 insertions(+), 4 deletions(-)<br>
-<br>
-diff --git a/Makefile.am b/Makefile.am<br>
-index 37c1cc2..5861976 100644<br>
---- a/Makefile.am<br>
-+++ b/Makefile.am<br>
-@@ -2956,7 +2956,7 @@ systemd_readahead_SOURCES = \<br>
- systemd_readahead_LDADD = \<br>
- <a href="http://libsystemd-shared.la" target="_blank">libsystemd-shared.la</a> \<br>
- <a href="http://libsystemd-daemon.la" target="_blank">libsystemd-daemon.la</a> \<br>
-- <a href="http://libudev.la" target="_blank">libudev.la</a><br>
-+ <a href="http://libudev.la" target="_blank">libudev.la</a> -lm<br>
-<br>
- dist_doc_DATA += \<br>
- src/readahead/sd-readahead.c \<br>
-diff --git a/src/readahead/readahead-<u></u>collect.c b/src/readahead/readahead-<u></u>collect.c<br>
-index 5d07f47..5d22949 100644<br>
---- a/src/readahead/readahead-<u></u>collect.c<br>
-+++ b/src/readahead/readahead-<u></u>collect.c<br>
-@@ -42,6 +42,7 @@<br>
- #include <sys/vfs.h><br>
- #include <getopt.h><br>
- #include <sys/inotify.h><br>
-+#include <math.h><br>
-<br>
- #ifdef HAVE_FANOTIFY_INIT<br>
- #include <sys/fanotify.h><br>
-@@ -67,6 +68,7 @@<br>
- */<br>
-<br>
- static ReadaheadShared *shared = NULL;<br>
-+static struct timespec starttime;<br>
-<br>
- /* Avoid collisions with the NULL pointer */<br>
- #define SECTOR_TO_PTR(s) ULONG_TO_PTR((s)+1)<br>
-@@ -205,6 +207,7 @@ static unsigned long fd_first_block(int fd) {<br>
- struct item {<br>
- const char *path;<br>
- unsigned long block;<br>
-+ unsigned long bin;<br>
- };<br>
-<br>
- static int qsort_compare(const void *a, const void *b) {<br>
-@@ -213,6 +216,13 @@ static int qsort_compare(const void *a, const void *b) {<br>
- i = a;<br>
- j = b;<br>
-<br>
-+ /* sort by bin first */<br>
-+ if (i->bin < j->bin)<br>
-+ return -1;<br>
-+ if (i->bin > j->bin)<br>
-+ return 1;<br>
-+<br>
-+ /* then sort by sector */<br>
- if (i->block < j->block)<br>
- return -1;<br>
- if (i->block > j->block)<br>
-@@ -250,6 +260,8 @@ static int collect(const char *root) {<br>
- goto finish;<br>
- }<br>
-<br>
-+ clock_gettime(CLOCK_MONOTONIC, &starttime);<br>
-+<br>
- /* If there's no pack file yet we lower the kernel readahead<br>
- * so that mincore() is accurate. If there is a pack file<br>
- * already we assume it is accurate enough so that kernel<br>
-@@ -447,10 +459,21 @@ static int collect(const char *root) {<br>
- free(p);<br>
- else {<br>
- unsigned long ul;<br>
-+ struct timespec ts;<br>
-+ struct item *entry;<br>
-+<br>
-+ entry = new0(struct item, 1);<br>
-<br>
- ul = fd_first_block(m->fd);<br>
-<br>
-- if ((k = hashmap_put(files, p, SECTOR_TO_PTR(ul))) < 0) {<br>
-+ clock_gettime(CLOCK_MONOTONIC, &ts);<br>
-+<br>
-+ entry->block = ul;<br>
-+ entry->path = strdup(p);<br>
-+ entry->bin = round((ts.tv_sec - starttime.tv_sec +<br>
-+ ((ts.tv_nsec - starttime.tv_nsec) / 1000000000.0)) / 2.0);<br>
-+<br>
-+ if ((k = hashmap_put(files, p, entry)) < 0) {<br>
- log_warning("set_put() failed: %s", strerror(-k));<br>
- free(p);<br>
- }<br>
-@@ -518,8 +541,7 @@ done:<br>
-<br>
- j = ordered;<br>
- HASHMAP_FOREACH_KEY(q, p, files, i) {<br>
-- j->path = p;<br>
-- j->block = PTR_TO_SECTOR(q);<br>
-+ memcpy(j, q, sizeof(struct item));<br>
- j++;<br>
- }<br>
-<br>
---<br>
-1.7.9.5<br>
-<br>
diff --git a/meta/recipes-core/systemd/<u></u>systemd/0003-readahead-<u></u>cleanups.patch b/meta/recipes-core/systemd/<u></u>systemd/0003-readahead-<u></u>cleanups.patch<br>
deleted file mode 100644<br>
index e0b68df..0000000<br>
--- a/meta/recipes-core/systemd/<u></u>systemd/0003-readahead-<u></u>cleanups.patch<br>
+++ /dev/null<br>
@@ -1,86 +0,0 @@<br>
-Upstream-Status: Backport<br>
-<br>
--Khem 2013/03/28<br>
-<br>
-From b0640287f784a320661f7206c9ade0<u></u>7b99003fd5 Mon Sep 17 00:00:00 2001<br>
-From: Auke Kok <<a href="mailto:auke-jan.h.kok@intel.com" target="_blank">auke-jan.h.kok@intel.com</a>><br>
-Date: Tue, 26 Mar 2013 11:13:47 -0700<br>
-Subject: [PATCH 03/17] readahead: cleanups<br>
-<br>
-- check for OOM<br>
-- no need to use floats and round()<br>
----<br>
- Makefile.am | 2 +-<br>
- src/readahead/readahead-<u></u>collect.c | 20 ++++++++++++++------<br>
- 2 files changed, 15 insertions(+), 7 deletions(-)<br>
-<br>
-diff --git a/Makefile.am b/Makefile.am<br>
-index 5861976..37c1cc2 100644<br>
---- a/Makefile.am<br>
-+++ b/Makefile.am<br>
-@@ -2956,7 +2956,7 @@ systemd_readahead_SOURCES = \<br>
- systemd_readahead_LDADD = \<br>
- <a href="http://libsystemd-shared.la" target="_blank">libsystemd-shared.la</a> \<br>
- <a href="http://libsystemd-daemon.la" target="_blank">libsystemd-daemon.la</a> \<br>
-- <a href="http://libudev.la" target="_blank">libudev.la</a> -lm<br>
-+ <a href="http://libudev.la" target="_blank">libudev.la</a><br>
-<br>
- dist_doc_DATA += \<br>
- src/readahead/sd-readahead.c \<br>
-diff --git a/src/readahead/readahead-<u></u>collect.c b/src/readahead/readahead-<u></u>collect.c<br>
-index 5d22949..e2fd8df 100644<br>
---- a/src/readahead/readahead-<u></u>collect.c<br>
-+++ b/src/readahead/readahead-<u></u>collect.c<br>
-@@ -68,7 +68,7 @@<br>
- */<br>
-<br>
- static ReadaheadShared *shared = NULL;<br>
--static struct timespec starttime;<br>
-+static usec_t starttime;<br>
-<br>
- /* Avoid collisions with the NULL pointer */<br>
- #define SECTOR_TO_PTR(s) ULONG_TO_PTR((s)+1)<br>
-@@ -260,7 +260,7 @@ static int collect(const char *root) {<br>
- goto finish;<br>
- }<br>
-<br>
-- clock_gettime(CLOCK_MONOTONIC, &starttime);<br>
-+ starttime = now(CLOCK_MONOTONIC);<br>
-<br>
- /* If there's no pack file yet we lower the kernel readahead<br>
- * so that mincore() is accurate. If there is a pack file<br>
-@@ -459,19 +459,27 @@ static int collect(const char *root) {<br>
- free(p);<br>
- else {<br>
- unsigned long ul;<br>
-- struct timespec ts;<br>
-+ usec_t entrytime;<br>
- struct item *entry;<br>
-<br>
- entry = new0(struct item, 1);<br>
-+ if (!entry) {<br>
-+ r = log_oom();<br>
-+ goto finish;<br>
-+ }<br>
-<br>
- ul = fd_first_block(m->fd);<br>
-<br>
-- clock_gettime(CLOCK_MONOTONIC, &ts);<br>
-+ entrytime = now(CLOCK_MONOTONIC);<br>
-<br>
- entry->block = ul;<br>
- entry->path = strdup(p);<br>
-- entry->bin = round((ts.tv_sec - starttime.tv_sec +<br>
-- ((ts.tv_nsec - starttime.tv_nsec) / 1000000000.0)) / 2.0);<br>
-+ if (!entry->path) {<br>
-+ free(entry);<br>
-+ r = log_oom();<br>
-+ goto finish;<br>
-+ }<br>
-+ entry->bin = (entrytime - starttime) / 2000000;<br>
-<br>
- if ((k = hashmap_put(files, p, entry)) < 0) {<br>
- log_warning("set_put() failed: %s", strerror(-k));<br>
---<br>
-1.7.9.5<br>
-<br>
diff --git a/meta/recipes-core/systemd/<u></u>systemd/0013-systemd-sysctl-<u></u>Handle-missing-etc-sysctl.<u></u>conf-proper.patch b/meta/recipes-core/systemd/<u></u>systemd/0013-systemd-sysctl-<u></u>Handle-missing-etc-sysctl.<u></u>conf-proper.patch<br>
deleted file mode 100644<br>
index f2c8e02..0000000<br>
--- a/meta/recipes-core/systemd/<u></u>systemd/0013-systemd-sysctl-<u></u>Handle-missing-etc-sysctl.<u></u>conf-proper.patch<br>
+++ /dev/null<br>
@@ -1,33 +0,0 @@<br>
-Upstream-Status: Backport<br>
-<br>
--Khem 2013/03/28<br>
-<br>
-From 6f6fad96addf6b00b55c98cc0d0d80<u></u>26b0c1e7ca Mon Sep 17 00:00:00 2001<br>
-From: Eelco Dolstra <<a href="mailto:eelco.dolstra@logicblox.com" target="_blank">eelco.dolstra@logicblox.com</a>><br>
-Date: Wed, 27 Mar 2013 13:41:59 +0100<br>
-Subject: [PATCH 13/17] systemd-sysctl: Handle missing /etc/sysctl.conf<br>
- properly<br>
-<br>
-Since fabe5c0e5fce730aa66e10a9c4f9fd<u></u>d443d7aeda, systemd-sysctl returns<br>
-a non-zero exit code if /etc/sysctl.conf does not exist, due to a<br>
-broken ENOENT check.<br>
----<br>
- src/sysctl/sysctl.c | 2 +-<br>
- 1 file changed, 1 insertion(+), 1 deletion(-)<br>
-<br>
-diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c<br>
-index 2d43660..79f3f77 100644<br>
---- a/src/sysctl/sysctl.c<br>
-+++ b/src/sysctl/sysctl.c<br>
-@@ -125,7 +125,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno<br>
-<br>
- r = search_and_fopen_nulstr(path, "re", conf_file_dirs, &f);<br>
- if (r < 0) {<br>
-- if (ignore_enoent && errno == -ENOENT)<br>
-+ if (ignore_enoent && r == -ENOENT)<br>
- return 0;<br>
-<br>
- log_error("Failed to open file '%s', ignoring: %s", path, strerror(-r));<br>
---<br>
-1.7.9.5<br>
-<br>
diff --git a/meta/recipes-core/systemd/<u></u>systemd/199-firmware.patch b/meta/recipes-core/systemd/<u></u>systemd/199-firmware.patch<br>
deleted file mode 100644<br>
index aaab59b..0000000<br>
--- a/meta/recipes-core/systemd/<u></u>systemd/199-firmware.patch<br>
+++ /dev/null<br>
@@ -1,98 +0,0 @@<br>
-Upstream-Status: Backport<br>
-<a href="http://cgit.freedesktop.org/systemd/systemd/patch/?id=d8d4bee76cf3b40ea923bc57d44aa0815ca9b5ff" target="_blank">http://cgit.freedesktop.org/<u></u>systemd/systemd/patch/?id=<u></u>d8d4bee76cf3b40ea923bc57d44aa0<u></u>815ca9b5ff</a><br>
-<br>
-From d8d4bee76cf3b40ea923bc57d44aa0<u></u>815ca9b5ff Mon Sep 17 00:00:00 2001<br>
-From: Kay Sievers <<a href="mailto:kay@vrfy.org" target="_blank">kay@vrfy.org</a>><br>
-Date: Thu, 28 Mar 2013 14:28:10 +0000<br>
-Subject: build-sys: fix HAVE/ENABLE_FIRMWARE<br>
-<br>
-<a href="https://bugs.freedesktop.org/show_bug.cgi?id=62864" target="_blank">https://bugs.freedesktop.org/<u></u>show_bug.cgi?id=62864</a><br>
----<br>
-diff --git a/<a href="http://configure.ac" target="_blank">configure.ac</a> b/<a href="http://configure.ac" target="_blank">configure.ac</a><br>
-index 5b88bcf..e73cd5c 100644<br>
---- a/<a href="http://configure.ac" target="_blank">configure.ac</a><br>
-+++ b/<a href="http://configure.ac" target="_blank">configure.ac</a><br>
-@@ -728,6 +728,7 @@ for i in $with_firmware_path; do<br>
- done<br>
- IFS=$OLD_IFS<br>
- AC_SUBST(FIRMWARE_PATH)<br>
-+AS_IF([test "x${FIRMWARE_PATH}" != "x"], [ AC_DEFINE(HAVE_FIRMWARE, 1, [Define if FIRMWARE is available]) ])<br>
- AM_CONDITIONAL(ENABLE_<u></u>FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"])<br>
-<br>
- # ------------------------------<u></u>------------------------------<u></u>------------------<br>
-@@ -736,7 +737,6 @@ AC_ARG_ENABLE([gudev],<br>
- [], [enable_gudev=yes])<br>
- AS_IF([test "x$enable_gudev" = "xyes"], [ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 gio-2.0]) ])<br>
- AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"])<br>
--<br>
- AS_IF([test "x$enable_gudev" = "xyes"], [ AC_DEFINE(HAVE_GLIB, 1, [Define if glib is available]) ])<br>
-<br>
- # ------------------------------<u></u>------------------------------<u></u>------------------<br>
-diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c<br>
-index 13922d3..c7d4319 100644<br>
---- a/src/udev/udev-builtin.c<br>
-+++ b/src/udev/udev-builtin.c<br>
-@@ -34,7 +34,7 @@ static const struct udev_builtin *builtins[] = {<br>
- [UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,<br>
- #endif<br>
- [UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,<br>
--#ifdef ENABLE_FIRMWARE<br>
-+#ifdef HAVE_FIRMWARE<br>
- [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,<br>
- #endif<br>
- [UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,<br>
-diff --git a/src/udev/udev.h b/src/udev/udev.h<br>
-index aa2edbe..906dfba 100644<br>
---- a/src/udev/udev.h<br>
-+++ b/src/udev/udev.h<br>
-@@ -140,7 +140,7 @@ enum udev_builtin_cmd {<br>
- UDEV_BUILTIN_BLKID,<br>
- #endif<br>
- UDEV_BUILTIN_BTRFS,<br>
--#ifdef ENABLE_FIRMWARE<br>
-+#ifdef HAVE_FIRMWARE<br>
- UDEV_BUILTIN_FIRMWARE,<br>
- #endif<br>
- UDEV_BUILTIN_HWDB,<br>
-@@ -169,7 +169,7 @@ struct udev_builtin {<br>
- extern const struct udev_builtin udev_builtin_blkid;<br>
- #endif<br>
- extern const struct udev_builtin udev_builtin_btrfs;<br>
--#ifdef ENABLE_FIRMWARE<br>
-+#ifdef HAVE_FIRMWARE<br>
- extern const struct udev_builtin udev_builtin_firmware;<br>
- #endif<br>
- extern const struct udev_builtin udev_builtin_hwdb;<br>
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c<br>
-index b30bedf..2ad7388 100644<br>
---- a/src/udev/udevd.c<br>
-+++ b/src/udev/udevd.c<br>
-@@ -98,7 +98,7 @@ struct event {<br>
- dev_t devnum;<br>
- int ifindex;<br>
- bool is_block;<br>
--#ifdef ENABLE_FIRMWARE<br>
-+#ifdef HAVE_FIRMWARE<br>
- bool nodelay;<br>
- #endif<br>
- };<br>
-@@ -444,7 +444,7 @@ static int event_queue_insert(struct udev_device *dev)<br>
- event->devnum = udev_device_get_devnum(dev);<br>
- event->is_block = streq("block", udev_device_get_subsystem(dev)<u></u>);<br>
- event->ifindex = udev_device_get_ifindex(dev);<br>
--#ifdef ENABLE_FIRMWARE<br>
-+#ifdef HAVE_FIRMWARE<br>
- if (streq(udev_device_get_<u></u>subsystem(dev), "firmware"))<br>
- event->nodelay = true;<br>
- #endif<br>
-@@ -527,7 +527,7 @@ static bool is_devpath_busy(struct event *event)<br>
- return true;<br>
- }<br>
-<br>
--#ifdef ENABLE_FIRMWARE<br>
-+#ifdef HAVE_FIRMWARE<br>
- /* allow to bypass the dependency tracking */<br>
- if (event->nodelay)<br>
- continue;<br>
---<br>
-cgit v0.9.0.2-2-gbebe<br>
diff --git a/meta/recipes-core/systemd/<a href="http://systemd_199.bb" target="_blank">sy<u></u>stemd_199.bb</a> b/meta/recipes-core/systemd/<a href="http://systemd_204.bb" target="_blank">sy<u></u>stemd_204.bb</a><br>
similarity index 95%<br>
rename from meta/recipes-core/systemd/<a href="http://systemd_199.bb" target="_blank">syst<u></u>emd_199.bb</a><br>
rename to meta/recipes-core/systemd/<a href="http://systemd_204.bb" target="_blank">syst<u></u>emd_204.bb</a><br>
index b8da27e..74cd3c8 100644<br>
--- a/meta/recipes-core/systemd/<a href="http://systemd_199.bb" target="_blank">sy<u></u>stemd_199.bb</a><br>
+++ b/meta/recipes-core/systemd/<a href="http://systemd_204.bb" target="_blank">sy<u></u>stemd_204.bb</a><br>
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=<u></u>751419260aa954499f7abaabaa882b<u></u>be \<br>
PROVIDES = "udev"<br>
<br>
PE = "1"<br>
-PR = "r4"<br>
<br>
DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0 qemu-native"<br>
DEPENDS += "${@base_contains('DISTRO_<u></u>FEATURES', 'pam', 'libpam', '', d)}"<br>
@@ -22,16 +21,12 @@ SRC_URI = "<a href="http://www.freedesktop.org/software/systemd/systemd-$%7BPV%7D.tar.xz" target="_blank">http://www.freedesktop.org/<u></u>software/systemd/systemd-${PV}<u></u>.tar.xz</a> \<br>
file://touchscreen.rules \<br>
file://modprobe.rules \<br>
${UCLIBCPATCHES} \<br>
+ file://0001-utmp-turn-systemd-<u></u>update-utmp-shutdown.service-<u></u>into-.patch \<br>
file://00-create-volatile.conf \<br>
- file://0002-readahead-chunk-<u></u>on-spinning-media.patch \<br>
- file://0003-readahead-<u></u>cleanups.patch \<br>
- file://0013-systemd-sysctl-<u></u>Handle-missing-etc-sysctl.<u></u>conf-proper.patch \<br>
- file://0001-configure-use-AC_<u></u>CHECK_TOOL-for-objcopy-<u></u>strings-and-.patch \<br>
- file://199-firmware.patch \<br>
file://init \<br>
"<br>
-SRC_URI[md5sum] = "<u></u>4bb13f84ce211e93f0141774a90a23<u></u>22"<br>
-SRC_URI[sha256sum] = "<u></u>8c4462a04f3ecf7f083782e5e06879<u></u>13b1d33c6444bf20fa2f31df922296<u></u>5fed"<br>
+SRC_URI[md5sum] = "<u></u>a07619bb19f48164fbf0761d12fd39<u></u>a8"<br>
+SRC_URI[sha256sum] = "<u></u>072c393503c7c1e55ca7acf3db659c<u></u>bd28c7fe5fa94fab3db95360bafd96<u></u>731b"<br>
<br>
UCLIBCPATCHES = ""<br>
UCLIBCPATCHES_libc-uclibc = "file://systemd-pam-configure-<u></u>check-uclibc.patch \<br>
<br>
</blockquote>
</div></div></blockquote></div><br></div></div>