diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-02-07 10:14:22 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-02-07 16:06:19 +0100 |
commit | 724ec1ea4ff52b88bf1f6970557e44768214fd7b (patch) | |
tree | 4b84f9ee5230b1ed90dd80edc12c9bb715fc6a94 /meta-oe/recipes-core | |
parent | e49f3cc870cca06f95174c2a7f6e042417b0af32 (diff) | |
download | meta-openembedded-724ec1ea4ff52b88bf1f6970557e44768214fd7b.tar.gz |
systemd: move to v40 and don't kill user processes on exit
This fixes screen and tmux persistency issues.
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-core')
3 files changed, 38 insertions, 6 deletions
diff --git a/meta-oe/recipes-core/systemd/systemd/0001-docs-fix-build-without-xsltproc.patch b/meta-oe/recipes-core/systemd/systemd/0001-docs-fix-build-without-xsltproc.patch index 677534973..390d65c72 100644 --- a/meta-oe/recipes-core/systemd/systemd/0001-docs-fix-build-without-xsltproc.patch +++ b/meta-oe/recipes-core/systemd/systemd/0001-docs-fix-build-without-xsltproc.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 97719ec99e3bd0040b616b044ab6ae33ae1cfd15 Mon Sep 17 00:00:00 2001 | 1 | From 7395173a5af08e9e58aed33e831d0bfc6515891d Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Sun, 2 Oct 2011 19:54:29 +0200 | 3 | Date: Sun, 2 Oct 2011 19:54:29 +0200 |
4 | Subject: [PATCH 1/2] docs: fix build without xsltproc | 4 | Subject: [PATCH 1/2] docs: fix build without xsltproc |
@@ -6,18 +6,18 @@ Subject: [PATCH 1/2] docs: fix build without xsltproc | |||
6 | Make would choke on missing rules for man/systemd.1 | 6 | Make would choke on missing rules for man/systemd.1 |
7 | 7 | ||
8 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 8 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
9 | --- | ||
10 | 9 | ||
11 | Upstream-status: rejected [fix your docbook install] | 10 | Upstream-status: rejected [fix your docbook install] |
12 | 11 | ||
12 | --- | ||
13 | Makefile.am | 5 +++++ | 13 | Makefile.am | 5 +++++ |
14 | 1 files changed, 5 insertions(+), 0 deletions(-) | 14 | 1 files changed, 5 insertions(+), 0 deletions(-) |
15 | 15 | ||
16 | diff --git a/Makefile.am b/Makefile.am | 16 | diff --git a/Makefile.am b/Makefile.am |
17 | index 110a2f4..a5e57b7 100644 | 17 | index f1f975f..53f99a1 100644 |
18 | --- a/Makefile.am | 18 | --- a/Makefile.am |
19 | +++ b/Makefile.am | 19 | +++ b/Makefile.am |
20 | @@ -650,6 +650,7 @@ EXTRA_DIST += \ | 20 | @@ -649,6 +649,7 @@ EXTRA_DIST += \ |
21 | src/acl-util.h \ | 21 | src/acl-util.h \ |
22 | src/logs-show.h | 22 | src/logs-show.h |
23 | 23 | ||
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 new file mode 100644 index 000000000..c28f1896c --- /dev/null +++ b/meta-oe/recipes-core/systemd/systemd/0002-systemd-logind-don-t-kill-user-processes-on-exit.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From eccbcfd37d41e1cb66bdf19cded899a36cc3842d Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Tue, 7 Feb 2012 10:12:51 +0100 | ||
4 | Subject: [PATCH 2/2] systemd-logind: don't kill user processes on exit | ||
5 | |||
6 | This fixed screen and tmux | ||
7 | |||
8 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
9 | |||
10 | Upstream-status: Unknown | ||
11 | |||
12 | --- | ||
13 | src/login/systemd-logind.conf | 2 +- | ||
14 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
15 | |||
16 | diff --git a/src/login/systemd-logind.conf b/src/login/systemd-logind.conf | ||
17 | index 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 | -- | ||
30 | 1.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 89f910b7a..c1a011773 100644 --- a/meta-oe/recipes-core/systemd/systemd_git.bb +++ b/meta-oe/recipes-core/systemd/systemd_git.bb | |||
@@ -14,14 +14,15 @@ inherit gitpkgv | |||
14 | PKGV = "v${GITPKGVTAG}" | 14 | PKGV = "v${GITPKGVTAG}" |
15 | 15 | ||
16 | PV = "git" | 16 | PV = "git" |
17 | PR = "r13" | 17 | PR = "r15" |
18 | 18 | ||
19 | inherit useradd pkgconfig autotools vala perlnative | 19 | inherit useradd pkgconfig autotools vala perlnative |
20 | 20 | ||
21 | SRCREV = "bbd9b8c2139a70005e4e83d198575e2a10fe1db2" | 21 | SRCREV = "d26e4270409506cd398875216413b651d6ee7de6" |
22 | 22 | ||
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 | ${UCLIBCPATCHES} \ | 26 | ${UCLIBCPATCHES} \ |
26 | " | 27 | " |
27 | UCLIBCPATCHES = "" | 28 | UCLIBCPATCHES = "" |