Patchwork [meta-oe,06/10] systemd: bump SRCREV

login
register
mail settings
Submitter Koen Kooi
Date April 9, 2012, 3:16 p.m.
Message ID <1333984573-28464-6-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/25443/
State Accepted
Commit bd0a6a465f73168b86dded0e1d938c170ba45fc6
Headers show

Comments

Koen Kooi - April 9, 2012, 3:16 p.m.
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 ...nald-allocate-PAGE_SIZE-bytes-for-selinux.patch |   34 --------------------
 ...-logind-don-t-kill-user-processes-on-exit.patch |   31 ------------------
 meta-oe/recipes-core/systemd/systemd_git.bb        |    6 +--
 3 files changed, 2 insertions(+), 69 deletions(-)
 delete mode 100644 meta-oe/recipes-core/systemd/systemd/0001-Revert-journald-allocate-PAGE_SIZE-bytes-for-selinux.patch
 delete mode 100644 meta-oe/recipes-core/systemd/systemd/0002-systemd-logind-don-t-kill-user-processes-on-exit.patch

Patch

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 9c74f67..0000000
--- a/meta-oe/recipes-core/systemd/systemd/0001-Revert-journald-allocate-PAGE_SIZE-bytes-for-selinux.patch
+++ /dev/null
@@ -1,34 +0,0 @@ 
-From 9d3226c3a3dd34e7299aa693544e45b8ebe9410b Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Sun, 18 Mar 2012 09:18:39 +0100
-Subject: [PATCH] Revert "journald: allocate PAGE_SIZE bytes for selinux label length"
-
-This reverts commit 2d44fc7ba5aaf700672baa7b0697caefddafdc53.
----
- src/journal/journald.c |    3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/src/journal/journald.c b/src/journal/journald.c
-index baad3ab..3dde891 100644
---- a/src/journal/journald.c
-+++ b/src/journal/journald.c
-@@ -29,7 +29,6 @@
- #include <sys/ioctl.h>
- #include <linux/sockios.h>
- #include <sys/statvfs.h>
--#include <sys/user.h>
- 
- #include <systemd/sd-journal.h>
- #include <systemd/sd-login.h>
-@@ -2144,7 +2143,7 @@ static int process_event(Server *s, struct epoll_event *ev) {
-                                 uint8_t buf[CMSG_SPACE(sizeof(struct ucred)) +
-                                             CMSG_SPACE(sizeof(struct timeval)) +
-                                             CMSG_SPACE(sizeof(int)) +
--                                            CMSG_SPACE(PAGE_SIZE)]; /* selinux label */
-+                                            CMSG_SPACE(LINE_MAX)]; /* selinux label */
-                         } control;
-                         ssize_t n;
-                         int v;
--- 
-1.7.2.5
-
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 c28f189..0000000
--- a/meta-oe/recipes-core/systemd/systemd/0002-systemd-logind-don-t-kill-user-processes-on-exit.patch
+++ /dev/null
@@ -1,31 +0,0 @@ 
-From eccbcfd37d41e1cb66bdf19cded899a36cc3842d Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Tue, 7 Feb 2012 10:12:51 +0100
-Subject: [PATCH 2/2] systemd-logind: don't kill user processes on exit
-
-This fixed screen and tmux
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-
-Upstream-status: Unknown
-
----
- src/login/systemd-logind.conf |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/login/systemd-logind.conf b/src/login/systemd-logind.conf
-index 9909804..ba69b6c 100644
---- a/src/login/systemd-logind.conf
-+++ b/src/login/systemd-logind.conf
-@@ -9,7 +9,7 @@
- 
- [Login]
- #NAutoVTs=6
--#KillUserProcesses=no
-+KillUserProcesses=no
- #KillOnlyUsers=
- #KillExcludeUsers=root
- #Controllers=
--- 
-1.7.2.5
-
diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb
index e3aec31..d38bbc1 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
 PKGV = "v${GITPKGVTAG}"
 
 PV = "git"
-PR = "r23"
+PR = "r24"
 
 inherit useradd pkgconfig autotools vala perlnative
 
-SRCREV = "5ebff5337594d690b322078c512eb222d34aaa82"
+SRCREV = "3eff4208ffecedd778fec260f0d4b18e94dab443"
 
 SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \
-           file://0001-Revert-journald-allocate-PAGE_SIZE-bytes-for-selinux.patch \
-           file://0002-systemd-logind-don-t-kill-user-processes-on-exit.patch \
            ${UCLIBCPATCHES} \
           "
 UCLIBCPATCHES = ""