From 21c5226b123452cc5326fb190486408664ecf047 Mon Sep 17 00:00:00 2001 From: =?utf8?q?K=C3=A9vin=20THIERRY?= Date: Tue, 17 Jun 2014 11:46:07 +0200 Subject: [PATCH] Remove useless patch to user-session-units MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Commit a42553194c51ac70a5d066124a3ea0550e4ca8c1 introduced this patch to start weston. It was a temporary fix that is no longer needed. Change-Id: I63f0048ca5297f38054b5d3a7e6768d544a480cf Signed-off-by: Kévin THIERRY --- .../user-session-units-extraconf.inc | 2 -- ...user-session-.service-for-the-yocto-build.patch | 37 ---------------------- 2 files changed, 39 deletions(-) delete mode 100644 recipes-tizen/user-session-units/user-session-units/0001-Modify-user-session-.service-for-the-yocto-build.patch diff --git a/recipes-tizen/user-session-units/user-session-units-extraconf.inc b/recipes-tizen/user-session-units/user-session-units-extraconf.inc index 4f95e2c..9693b9c 100644 --- a/recipes-tizen/user-session-units/user-session-units-extraconf.inc +++ b/recipes-tizen/user-session-units/user-session-units-extraconf.inc @@ -1,7 +1,5 @@ FILESEXTRAPATHS_append := "${THISDIR}/user-session-units" -SRC_URI += "file://0001-Modify-user-session-.service-for-the-yocto-build.patch" - do_install_append() { rm -f ${D}/lib/systemd/user/dbus.socket diff --git a/recipes-tizen/user-session-units/user-session-units/0001-Modify-user-session-.service-for-the-yocto-build.patch b/recipes-tizen/user-session-units/user-session-units/0001-Modify-user-session-.service-for-the-yocto-build.patch deleted file mode 100644 index acc0261..0000000 --- a/recipes-tizen/user-session-units/user-session-units/0001-Modify-user-session-.service-for-the-yocto-build.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 09231101a7e21627c3d09a8e4bda9286d1a8e90e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?K=C3=A9vin=20THIERRY?= -Date: Wed, 28 May 2014 21:07:40 +0200 -Subject: [PATCH] Modify user-session@.service for the yocto build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Kévin THIERRY ---- - units/system/user-session@.service.in | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/units/system/user-session@.service.in b/units/system/user-session@.service.in -index 626d425..2d32433 100644 ---- a/units/system/user-session@.service.in -+++ b/units/system/user-session@.service.in -@@ -15,15 +15,13 @@ Conflicts=getty@tty1.service - User=%I - PAMName=user-session - # Note memory:/ required kernel memory CGroups support --ControlGroup=%R/user/%u/shared cpu:/ memory:/ --ControlGroupModify=yes - Type=notify - StandardInput=tty - TTYPath=/dev/tty1 - ExecStart=-@SYSTEMDUTILDIR@/systemd --user - Environment=DISPLAY=:0 - Environment=XDG_RUNTIME_DIR=/run/user/%U --Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%U/dbus/user_bus_socket -+Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket - - [Install] - Alias=user-session@%i.service --- -1.8.1.4 - -- 2.7.4