<p dir="ltr"></p>
<p dir="ltr">-Khem<br>
On Mar 4, 2014 11:21 AM, "Saul Wold" <<a href="mailto:sgw@linux.intel.com">sgw@linux.intel.com</a>> wrote:<br>
><br>
> On 03/02/2014 08:00 PM, Khem Raj wrote:<br>
>><br>
>> Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
>> ---<br>
>> ...-Use-bin-mkdir-instead-of-host-mkdir-path.patch | 31 --------<br>
>> ...ournal-Add-missing-byte-order-conversions.patch | 60 ----------------<br>
>> .../journal-file-protect-against-alloca-0.patch | 23 ------<br>
>> ...n-appending-to-journal-file-allocate-larg.patch | 83 ----------------------<br>
>> .../systemd/journald-add-missing-error-check.patch | 16 -----<br>
>> .../systemd/journald-fix-minor-memory-leak.patch | 16 -----<br>
>> .../systemd/systemd-pam-fix-fallocate.patch | 24 +++----<br>
>> meta/recipes-core/systemd/<a href="http://systemd_208.bb">systemd_208.bb</a> | 17 ++---<br>
>> 8 files changed, 19 insertions(+), 251 deletions(-)<br>
>> delete mode 100644 meta/recipes-core/systemd/systemd/0001-Use-bin-mkdir-instead-of-host-mkdir-path.patch<br>
>> delete mode 100644 meta/recipes-core/systemd/systemd/journal-Add-missing-byte-order-conversions.patch<br>
>> delete mode 100644 meta/recipes-core/systemd/systemd/journal-file-protect-against-alloca-0.patch<br>
>> delete mode 100644 meta/recipes-core/systemd/systemd/journal-when-appending-to-journal-file-allocate-larg.patch<br>
>> delete mode 100644 meta/recipes-core/systemd/systemd/journald-add-missing-error-check.patch<br>
>> delete mode 100644 meta/recipes-core/systemd/systemd/journald-fix-minor-memory-leak.patch<br>
>><br>
><br>
> This still has an issue with ptest enabled<br></p>
<p dir="ltr">yes came from a different branch let me port that fix into this patch and prepare a v2<br></p>
<p dir="ltr">> install /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/Makefile /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/README.testsuite /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/TEST-01-BASIC /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/TEST-02-CRYPTSETUP /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/TEST-03-JOBS /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/a.service /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/b.service /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/c.service /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/d.service /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/e.service /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/end.service /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/f.service /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/g.service /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/h.service /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/hello-after-sleep.target /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/hello.service /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/rule-syntax-check.py /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/rules-test.sh /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/sched_idle_bad.service /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/sched_idle_ok.service /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/sched_rr_bad.service /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/sched_rr_change.service /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/sched_rr_ok.service /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/sleep.service /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/sys.tar.xz /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/test-functions /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/testsuite.target /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/<a href="http://udev-test.pl">udev-test.pl</a> /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/git/test/unstoppable.service /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/image/usr/lib/systemd/ptest/test<br>
> ERROR: Function failed: do_install_ptest_base (log file is located at /srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/systemd/1_208+gitAUTOINC+255eb046a7-r0/temp/log.do_install_ptest_base.9647)<br>
><br>
> Thanks<br>
> Sau!<br>
><br>
><br>
><br>
>> diff --git a/meta/recipes-core/systemd/systemd/0001-Use-bin-mkdir-instead-of-host-mkdir-path.patch b/meta/recipes-core/systemd/systemd/0001-Use-bin-mkdir-instead-of-host-mkdir-path.patch<br>
>> deleted file mode 100644<br>
>> index 25988fc..0000000<br>
>> --- a/meta/recipes-core/systemd/systemd/0001-Use-bin-mkdir-instead-of-host-mkdir-path.patch<br>
>> +++ /dev/null<br>
>> @@ -1,31 +0,0 @@<br>
>> -From 5599ab4ae3fe74cdd9699f2874badf241f0148fe Mon Sep 17 00:00:00 2001<br>
>> -From: Jonathan Liu <<a href="mailto:net147@gmail.com">net147@gmail.com</a>><br>
>> -Date: Wed, 28 Aug 2013 19:09:49 -0700<br>
>> -Subject: [PATCH] Use /bin/mkdir instead of host mkdir path<br>
>> -<br>
>> -If the host system has /usr/bin/mkdir, autoconf would set MKDIR_P to<br>
>> -/usr/bin/mkdir when it should be /bin/mkdir. As a result, the<br>
>> -kmod-static-nodes service fails to start on the target because<br>
>> -/usr/bin/mkdir doesn't exist. This has been observed when building<br>
>> -systemd on Arch Linux host.<br>
>> -<br>
>> -Upstream-Status: Inappropriate [embedded specific]<br>
>> -Signed-off-by: Jonathan Liu <<a href="mailto:net147@gmail.com">net147@gmail.com</a>><br>
>> ----<br>
>> - units/<a href="http://kmod-static-nodes.service.in">kmod-static-nodes.service.in</a> | 2 +-<br>
>> - 1 file changed, 1 insertion(+), 1 deletion(-)<br>
>> -<br>
>> -diff --git a/units/<a href="http://kmod-static-nodes.service.in">kmod-static-nodes.service.in</a> b/units/<a href="http://kmod-static-nodes.service.in">kmod-static-nodes.service.in</a><br>
>> -index d8a8420..1daed5f 100644<br>
>> ---- a/units/<a href="http://kmod-static-nodes.service.in">kmod-static-nodes.service.in</a><br>
>> -+++ b/units/<a href="http://kmod-static-nodes.service.in">kmod-static-nodes.service.in</a><br>
>> -@@ -14,5 +14,5 @@ ConditionCapability=CAP_MKNOD<br>
>> - [Service]<br>
>> - Type=oneshot<br>
>> - RemainAfterExit=yes<br>
>> --ExecStartPre=@MKDIR_P@ /run/tmpfiles.d<br>
>> -+ExecStartPre=/bin/mkdir -p /run/tmpfiles.d<br>
>> - ExecStart=@KMOD@ static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf<br>
>> ---<br>
>> -1.8.3.4<br>
>> -<br>
>> diff --git a/meta/recipes-core/systemd/systemd/journal-Add-missing-byte-order-conversions.patch b/meta/recipes-core/systemd/systemd/journal-Add-missing-byte-order-conversions.patch<br>
>> deleted file mode 100644<br>
>> index 21ea0f9..0000000<br>
>> --- a/meta/recipes-core/systemd/systemd/journal-Add-missing-byte-order-conversions.patch<br>
>> +++ /dev/null<br>
>> @@ -1,60 +0,0 @@<br>
>> -From 43539d6b60ef0db3e98d00bef0024614c8c1807a Mon Sep 17 00:00:00 2001<br>
>> -From: George McCollister <<a href="mailto:george.mccollister@gmail.com">george.mccollister@gmail.com</a>><br>
>> -Date: Tue, 31 Dec 2013 14:37:32 -0600<br>
>> -Subject: [PATCH] journal: Add missing byte order conversions<br>
>> -<br>
>> -Convert entry_array.items[0] to host byte order prior to passing it to<br>
>> -chain_cache_put().<br>
>> -<br>
>> -[zj: also use le64toh in journal-verify.c]<br>
>> -<br>
>> -<a href="https://bugs.freedesktop.org/show_bug.cgi?id=73194">https://bugs.freedesktop.org/show_bug.cgi?id=73194</a><br>
>> -<br>
>> -Upstream-Status: Backport [Fedora]<br>
>> ----<br>
>> - src/journal/journal-file.c | 4 ++--<br>
>> - src/journal/journal-verify.c | 6 +++---<br>
>> - 2 files changed, 5 insertions(+), 5 deletions(-)<br>
>> -<br>
>> -Index: systemd-208/src/journal/journal-file.c<br>
>> -===================================================================<br>
>> ---- systemd-208.orig/src/journal/journal-file.c 2014-02-07 22:51:44.000000000 -0800<br>
>> -+++ systemd-208/src/journal/journal-file.c 2014-02-07 22:58:40.665062951 -0800<br>
>> -@@ -1447,7 +1447,7 @@<br>
>> -<br>
>> - found:<br>
>> - /* Let's cache this item for the next invocation */<br>
>> -- chain_cache_put(f->chain_cache, ci, first, a, o->entry_array.items[0], t);<br>
>> -+ chain_cache_put(f->chain_cache, ci, first, a, le64toh(o->entry_array.items[0]), t);<br>
>> -<br>
>> - r = journal_file_move_to_object(f, OBJECT_ENTRY, p, &o);<br>
>> - if (r < 0)<br>
>> -@@ -1624,7 +1624,7 @@<br>
>> - return 0;<br>
>> -<br>
>> - /* Let's cache this item for the next invocation */<br>
>> -- chain_cache_put(f->chain_cache, ci, first, a, array->entry_array.items[0], t);<br>
>> -+ chain_cache_put(f->chain_cache, ci, first, a, le64toh(array->entry_array.items[0]), t);<br>
>> -<br>
>> - if (subtract_one && i == 0)<br>
>> - p = last_p;<br>
>> -Index: systemd-208/src/journal/journal-verify.c<br>
>> -===================================================================<br>
>> ---- systemd-208.orig/src/journal/journal-verify.c 2013-08-13 13:02:46.000000000 -0700<br>
>> -+++ systemd-208/src/journal/journal-verify.c 2014-02-07 22:57:14.849308409 -0800<br>
>> -@@ -249,12 +249,12 @@<br>
>> - }<br>
>> -<br>
>> - for (i = 0; i < journal_file_entry_array_n_items(o); i++)<br>
>> -- if (o->entry_array.items[i] != 0 &&<br>
>> -- !VALID64(o->entry_array.items[i])) {<br>
>> -+ if (le64toh(o->entry_array.items[i]) != 0 &&<br>
>> -+ !VALID64(le64toh(o->entry_array.items[i]))) {<br>
>> - log_error(OFSfmt": invalid object entry array item (%"PRIu64"/%"PRIu64"): "OFSfmt,<br>
>> - offset,<br>
>> - i, journal_file_entry_array_n_items(o),<br>
>> -- o->entry_array.items[i]);<br>
>> -+ le64toh(o->entry_array.items[i]));<br>
>> - return -EBADMSG;<br>
>> - }<br>
>> -<br>
>> diff --git a/meta/recipes-core/systemd/systemd/journal-file-protect-against-alloca-0.patch b/meta/recipes-core/systemd/systemd/journal-file-protect-against-alloca-0.patch<br>
>> deleted file mode 100644<br>
>> index 953373e..0000000<br>
>> --- a/meta/recipes-core/systemd/systemd/journal-file-protect-against-alloca-0.patch<br>
>> +++ /dev/null<br>
>> @@ -1,23 +0,0 @@<br>
>> -From a25fd0d4bd3cf652e55c24e7dc873fe530fa111a Mon Sep 17 00:00:00 2001<br>
>> -From: Thomas Hindoe Paaboel Andersen <<a href="mailto:phomes@gmail.com">phomes@gmail.com</a>><br>
>> -Date: Mon, 16 Dec 2013 23:35:30 +0100<br>
>> -Subject: [PATCH] journal-file: protect against alloca(0)<br>
>> -<br>
>> ----<br>
>> - src/journal/journal-file.c | 3 ++-<br>
>> - 1 file changed, 2 insertions(+), 1 deletion(-)<br>
>> -<br>
>> -diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c<br>
>> -index 090cf97..8ea258b 100644<br>
>> ---- a/src/journal/journal-file.c<br>
>> -+++ b/src/journal/journal-file.c<br>
>> -@@ -2737,7 +2737,8 @@ int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint6<br>
>> - ts.realtime = le64toh(o->entry.realtime);<br>
>> -<br>
>> - n = journal_file_entry_n_items(o);<br>
>> -- items = alloca(sizeof(EntryItem) * n);<br>
>> -+ /* alloca() can't take 0, hence let's allocate at least one */<br>
>> -+ items = alloca(sizeof(EntryItem) * MAX(1u, n));<br>
>> -<br>
>> - for (i = 0; i < n; i++) {<br>
>> - uint64_t l, h;<br>
>> diff --git a/meta/recipes-core/systemd/systemd/journal-when-appending-to-journal-file-allocate-larg.patch b/meta/recipes-core/systemd/systemd/journal-when-appending-to-journal-file-allocate-larg.patch<br>
>> deleted file mode 100644<br>
>> index 89573bb..0000000<br>
>> --- a/meta/recipes-core/systemd/systemd/journal-when-appending-to-journal-file-allocate-larg.patch<br>
>> +++ /dev/null<br>
>> @@ -1,83 +0,0 @@<br>
>> -From c0658e1948c301177b1527227be0c18932cd7cce Mon Sep 17 00:00:00 2001<br>
>> -From: Lennart Poettering <<a href="mailto:lennart@poettering.net">lennart@poettering.net</a>><br>
>> -Date: Tue, 26 Nov 2013 18:39:42 +0100<br>
>> -Subject: [PATCH] journal: when appending to journal file, allocate larger<br>
>> - blocks at once<br>
>> -<br>
>> -(cherry picked from commit a676e66535e12458ea6d366a653f8dd60f982504)<br>
>> -<br>
>> -Conflicts:<br>
>> - src/journal/journal-file.c<br>
>> ----<br>
>> - src/journal/journal-file.c | 26 +++++++++++++++++---------<br>
>> - 1 file changed, 17 insertions(+), 9 deletions(-)<br>
>> -<br>
>> -Upstream-Status: Backport<br>
>> -<br>
>> -Index: systemd-208/src/journal/journal-file.c<br>
>> -===================================================================<br>
>> ---- systemd-208.orig/src/journal/journal-file.c 2014-02-07 22:37:06.013722798 -0800<br>
>> -+++ systemd-208/src/journal/journal-file.c 2014-02-07 22:44:51.563341090 -0800<br>
>> -@@ -68,6 +68,9 @@<br>
>> - /* How many entries to keep in the entry array chain cache at max */<br>
>> - #define CHAIN_CACHE_MAX 20<br>
>> -<br>
>> -+/* How much to increase the journal file size at once each time we allocate something new. */<br>
>> -+#define FILE_SIZE_INCREASE (8ULL*1024ULL*1024ULL) /* 8MB */<br>
>> -+<br>
>> - int journal_file_set_online(JournalFile *f) {<br>
>> - assert(f);<br>
>> -<br>
>> -@@ -218,8 +221,7 @@<br>
>> - journal_file_set_online(f);<br>
>> -<br>
>> - /* Sync the online state to disk */<br>
>> -- msync(f->header, PAGE_ALIGN(sizeof(Header)), MS_SYNC);<br>
>> -- fdatasync(f->fd);<br>
>> -+ fsync(f->fd);<br>
>> -<br>
>> - return 0;<br>
>> - }<br>
>> -@@ -313,7 +315,7 @@<br>
>> - }<br>
>> -<br>
>> - static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) {<br>
>> -- uint64_t old_size, new_size;<br>
>> -+ uint64_t old_size, new_size, file_size;<br>
>> - int r;<br>
>> -<br>
>> - assert(f);<br>
>> -@@ -333,12 +335,10 @@<br>
>> - if (new_size <= old_size)<br>
>> - return 0;<br>
>> -<br>
>> -- if (f->metrics.max_size > 0 &&<br>
>> -- new_size > f->metrics.max_size)<br>
>> -+ if (f->metrics.max_size > 0 && new_size > f->metrics.max_size)<br>
>> - return -E2BIG;<br>
>> -<br>
>> -- if (new_size > f->metrics.min_size &&<br>
>> -- f->metrics.keep_free > 0) {<br>
>> -+ if (new_size > f->metrics.min_size && f->metrics.keep_free > 0) {<br>
>> - struct statvfs svfs;<br>
>> -<br>
>> - if (fstatvfs(f->fd, &svfs) >= 0) {<br>
>> -@@ -363,8 +363,16 @@<br>
>> - if (r != 0)<br>
>> - return -r;<br>
>> -<br>
>> -- if (fstat(f->fd, &f->last_stat) < 0)<br>
>> -- return -errno;<br>
>> -+ /* Increase the file size a bit further than this, so that we<br>
>> -+ * we can create larger memory maps to cache */<br>
>> -+ file_size = ((new_size+FILE_SIZE_INCREASE-1) / FILE_SIZE_INCREASE) * FILE_SIZE_INCREASE;<br>
>> -+ if (file_size > (uint64_t) f->last_stat.st_size) {<br>
>> -+ if (file_size > new_size)<br>
>> -+ ftruncate(f->fd, file_size);<br>
>> -+<br>
>> -+ if (fstat(f->fd, &f->last_stat) < 0)<br>
>> -+ return -errno;<br>
>> -+ }<br>
>> -<br>
>> - f->header->arena_size = htole64(new_size - le64toh(f->header->header_size));<br>
>> -<br>
>> diff --git a/meta/recipes-core/systemd/systemd/journald-add-missing-error-check.patch b/meta/recipes-core/systemd/systemd/journald-add-missing-error-check.patch<br>
>> deleted file mode 100644<br>
>> index 10590e1..0000000<br>
>> --- a/meta/recipes-core/systemd/systemd/journald-add-missing-error-check.patch<br>
>> +++ /dev/null<br>
>> @@ -1,16 +0,0 @@<br>
>> -Upstream-Status: Backport [Fedora]<br>
>> -<br>
>> -Index: systemd-208/src/journal/journal-file.c<br>
>> -===================================================================<br>
>> ---- systemd-208.orig/src/journal/journal-file.c 2013-08-13 13:02:46.397707086 -0700<br>
>> -+++ systemd-208/src/journal/journal-file.c 2014-02-07 22:29:01.398794277 -0800<br>
>> -@@ -907,7 +907,8 @@<br>
>> -<br>
>> - osize = offsetof(Object, field.payload) + size;<br>
>> - r = journal_file_append_object(f, OBJECT_FIELD, osize, &o, &p);<br>
>> --<br>
>> -+ if (r < 0)<br>
>> -+ return r;<br>
>> - o->field.hash = htole64(hash);<br>
>> - memcpy(o->field.payload, field, size);<br>
>> -<br>
>> diff --git a/meta/recipes-core/systemd/systemd/journald-fix-minor-memory-leak.patch b/meta/recipes-core/systemd/systemd/journald-fix-minor-memory-leak.patch<br>
>> deleted file mode 100644<br>
>> index 9b90ed2..0000000<br>
>> --- a/meta/recipes-core/systemd/systemd/journald-fix-minor-memory-leak.patch<br>
>> +++ /dev/null<br>
>> @@ -1,16 +0,0 @@<br>
>> -Fix minor memory leak<br>
>> -<br>
>> -Upstream-Status: Backport [Fedora]<br>
>> -<br>
>> -Index: systemd-208/src/journal/journal-vacuum.c<br>
>> -===================================================================<br>
>> ---- systemd-208.orig/src/journal/journal-vacuum.c 2013-09-12 05:51:57.258256643 -0700<br>
>> -+++ systemd-208/src/journal/journal-vacuum.c 2014-02-07 22:35:55.695747001 -0800<br>
>> -@@ -277,6 +277,7 @@<br>
>> - freed += size;<br>
>> - } else if (errno != ENOENT)<br>
>> - log_warning("Failed to delete %s/%s: %m", directory, p);<br>
>> -+ free(p);<br>
>> -<br>
>> - continue;<br>
>> - }<br>
>> diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch b/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch<br>
>> index d1740ef..05223d3 100644<br>
>> --- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch<br>
>> +++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch<br>
>> @@ -1,10 +1,10 @@<br>
>> Upstream-Status: Denied [no desire for uclibc support]<br>
>> Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
>><br>
>> -Index: systemd-208/src/journal/journal-file.c<br>
>> +Index: git/src/journal/journal-file.c<br>
>> ===================================================================<br>
>> ---- systemd-208.orig/src/journal/journal-file.c 2014-02-14 00:05:05.000000000 -0800<br>
>> -+++ systemd-208/src/journal/journal-file.c 2014-02-14 00:08:41.338821677 -0800<br>
>> +--- git.orig/src/journal/journal-file.c 2014-03-02 16:25:38.000000000 -0800<br>
>> ++++ git/src/journal/journal-file.c 2014-03-02 16:27:24.151238740 -0800<br>
>> @@ -38,6 +38,8 @@<br>
>> #include "compress.h"<br>
>> #include "fsprg.h"<br>
>> @@ -17,13 +17,13 @@ Index: systemd-208/src/journal/journal-file.c<br>
>> @@ -316,7 +318,7 @@<br>
>><br>
>> static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) {<br>
>> - uint64_t old_size, new_size, file_size;<br>
>> + uint64_t old_size, new_size;<br>
>> - int r;<br>
>> + int r = 0;<br>
>><br>
>> assert(f);<br>
>><br>
>> -@@ -359,9 +361,24 @@<br>
>> +@@ -364,9 +366,24 @@<br>
>> /* Note that the glibc fallocate() fallback is very<br>
>> inefficient, hence we try to minimize the allocation area<br>
>> as we can. */<br>
>> @@ -46,13 +46,13 @@ Index: systemd-208/src/journal/journal-file.c<br>
>> + return -errno;<br>
>> +#endif /* HAVE_POSIX_FALLOCATE */<br>
>><br>
>> - /* Increase the file size a bit further than this, so that we<br>
>> - * we can create larger memory maps to cache */<br>
>> -Index: systemd-208/src/journal/journald-kmsg.c<br>
>> + if (fstat(f->fd, &f->last_stat) < 0)<br>
>> + return -errno;<br>
>> +Index: git/src/journal/journald-kmsg.c<br>
>> ===================================================================<br>
>> ---- systemd-208.orig/src/journal/journald-kmsg.c 2014-02-14 00:05:05.000000000 -0800<br>
>> -+++ systemd-208/src/journal/journald-kmsg.c 2014-02-14 00:05:47.498823000 -0800<br>
>> -@@ -407,6 +407,7 @@<br>
>> +--- git.orig/src/journal/journald-kmsg.c 2014-03-02 16:25:38.000000000 -0800<br>
>> ++++ git/src/journal/journald-kmsg.c 2014-03-02 16:26:35.419237826 -0800<br>
>> +@@ -408,6 +408,7 @@<br>
>><br>
>> int server_open_kernel_seqnum(Server *s) {<br>
>> int fd;<br>
>> @@ -60,7 +60,7 @@ Index: systemd-208/src/journal/journald-kmsg.c<br>
>> uint64_t *p;<br>
>><br>
>> assert(s);<br>
>> -@@ -420,8 +421,19 @@<br>
>> +@@ -421,8 +422,19 @@<br>
>> log_error("Failed to open /run/systemd/journal/kernel-seqnum, ignoring: %m");<br>
>> return 0;<br>
>> }<br>
>> diff --git a/meta/recipes-core/systemd/<a href="http://systemd_208.bb">systemd_208.bb</a> b/meta/recipes-core/systemd/<a href="http://systemd_208.bb">systemd_208.bb</a><br>
>> index 1bcedaa..6762173 100644<br>
>> --- a/meta/recipes-core/systemd/<a href="http://systemd_208.bb">systemd_208.bb</a><br>
>> +++ b/meta/recipes-core/systemd/<a href="http://systemd_208.bb">systemd_208.bb</a><br>
>> @@ -17,22 +17,20 @@ SECTION = "base/shell"<br>
>><br>
>> inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest<br>
>><br>
>> -SRC_URI = "<a href="http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz">http://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz</a> \<br>
>> - file://0001-Use-bin-mkdir-instead-of-host-mkdir-path.patch \<br>
>> +SRCREV = "255eb046a7bcb90e60a3a54302bc1250c1aed26a"<br>
>> +<br>
>> +PV = "208+git${SRCPV}"<br>
>> +<br>
>> +SRC_URI = "git://<a href="http://anongit.freedesktop.org/systemd/systemd-stable;branch=v208-stable;protocol=git">anongit.freedesktop.org/systemd/systemd-stable;branch=v208-stable;protocol=git</a> \<br>
>> file://binfmt-install.patch \<br>
>> - file://journald-add-missing-error-check.patch \<br>
>> - file://journald-fix-minor-memory-leak.patch \<br>
>> - file://journal-when-appending-to-journal-file-allocate-larg.patch \<br>
>> - file://journal-file-protect-against-alloca-0.patch \<br>
>> - file://journal-Add-missing-byte-order-conversions.patch \<br>
>> file://touchscreen.rules \<br>
>> ${UCLIBCPATCHES} \<br>
>> file://00-create-volatile.conf \<br>
>> file://init \<br>
>> file://run-ptest \<br>
>> "<br>
>> -SRC_URI[md5sum] = "df64550d92afbffb4f67a434193ee165"<br>
>> -SRC_URI[sha256sum] = "aa64fa864466fd5727005c55d61c092828b94b4f857272c0b503695022146390"<br>
>> +<br>
>> +S = "${WORKDIR}/git"<br>
>><br>
>> UCLIBCPATCHES = ""<br>
>> UCLIBCPATCHES_libc-uclibc = "file://systemd-pam-configure-check-uclibc.patch \<br>
>> @@ -76,7 +74,6 @@ EXTRA_OECONF = " --with-rootprefix=${rootprefix} \<br>
>> --disable-manpages \<br>
>> --disable-coredump \<br>
>> --disable-introspection \<br>
>> - --disable-tcpwrap \<br>
>> --enable-split-usr \<br>
>> --without-python \<br>
>> --with-sysvrcnd-path=${sysconfdir} \<br>
>><br>
</p>