diff options
| author | Jonathan Liu <net147@gmail.com> | 2014-12-13 00:16:29 +1100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-19 17:54:13 +0000 |
| commit | c0650feb6ce7151a22632bab7270002314a1b6be (patch) | |
| tree | 8cb265be780a7f6422424f8bfc92d8bb13045c7c | |
| parent | 89a29a3ad0742cd713e739d3d460be7711966679 (diff) | |
| download | openembedded-core-c0650feb6ce7151a22632bab7270002314a1b6be.tar.gz openembedded-core-c0650feb6ce7151a22632bab7270002314a1b6be.tar.bz2 openembedded-core-c0650feb6ce7151a22632bab7270002314a1b6be.zip | |
systemd: backport patch to fix reading journal backwards
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0001-journal-Fix-navigating-backwards-missing-entries.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_216.bb | 1 |
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 @@ +From 2173cbf847fc53ca24950e77958c902edecfc207 Mon Sep 17 00:00:00 2001 +From: Olivier Brunel <jjk@jjacky.com> +Date: Fri, 5 Dec 2014 16:06:45 +0100 +Subject: [PATCH] journal: Fix navigating backwards missing entries + +With DIRECTION_UP (i.e. navigating backwards) in generic_array_bisect() when the +needle was found as the last item in the array, it wasn't actually processed as +match, resulting in entries being missed. + +https://bugs.freedesktop.org/show_bug.cgi?id=86855 + +Upstream-Status: Backport + +Signed-off-by: Jonathan Liu <net147@gmail.com> +--- + src/journal/journal-file.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c +index 7858435..c5d2d19 100644 +--- a/src/journal/journal-file.c ++++ b/src/journal/journal-file.c +@@ -1657,7 +1657,7 @@ static int generic_array_bisect( + } + } + +- if (k > n) { ++ if (k >= n) { + if (direction == DIRECTION_UP) { + i = n; + subtract_one = true; +-- +2.1.3 + 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= file://0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch \ file://0001-Make-root-s-home-directory-configurable.patch \ file://0001-systemd-user-avoid-using-system-auth.patch \ + file://0001-journal-Fix-navigating-backwards-missing-entries.patch \ file://touchscreen.rules \ file://00-create-volatile.conf \ file://init \ |