Patchwork [meta-oe] systemd: address logind problem on BE machines

login
register
mail settings
Submitter Koen Kooi
Date Feb. 29, 2012, 12:43 p.m.
Message ID <1330519384-27144-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/22407/
State Accepted
Commit 3d15d096b6cd691d9b7e7b00c44498b73e9661b5
Headers show

Comments

Koen Kooi - Feb. 29, 2012, 12:43 p.m.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 .../0001-systemd-journald-fix-endianess-bug.patch  |   29 ++++++++++++++++++++
 meta-oe/recipes-core/systemd/systemd_git.bb        |    3 +-
 2 files changed, 31 insertions(+), 1 deletions(-)
 create mode 100644 meta-oe/recipes-core/systemd/systemd/0001-systemd-journald-fix-endianess-bug.patch

Patch

diff --git a/meta-oe/recipes-core/systemd/systemd/0001-systemd-journald-fix-endianess-bug.patch b/meta-oe/recipes-core/systemd/systemd/0001-systemd-journald-fix-endianess-bug.patch
new file mode 100644
index 0000000..b41d5eb
--- /dev/null
+++ b/meta-oe/recipes-core/systemd/systemd/0001-systemd-journald-fix-endianess-bug.patch
@@ -0,0 +1,29 @@ 
+From d228134ff5af3bd0ef1087e9bee66583c1546553 Mon Sep 17 00:00:00 2001
+From: Dirk Eibach <eibach@gdsys.de>
+Date: Wed, 29 Feb 2012 12:45:46 +0100
+Subject: [PATCH] systemd-journald: fix endianess bug
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+
+Upstream-status: Submitted
+
+ src/journal/journal-file.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
+index 20ca3f6..275caea 100644
+--- a/src/journal/journal-file.c
++++ b/src/journal/journal-file.c
+@@ -238,7 +238,7 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size)
+         if (fstat(f->fd, &f->last_stat) < 0)
+                 return -errno;
+ 
+-        f->header->arena_size = new_size - htole64(f->header->arena_offset);
++        f->header->arena_size = htole64(new_size - le64toh(f->header->arena_offset));
+ 
+         return 0;
+ }
+-- 
+1.7.7.4
+
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index 4c458bd..62a326e 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -14,7 +14,7 @@  inherit gitpkgv
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r16"
+PR = "r17"
 
 inherit useradd pkgconfig autotools vala perlnative
 
@@ -23,6 +23,7 @@  SRCREV = "d26e4270409506cd398875216413b651d6ee7de6"
 SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \
            file://0001-docs-fix-build-without-xsltproc.patch \
            file://0002-systemd-logind-don-t-kill-user-processes-on-exit.patch \
+           file://0001-systemd-journald-fix-endianess-bug.patch \
            ${UCLIBCPATCHES} \
           "
 UCLIBCPATCHES = ""