[PATCH] weston: fix two building issue

[PATCH] weston: fix two building issue

[rongqing.li]

From: Roy Li <rongqing.li@windriver.com>

1. duplicate makefile rule leads to race, so remove one:
   "/usr/bin/install: cannot create regular file `bitbake_build/tmp/work/
   core2-64-wrs-linux/weston/1.8.0-r0/image/usr/share/wayland-sessions/
   weston.desktop': File exists"
2. create tests dir and ivi-shell to fix the building rule dependency issue.
   sed "..." ivi-shell/weston.ini.in > ivi-shell/weston.ini
   ivi-shell/weston.ini: No such file or directory

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../wayland/weston/0001-remove-duplicate.patch     | 33 ++++++++++++++++++++++
 meta/recipes-graphics/wayland/weston_1.8.0.bb      |  5 ++++
 2 files changed, 38 insertions(+)
 create mode 100644 meta/recipes-graphics/wayland/weston/0001-remove-duplicate.patch

diff --git a/meta/recipes-graphics/wayland/weston/0001-remove-duplicate.patch b/meta/recipes-graphics/wayland/weston/0001-remove-duplicate.patch
new file mode 100644
index 0000000..a6eaf85
--- /dev/null
+++ b/meta/recipes-graphics/wayland/weston/0001-remove-duplicate.patch
@@ -0,0 +1,33 @@
+From 5cbb8b06e88ebcbf3669a51b8dae955c58a0ca1d Mon Sep 17 00:00:00 2001
+From: Roy Li <rongqing.li@windriver.com>
+Date: Wed, 15 Jul 2015 15:44:25 +0800
+Subject: [PATCH] remove the unnecessory rule from Makefile.am
+
+Upstream-Statue: Pending
+
+dist_wayland_session_DATA will distributes and installs src/weston.desktop,
+and the definition of wayland_session_DATA, which installs src/weston.desktop
+too, is duplicated, and lead to race issue, remove it to fix the problem.
+
+Signed-off-by: Roy Li <rongqing.li@windriver.com>
+---
+ Makefile.am | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 5819b19..ee5fbbb 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -179,8 +179,7 @@ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = src/weston.pc
+ 
+ wayland_sessiondir = $(datadir)/wayland-sessions
+-wayland_session_DATA = src/weston.desktop
+-dist_wayland_session_DATA = $(wayland_session_DATA)
++dist_wayland_session_DATA = src/weston.desktop
+ 
+ westonincludedir = $(includedir)/weston
+ westoninclude_HEADERS =				\
+-- 
+1.9.1
+
diff --git a/meta/recipes-graphics/wayland/weston_1.8.0.bb b/meta/recipes-graphics/wayland/weston_1.8.0.bb
index ac6bd97..3bba03f 100644
--- a/meta/recipes-graphics/wayland/weston_1.8.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.8.0.bb
@@ -11,6 +11,7 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
            file://make-lcms-explicitly-configurable.patch \
            file://make-libwebp-explicitly-configurable.patch \
            file://0001-make-error-portable.patch \
+           file://0001-remove-duplicate.patch \
 "
 SRC_URI[md5sum] = "24cb8a7ed0535b4fc3642643988dab36"
 SRC_URI[sha256sum] = "8963e69f328e815cec42c58046c4af721476c7541bb7d9edc71740fada5ad312"
@@ -67,6 +68,10 @@ PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
 # Weston with unwinding support
 PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind"
 
+do_compile_prepend() {
+	mkdir ${B}/tests ${B}/ivi-shell
+}
+
 do_install_append() {
 	# Weston doesn't need the .la files to load modules, so wipe them
 	rm -f ${D}/${libdir}/weston/*.la
-- 
1.9.1

Re: [PATCH] weston: fix two building issue

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 369 bytes --]

On 16 July 2015 at 02:17, <rongqing.li@windriver.com> wrote:

> 2. create tests dir and ivi-shell to fix the building rule dependency
> issue.
>    sed "..." ivi-shell/weston.ini.in > ivi-shell/weston.ini
>    ivi-shell/weston.ini: No such file or directory
>

Please add some mkdir calls to the Makefile instead of fixing this in
do_compile_prepend.

Ross

[-- Attachment #2: Type: text/html, Size: 863 bytes --]

Re: [PATCH] weston: fix two building issue

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 492 bytes --]

On 16 July 2015 at 02:17, <rongqing.li@windriver.com> wrote:

> 1. duplicate makefile rule leads to race, so remove one:
>    "/usr/bin/install: cannot create regular file `bitbake_build/tmp/work/
>    core2-64-wrs-linux/weston/1.8.0-r0/image/usr/share/wayland-sessions/
>    weston.desktop': File exists"
>

Also I happened to have a weston tree to hand, so you can call this
Submitted now (
http://lists.freedesktop.org/archives/wayland-devel/2015-July/023467.html).
:)

Ross

[-- Attachment #2: Type: text/html, Size: 1069 bytes --]

Re: [PATCH] weston: fix two building issue

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 436 bytes --]

On 16 July 2015 at 02:17, <rongqing.li@windriver.com> wrote:

> 2. create tests dir and ivi-shell to fix the building rule dependency
> issue.
>    sed "..." ivi-shell/weston.ini.in > ivi-shell/weston.ini
>    ivi-shell/weston.ini: No such file or directory
>

I was watching another build happen so quickly fixed this too.   Does
http://lists.freedesktop.org/archives/wayland-devel/2015-July/023468.html
look right?

Ross

[-- Attachment #2: Type: text/html, Size: 1146 bytes --]

Re: [PATCH] weston: fix two building issue

[Rongqing Li]

On 2015年07月17日 04:28, Burton, Ross wrote:
>
> On 16 July 2015 at 02:17, <rongqing.li@windriver.com
> <mailto:rongqing.li@windriver.com>> wrote:
>
>     2. create tests dir and ivi-shell to fix the building rule
>     dependency issue.
>         sed "..." ivi-shell/weston.ini.in <http://weston.ini.in> >
>     ivi-shell/weston.ini
>         ivi-shell/weston.ini: No such file or directory
>
>
> I was watching another build happen so quickly fixed this too.   Does
> http://lists.freedesktop.org/archives/wayland-devel/2015-July/023468.html look
> right?
>
> Ross

it is fine to me, thanks


-- 
Best Reagrds,
Roy | RongQing Li