fix weston-common

Change-Id: Iaeffcb1ea6c25c657890c5a61c4994fb4b1d7c23

diff --git a/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common-extraconf.inc b/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common-extraconf.inc
index 53f322e..c705dc8 100644 (file)
--- a/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common-extraconf.inc
+++ b/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common-extraconf.inc
@@ -2,8 +2,6 @@ FILESEXTRAPATHS_append := "${THISDIR}/weston-common"
 
 SRC_URI += "file://0001-Yocto-correct-paths-to-ln-and-chmod.patch"
 SRC_URI += "file://0002-Add-a-script-to-export-UID.patch"
-SRC_URI += "file://0003-Automatically-restart-display-manager.patch"
-SRC_URI += "file://0004-Modifications-for-yocto-build.patch"
 
 DEPENDS += "config-tizen-common"
 RDEPENDS_${PN} += "config-tizen-common"
@@ -26,10 +24,9 @@ do_install_append() {
     ln -sf ../user-session-launch@.service ${D}/lib/systemd/system/graphical.target.wants/user-session-launch@seat0-5002.service
     ln -sf ../user-session-launch@.service ${D}/lib/systemd/system/graphical.target.wants/user-session-launch@seat0-5003.service
     ln -sf ../user-session-launch@.service ${D}/lib/systemd/system/graphical.target.wants/user-session-launch@seat0-9999.service
-    ln -sf ../user-session@.service ${D}/lib/systemd/system/graphical.target.wants/user-session@5001.service
-    ln -sf ../user-session@.service ${D}/lib/systemd/system/graphical.target.wants/user-session@5002.service
-    ln -sf ../user-session@.service ${D}/lib/systemd/system/graphical.target.wants/user-session@5003.service
-    ln -sf ../user-session@.service ${D}/lib/systemd/system/graphical.target.wants/user-session@9999.service
+
+    mkdir -p ${D}${systemd_unitdir}/system/multi-user.target.wants
+    ln -sf ../systemd-udev-settle.service ${D}${systemd_unitdir}/system/multi-user.target.wants/systemd-udev-settle.service
 }
 
 pkg_preinst_${PN}() {

diff --git a/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common/0003-Automatically-restart-display-manager.patch b/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common/0003-Automatically-restart-display-manager.patch
deleted file mode 100644 (file)
index d7d5842..0000000
--- a/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common/0003-Automatically-restart-display-manager.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 464a02a6646dcd73dfe73ba1db6ade1169809e85 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?K=C3=A9vin=20THIERRY?= <kevin.thierry@open.eurogiciel.org>
-Date: Wed, 28 May 2014 17:06:44 +0200
-Subject: [PATCH] Automatically restart display-manager
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Restart display-manager every 2 seconds until it starts.
-
-Change-Id: Ia7a5e81a6b23c9de0345f63adabb6b1810c199cc
-Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
----
- display-manager.service | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/display-manager.service b/display-manager.service
-index 69754b4..2adaeef 100644
---- a/display-manager.service
-+++ b/display-manager.service
-@@ -7,6 +7,8 @@ After=display-manager-run.service
- Type=oneshot
- ExecStart=/bin/chmod g+w /run/display/wayland-0
- ExecStart=/usr/bin/chsmack -a User /run/display/wayland-0
-+Restart=on-failure
-+RestartSec=2
- 
- [Install]
- WantedBy=graphical.target
--- 
-1.8.1.4
-

diff --git a/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common/0004-Modifications-for-yocto-build.patch b/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common/0004-Modifications-for-yocto-build.patch
deleted file mode 100644 (file)
index 5f6d797..0000000
--- a/meta-tizen-common-demo/recipes-graphics/weston-common/weston-common/0004-Modifications-for-yocto-build.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From de783cd7347bad945d00fcdd84e1e4b660b11c95 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?K=C3=A9vin=20THIERRY?= <kevin.thierry@open.eurogiciel.org>
-Date: Wed, 28 May 2014 21:13:45 +0200
-Subject: [PATCH] Modifications for yocto build
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Change-Id: I8487930c70cbc1956d0abce023af919fe25d4042
-Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
----
- display-manager.path    | 6 +++---
- display-manager.service | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/display-manager.path b/display-manager.path
-index d1ae107..c44f379 100644
---- a/display-manager.path
-+++ b/display-manager.path
-@@ -1,7 +1,7 @@
- [Unit]
- Description=Wait for wayland socket
--Requires=display-manager-run.service
--After=display-manager-run.service
-+#Requires=display-manager-run.service
-+#After=display-manager-run.service
- 
- [Path]
--PathExists=/run/display/wayland-0
-+PathChanged=/run/display/wayland-0
-diff --git a/display-manager.service b/display-manager.service
-index 2adaeef..ca808eb 100644
---- a/display-manager.service
-+++ b/display-manager.service
-@@ -4,9 +4,9 @@ Requires=display-manager-run.service
- After=display-manager-run.service
- 
- [Service]
--Type=oneshot
-+#Type=oneshot
- ExecStart=/bin/chmod g+w /run/display/wayland-0
--ExecStart=/usr/bin/chsmack -a User /run/display/wayland-0
-+#ExecStart=/usr/bin/chsmack -a User /run/display/wayland-0
- Restart=on-failure
- RestartSec=2
- 
--- 
-1.8.1.4
-