diff options
| author | Koen Kooi <koen@dominion.thruhere.net> | 2012-02-29 12:43:04 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-02-29 14:53:13 +0100 |
| commit | 3d15d096b6cd691d9b7e7b00c44498b73e9661b5 (patch) | |
| tree | 517190c436b978b75fbb57bc8cb752c06516dbe0 /meta-oe | |
| parent | 59de020063c4a5130c4f7e1a997aa32db18575ee (diff) | |
| download | meta-openembedded-3d15d096b6cd691d9b7e7b00c44498b73e9661b5.tar.gz | |
systemd: address logind problem on BE machines
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-core/systemd/systemd/0001-systemd-journald-fix-endianess-bug.patch | 29 | ||||
| -rw-r--r-- | meta-oe/recipes-core/systemd/systemd_git.bb | 3 |
2 files changed, 31 insertions, 1 deletions
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 0000000000..b41d5ebad9 --- /dev/null +++ b/meta-oe/recipes-core/systemd/systemd/0001-systemd-journald-fix-endianess-bug.patch | |||
| @@ -0,0 +1,29 @@ | |||
| 1 | From d228134ff5af3bd0ef1087e9bee66583c1546553 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Dirk Eibach <eibach@gdsys.de> | ||
| 3 | Date: Wed, 29 Feb 2012 12:45:46 +0100 | ||
| 4 | Subject: [PATCH] systemd-journald: fix endianess bug | ||
| 5 | |||
| 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
| 7 | --- | ||
| 8 | |||
| 9 | Upstream-status: Submitted | ||
| 10 | |||
| 11 | src/journal/journal-file.c | 2 +- | ||
| 12 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c | ||
| 15 | index 20ca3f6..275caea 100644 | ||
| 16 | --- a/src/journal/journal-file.c | ||
| 17 | +++ b/src/journal/journal-file.c | ||
| 18 | @@ -238,7 +238,7 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) | ||
| 19 | if (fstat(f->fd, &f->last_stat) < 0) | ||
| 20 | return -errno; | ||
| 21 | |||
| 22 | - f->header->arena_size = new_size - htole64(f->header->arena_offset); | ||
| 23 | + f->header->arena_size = htole64(new_size - le64toh(f->header->arena_offset)); | ||
| 24 | |||
| 25 | return 0; | ||
| 26 | } | ||
| 27 | -- | ||
| 28 | 1.7.7.4 | ||
| 29 | |||
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb index 4c458bd73c..62a326ee08 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 | |||
| 14 | PKGV = "v${GITPKGVTAG}" | 14 | PKGV = "v${GITPKGVTAG}" |
| 15 | 15 | ||
| 16 | PV = "git" | 16 | PV = "git" |
| 17 | PR = "r16" | 17 | PR = "r17" |
| 18 | 18 | ||
| 19 | inherit useradd pkgconfig autotools vala perlnative | 19 | inherit useradd pkgconfig autotools vala perlnative |
| 20 | 20 | ||
| @@ -23,6 +23,7 @@ SRCREV = "d26e4270409506cd398875216413b651d6ee7de6" | |||
| 23 | SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \ | 23 | SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \ |
| 24 | file://0001-docs-fix-build-without-xsltproc.patch \ | 24 | file://0001-docs-fix-build-without-xsltproc.patch \ |
| 25 | file://0002-systemd-logind-don-t-kill-user-processes-on-exit.patch \ | 25 | file://0002-systemd-logind-don-t-kill-user-processes-on-exit.patch \ |
| 26 | file://0001-systemd-journald-fix-endianess-bug.patch \ | ||
| 26 | ${UCLIBCPATCHES} \ | 27 | ${UCLIBCPATCHES} \ |
| 27 | " | 28 | " |
| 28 | UCLIBCPATCHES = "" | 29 | UCLIBCPATCHES = "" |
