summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-04-09 07:28:13 +0200
committerKoen Kooi <koen@dominion.thruhere.net>2012-04-09 13:46:21 +0200
commitbd0a6a465f73168b86dded0e1d938c170ba45fc6 (patch)
tree6299b260007812f6f0095c77924f71bbff242e0f
parent15cc3fb0ced0daf18673a8683cf276c159e498b6 (diff)
downloadmeta-openembedded-bd0a6a465f73168b86dded0e1d938c170ba45fc6.tar.gz
systemd: bump SRCREV
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r--meta-oe/recipes-core/systemd/systemd/0001-Revert-journald-allocate-PAGE_SIZE-bytes-for-selinux.patch34
-rw-r--r--meta-oe/recipes-core/systemd/systemd/0002-systemd-logind-don-t-kill-user-processes-on-exit.patch31
-rw-r--r--meta-oe/recipes-core/systemd/systemd_git.bb6
3 files changed, 2 insertions, 69 deletions
diff --git a/meta-oe/recipes-core/systemd/systemd/0001-Revert-journald-allocate-PAGE_SIZE-bytes-for-selinux.patch b/meta-oe/recipes-core/systemd/systemd/0001-Revert-journald-allocate-PAGE_SIZE-bytes-for-selinux.patch
deleted file mode 100644
index 9c74f67c2..000000000
--- a/meta-oe/recipes-core/systemd/systemd/0001-Revert-journald-allocate-PAGE_SIZE-bytes-for-selinux.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 9d3226c3a3dd34e7299aa693544e45b8ebe9410b Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sun, 18 Mar 2012 09:18:39 +0100
4Subject: [PATCH] Revert "journald: allocate PAGE_SIZE bytes for selinux label length"
5
6This reverts commit 2d44fc7ba5aaf700672baa7b0697caefddafdc53.
7---
8 src/journal/journald.c | 3 +--
9 1 files changed, 1 insertions(+), 2 deletions(-)
10
11diff --git a/src/journal/journald.c b/src/journal/journald.c
12index baad3ab..3dde891 100644
13--- a/src/journal/journald.c
14+++ b/src/journal/journald.c
15@@ -29,7 +29,6 @@
16 #include <sys/ioctl.h>
17 #include <linux/sockios.h>
18 #include <sys/statvfs.h>
19-#include <sys/user.h>
20
21 #include <systemd/sd-journal.h>
22 #include <systemd/sd-login.h>
23@@ -2144,7 +2143,7 @@ static int process_event(Server *s, struct epoll_event *ev) {
24 uint8_t buf[CMSG_SPACE(sizeof(struct ucred)) +
25 CMSG_SPACE(sizeof(struct timeval)) +
26 CMSG_SPACE(sizeof(int)) +
27- CMSG_SPACE(PAGE_SIZE)]; /* selinux label */
28+ CMSG_SPACE(LINE_MAX)]; /* selinux label */
29 } control;
30 ssize_t n;
31 int v;
32--
331.7.2.5
34
diff --git a/meta-oe/recipes-core/systemd/systemd/0002-systemd-logind-don-t-kill-user-processes-on-exit.patch b/meta-oe/recipes-core/systemd/systemd/0002-systemd-logind-don-t-kill-user-processes-on-exit.patch
deleted file mode 100644
index c28f1896c..000000000
--- a/meta-oe/recipes-core/systemd/systemd/0002-systemd-logind-don-t-kill-user-processes-on-exit.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From eccbcfd37d41e1cb66bdf19cded899a36cc3842d Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Tue, 7 Feb 2012 10:12:51 +0100
4Subject: [PATCH 2/2] systemd-logind: don't kill user processes on exit
5
6This fixed screen and tmux
7
8Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
9
10Upstream-status: Unknown
11
12---
13 src/login/systemd-logind.conf | 2 +-
14 1 files changed, 1 insertions(+), 1 deletions(-)
15
16diff --git a/src/login/systemd-logind.conf b/src/login/systemd-logind.conf
17index 9909804..ba69b6c 100644
18--- a/src/login/systemd-logind.conf
19+++ b/src/login/systemd-logind.conf
20@@ -9,7 +9,7 @@
21
22 [Login]
23 #NAutoVTs=6
24-#KillUserProcesses=no
25+KillUserProcesses=no
26 #KillOnlyUsers=
27 #KillExcludeUsers=root
28 #Controllers=
29--
301.7.2.5
31
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index e3aec317c..d38bbc1f8 100644
--- a/meta-oe/recipes-core/systemd/systemd_git.bb
+++ b/meta-oe/recipes-core/systemd/systemd_git.bb
@@ -14,15 +14,13 @@ inherit gitpkgv
14PKGV = "v${GITPKGVTAG}" 14PKGV = "v${GITPKGVTAG}"
15 15
16PV = "git" 16PV = "git"
17PR = "r23" 17PR = "r24"
18 18
19inherit useradd pkgconfig autotools vala perlnative 19inherit useradd pkgconfig autotools vala perlnative
20 20
21SRCREV = "5ebff5337594d690b322078c512eb222d34aaa82" 21SRCREV = "3eff4208ffecedd778fec260f0d4b18e94dab443"
22 22
23SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \ 23SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \
24 file://0001-Revert-journald-allocate-PAGE_SIZE-bytes-for-selinux.patch \
25 file://0002-systemd-logind-don-t-kill-user-processes-on-exit.patch \
26 ${UCLIBCPATCHES} \ 24 ${UCLIBCPATCHES} \
27 " 25 "
28UCLIBCPATCHES = "" 26UCLIBCPATCHES = ""