Re: [PATCH] weston: backport a patches to fix the building failure

[Rongqing Li <rongqing.li@windriver.com>]

drop it, since it is duplicate to  "weston: improve parallel make race 
fixes"

-Roy


On 2015年08月11日 09:14, rongqing.li@windriver.com wrote:
> From: Roy Li <rongqing.li@windriver.com>
>
> Signed-off-by: Roy Li <rongqing.li@windriver.com>
> ---
>   ...-target-weston.ini-directories-before-wri.patch | 42 ++++++++++++++++++++++
>   meta/recipes-graphics/wayland/weston_1.8.0.bb      |  1 +
>   2 files changed, 43 insertions(+)
>   create mode 100644 meta/recipes-graphics/wayland/weston/0001-build-mkdir-target-weston.ini-directories-before-wri.patch
>
> diff --git a/meta/recipes-graphics/wayland/weston/0001-build-mkdir-target-weston.ini-directories-before-wri.patch b/meta/recipes-graphics/wayland/weston/0001-build-mkdir-target-weston.ini-directories-before-wri.patch
> new file mode 100644
> index 0000000..a8fd846
> --- /dev/null
> +++ b/meta/recipes-graphics/wayland/weston/0001-build-mkdir-target-weston.ini-directories-before-wri.patch
> @@ -0,0 +1,42 @@
> +From 2eff22b8e6f6e5255a1915c33dfd91cecf02cbbc Mon Sep 17 00:00:00 2001
> +From: Ross Burton <ross.burton@intel.com>
> +Date: Fri, 17 Jul 2015 12:33:45 +0100
> +Subject: [PATCH] build: mkdir target weston.ini directories before writing
> +
> +Upstream-Status: Backport
> +
> +In parallel out-of-tree builds it is possible for e.g. ivi-shell/weston.ini to
> +be written before ivi-shell/ exists.  Solve this by creating the target
> +directory first.
> +
> +Signed-off-by: Ross Burton <ross.burton@intel.com>
> +Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
> +---
> + Makefile.am | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/Makefile.am b/Makefile.am
> +index a3590c0..76ab546 100644
> +--- a/Makefile.am
> ++++ b/Makefile.am
> +@@ -20,7 +20,7 @@ weston.ini : $(srcdir)/weston.ini.in
> + 		$< > $@
> +
> + ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in
> +-	$(AM_V_GEN)$(SED) \
> ++	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
> + 		-e 's|@bindir[@]|$(bindir)|g' \
> + 		-e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
> + 		-e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
> +@@ -29,7 +29,7 @@ ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in
> + 		$< > $@
> +
> + tests/weston-ivi.ini : $(srcdir)/ivi-shell/weston.ini.in
> +-	$(AM_V_GEN)$(SED) \
> ++	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
> + 		-e 's|@bindir[@]|$(bindir)|g' \
> + 		-e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \
> + 		-e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \
> +--
> +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 342c604..515c712 100644
> --- a/meta/recipes-graphics/wayland/weston_1.8.0.bb
> +++ b/meta/recipes-graphics/wayland/weston_1.8.0.bb
> @@ -12,6 +12,7 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
>              file://make-libwebp-explicitly-configurable.patch \
>              file://0001-make-error-portable.patch \
>              file://parallelmake.patch \
> +           file://0001-build-mkdir-target-weston.ini-directories-before-wri.patch \
>   "
>   SRC_URI[md5sum] = "24cb8a7ed0535b4fc3642643988dab36"
>   SRC_URI[sha256sum] = "8963e69f328e815cec42c58046c4af721476c7541bb7d9edc71740fada5ad312"
>

-- 
Best Reagrds,
Roy | RongQing Li