summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd
diff options
context:
space:
mode:
authorDrew Moseley <drew_moseley@mentor.com>2014-04-28 11:38:57 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-29 17:20:12 +0100
commit936218e789277c6939535779c240d386e18c8891 (patch)
tree8eab85e6361d1dd146965111bc1f8482057b574f /meta/recipes-core/systemd
parent59738ffd47c65e9c661016acdc0430f375f80087 (diff)
downloadpoky-936218e789277c6939535779c240d386e18c8891.tar.gz
systemd: Check for HAVE_POSIX_FALLOCATE
The check for the config variable is using the wrong define resulting in the #else always being used. (From OE-Core rev: 7e498c4c17e2c1b6928d4c1fd127977bb588991f) Signed-off-by: Drew Moseley <drew_moseley@mentor.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r--meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch b/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch
index de73be96a7..d25acefb59 100644
--- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch
+++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch
@@ -27,7 +27,7 @@ Index: systemd-209/src/journal/journal-file.c
27 /* Note that the glibc fallocate() fallback is very 27 /* Note that the glibc fallocate() fallback is very
28 inefficient, hence we try to minimize the allocation area 28 inefficient, hence we try to minimize the allocation area
29 as we can. */ 29 as we can. */
30+#ifdef HAVE_POSIX_ALLOCATE 30+#ifdef HAVE_POSIX_FALLOCATE
31 r = posix_fallocate(f->fd, old_size, new_size - old_size); 31 r = posix_fallocate(f->fd, old_size, new_size - old_size);
32 if (r != 0) 32 if (r != 0)
33 return -r; 33 return -r;
@@ -66,7 +66,7 @@ Index: systemd-209/src/journal/journald-kmsg.c
66 } 66 }
67- 67-
68- if (posix_fallocate(fd, 0, sizeof(uint64_t)) < 0) { 68- if (posix_fallocate(fd, 0, sizeof(uint64_t)) < 0) {
69+#ifdef HAVE_POSIX_ALLOCATE 69+#ifdef HAVE_POSIX_FALLOCATE
70+ r = posix_fallocate(fd, 0, sizeof(uint64_t)); 70+ r = posix_fallocate(fd, 0, sizeof(uint64_t));
71+#else 71+#else
72+ /* Use good old method to write zeros into the journal file 72+ /* Use good old method to write zeros into the journal file