From 933ec091b5ca725fcdcd682456c8ec7c5b5454b7 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Tue, 10 Jun 2014 14:10:20 +0200 Subject: [PATCH] meta-tizen: Add smack for dbus Change-Id: I17589a2e747e7a3c79dd4fd91d70f5dc70d17682 (From meta-tizen rev: cc3d12a944c1cb0a2cd5d0dc4442c2ae43c0c7c1) Signed-off-by: Ronan Le Martret Signed-off-by: Patrick Ohly --- meta-tizen/recipes-core/dbus/dbus_1.6.18.bbappend | 4 +++- meta-tizen/recipes-tizen/systemd/files/user@.service | 19 ------------------- .../recipes-tizen/systemd/systemd-extraconf.inc | 2 -- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 meta-tizen/recipes-tizen/systemd/files/user@.service diff --git a/meta-tizen/recipes-core/dbus/dbus_1.6.18.bbappend b/meta-tizen/recipes-core/dbus/dbus_1.6.18.bbappend index abc3328..e9a50fa 100644 --- a/meta-tizen/recipes-core/dbus/dbus_1.6.18.bbappend +++ b/meta-tizen/recipes-core/dbus/dbus_1.6.18.bbappend @@ -28,4 +28,6 @@ do_install_append() { FILES_${PN} += "${systemd_unitdir}/user/dbus.service \ ${systemd_unitdir}/user/dbus.socket \ - " \ No newline at end of file + " + +EXTRA_OECONF += " --enable-smack " diff --git a/meta-tizen/recipes-tizen/systemd/files/user@.service b/meta-tizen/recipes-tizen/systemd/files/user@.service deleted file mode 100644 index 52948fd..0000000 --- a/meta-tizen/recipes-tizen/systemd/files/user@.service +++ /dev/null @@ -1,19 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. - -[Unit] -Description=User Manager for %I -After=systemd-user-sessions.service - -[Service] -User=%I -PAMName=systemd-user -Type=notify -Environment=SHELL=%s -ExecStart=-/usr/lib/systemd/systemd --user -Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket -Slice=user-%i.slice diff --git a/meta-tizen/recipes-tizen/systemd/systemd-extraconf.inc b/meta-tizen/recipes-tizen/systemd/systemd-extraconf.inc index 71760b5..2b0adb8 100644 --- a/meta-tizen/recipes-tizen/systemd/systemd-extraconf.inc +++ b/meta-tizen/recipes-tizen/systemd/systemd-extraconf.inc @@ -1,5 +1,4 @@ SRC_URI += "file://systemd-user \ - file://user@.service \ " systemd_files += "${sysconfdir}/*" @@ -44,7 +43,6 @@ do_install_append() { rm ${D}${sysconfdir}/timezone install -m 0644 ${WORKDIR}/systemd-user ${D}${sysconfdir}/pam.d - install -m 0644 ${WORKDIR}/user@.service ${D}/usr/lib/systemd/system/ } EXTRA_OECONF = " --disable-manpages \ -- 2.7.4