summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-09-07 19:03:20 (GMT)
committerBaserock Gerrit <gerrit@baserock.org>2015-09-14 19:33:56 (GMT)
commit4bf35a7dcc2ce5bd9d52853e0d556dc016de1770 (patch)
tree0ea1448632789c0f98a4ea9b30e7eee035dda314
parentf5e07c6a885a2665b3d56e7cb83d27b69acf7a79 (diff)
downloaddefinitions-4bf35a7dcc2ce5bd9d52853e0d556dc016de1770.tar.gz
strata/foundation.morph: Upgrade systemd to v225
Also: - Remove --disable-gudev, as it has been removed upstream - Hack for units/user@.service.m4.in is not needed anymore as it has been solved in 58ea275a68cd242ad60161bcb7582614d1d89f13, with the introduction of the KillMode=mixed Change-Id: I21024c56c5714ce0f9009d2825a90b0dc79b7db5
-rw-r--r--strata/foundation.morph4
-rw-r--r--strata/foundation/systemd.morph9
2 files changed, 2 insertions, 11 deletions
diff --git a/strata/foundation.morph b/strata/foundation.morph
index 3b76af1..ff18e4e 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -48,8 +48,8 @@ chunks:
- name: systemd
morph: strata/foundation/systemd.morph
repo: upstream:systemd
- ref: dde8bb32b12c855509777ce52ff59a835155ac78
- unpetrify-ref: v220
+ ref: e1439a1472c5f691733b8ef10e702beac2496a63
+ unpetrify-ref: v225
build-depends:
- dbus-pre
- kmod
diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph
index 26c226f..4c62d61 100644
--- a/strata/foundation/systemd.morph
+++ b/strata/foundation/systemd.morph
@@ -1,21 +1,12 @@
name: systemd
kind: chunk
build-system: autotools
-pre-configure-commands:
-# systemd prematurely kills the user session. This is a known bug in systemd
-# https://bugs.freedesktop.org/show_bug.cgi?id=70593
-- |
- cat >> units/user@.service.m4.in <<EOF
- KillSignal=SIGCONT
- ExecStop=/bin/kill -TERM \$MAINPID
- EOF
configure-commands:
- sh autogen.sh
# KILL added because it picks up /usr/bin/kill, which is not installed on
# all systems
- |
KILL=/bin/kill ./configure --prefix="$PREFIX" --enable-xz --disable-manpages \
- --disable-gudev \
--disable-tests --sysconfdir=/etc --localstatedir=/var \
--libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" \
--with-rootprefix= --with-rootlibdir=/lib