Update weston-common recipe

* New revision.
* Adapt patch 0001 to new revision.

Change-Id: I82fc5d6537270bc3405353ff4edaa7ef4709a2c2
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>

diff --git a/recipes-tizen/weston-common/weston-common-extraconf.inc b/recipes-tizen/weston-common/weston-common-extraconf.inc
index ea4eeb1..7faeffc 100644 (file)
--- a/recipes-tizen/weston-common/weston-common-extraconf.inc
+++ b/recipes-tizen/weston-common/weston-common-extraconf.inc
@@ -2,7 +2,7 @@ inherit useradd
 
 FILESEXTRAPATHS_append := "${THISDIR}/weston-common"
 
-SRC_URI += "file://0001-Fix-path-to-binary-ln-and-chmod.patch"
+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"

diff --git a/recipes-tizen/weston-common/weston-common/0001-Fix-path-to-binary-ln-and-chmod.patch b/recipes-tizen/weston-common/weston-common/0001-Yocto-correct-paths-to-ln-and-chmod.patch
similarity index 72%
rename from recipes-tizen/weston-common/weston-common/0001-Fix-path-to-binary-ln-and-chmod.patch
rename to recipes-tizen/weston-common/weston-common/0001-Yocto-correct-paths-to-ln-and-chmod.patch
index 4eb65df..269705a 100644 (file)
--- a/recipes-tizen/weston-common/weston-common/0001-Fix-path-to-binary-ln-and-chmod.patch
+++ b/recipes-tizen/weston-common/weston-common/0001-Yocto-correct-paths-to-ln-and-chmod.patch
@@ -1,15 +1,12 @@
-From 1e727279150b639e57c795f01316cf284214bad8 Mon Sep 17 00:00:00 2001
+From f1243d3d99e20052e9c4b5dca513164a4283ae53 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 16:08:18 +0200
-Subject: [PATCH] Fix path to binary ln and chmod
+Date: Wed, 18 Jun 2014 11:29:40 +0200
+Subject: [PATCH] Yocto: correct paths to ln and chmod
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-On Tizen Common Yocto ln and chmod are located under /bin/ instead of
-/usr/bin/.
-
-Change-Id: If7ca735549a6d4bf6900e1ef6dc20d9b82231be4
+Change-Id: I565c665483efd43b9c5a02e8d1cc85cf6def0751
 Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
 ---
  display-manager.service | 2 +-
@@ -30,7 +27,7 @@ index 43efbb5..69754b4 100644
  
  [Install]
 diff --git a/weston-user.service b/weston-user.service
-index f15d574..5c5d563 100644
+index aa29888..12b7986 100644
 --- a/weston-user.service
 +++ b/weston-user.service
 @@ -2,7 +2,7 @@
@@ -39,7 +36,7 @@ index f15d574..5c5d563 100644
  [Service]
 -ExecStartPre=/usr/bin/ln -sf /run/display/wayland-0 /run/user/%U/
 +ExecStartPre=/bin/ln -sf /run/display/wayland-0 /run/user/%U/
- ExecStart=/usr/bin/tz-launcher -c /usr/share/applications/tizen/launcher.conf %h/.applications/desktop
+ ExecStart=/bin/sh -l -c "/usr/bin/tz-launcher -c /usr/share/applications/tizen/launcher.conf %h/.applications/desktop"
  EnvironmentFile=/etc/sysconfig/weston-user
  
 -- 

diff --git a/recipes-tizen/weston-common/weston-common_git.bb b/recipes-tizen/weston-common/weston-common_git.bb
index f7315aa..272aedc 100644 (file)
--- a/recipes-tizen/weston-common/weston-common_git.bb
+++ b/recipes-tizen/weston-common/weston-common_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/profile/common/weston-common;tag=b4b75bb3e79e3be238d25d8b12016938309e0de8;nobranch=1"
+SRC_URI += "git://review.tizen.org/profile/common/weston-common;tag=8143737a2c41110e572e6a109e16ab70e220a90e;nobranch=1"
 
 BBCLASSEXTEND += " native "