summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2014-12-13 00:16:29 +1100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-19 18:08:00 +0000
commit1f41cb64b45472ba01fe6e57f58a71ac23801258 (patch)
tree3172f8ec85ee733caee4ce37c084da7c251855f2 /meta/recipes-core
parentef552b95359a2914f80499bbf3ec7d6d40beaaa8 (diff)
downloadpoky-1f41cb64b45472ba01fe6e57f58a71ac23801258.tar.gz
systemd: backport patch to fix reading journal backwards
(From OE-Core rev: c0650feb6ce7151a22632bab7270002314a1b6be) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/systemd/systemd/0001-journal-Fix-navigating-backwards-missing-entries.patch34
-rw-r--r--meta/recipes-core/systemd/systemd_216.bb1
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-journal-Fix-navigating-backwards-missing-entries.patch b/meta/recipes-core/systemd/systemd/0001-journal-Fix-navigating-backwards-missing-entries.patch
new file mode 100644
index 0000000000..621a0da87c
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0001-journal-Fix-navigating-backwards-missing-entries.patch
@@ -0,0 +1,34 @@
1From 2173cbf847fc53ca24950e77958c902edecfc207 Mon Sep 17 00:00:00 2001
2From: Olivier Brunel <jjk@jjacky.com>
3Date: Fri, 5 Dec 2014 16:06:45 +0100
4Subject: [PATCH] journal: Fix navigating backwards missing entries
5
6With DIRECTION_UP (i.e. navigating backwards) in generic_array_bisect() when the
7needle was found as the last item in the array, it wasn't actually processed as
8match, resulting in entries being missed.
9
10https://bugs.freedesktop.org/show_bug.cgi?id=86855
11
12Upstream-Status: Backport
13
14Signed-off-by: Jonathan Liu <net147@gmail.com>
15---
16 src/journal/journal-file.c | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
20index 7858435..c5d2d19 100644
21--- a/src/journal/journal-file.c
22+++ b/src/journal/journal-file.c
23@@ -1657,7 +1657,7 @@ static int generic_array_bisect(
24 }
25 }
26
27- if (k > n) {
28+ if (k >= n) {
29 if (direction == DIRECTION_UP) {
30 i = n;
31 subtract_one = true;
32--
332.1.3
34
diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_216.bb
index 536b7be25d..eceead9e2c 100644
--- a/meta/recipes-core/systemd/systemd_216.bb
+++ b/meta/recipes-core/systemd/systemd_216.bb
@@ -34,6 +34,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=
34 file://0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch \ 34 file://0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch \
35 file://0001-Make-root-s-home-directory-configurable.patch \ 35 file://0001-Make-root-s-home-directory-configurable.patch \
36 file://0001-systemd-user-avoid-using-system-auth.patch \ 36 file://0001-systemd-user-avoid-using-system-auth.patch \
37 file://0001-journal-Fix-navigating-backwards-missing-entries.patch \
37 file://touchscreen.rules \ 38 file://touchscreen.rules \
38 file://00-create-volatile.conf \ 39 file://00-create-volatile.conf \
39 file://init \ 40 file://init \