From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) by mail.openembedded.org (Postfix) with ESMTP id A8E1176863 for ; Tue, 11 Aug 2015 02:09:44 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.15.1/8.15.1) with ESMTPS id t7B29hmx006670 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL) for ; Mon, 10 Aug 2015 19:09:43 -0700 (PDT) Received: from [128.224.162.158] (128.224.162.158) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.3.235.1; Mon, 10 Aug 2015 19:09:43 -0700 Message-ID: <55C95966.2020904@windriver.com> Date: Tue, 11 Aug 2015 10:09:42 +0800 From: Rongqing Li User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: References: <1439255691-21873-1-git-send-email-rongqing.li@windriver.com> In-Reply-To: <1439255691-21873-1-git-send-email-rongqing.li@windriver.com> Subject: Re: [PATCH] weston: backport a patches to fix the building failure X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Aug 2015 02:09:46 -0000 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit 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 > > Signed-off-by: Roy Li > --- > ...-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 > +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 > +Reviewed-by: Quentin Glidic > +--- > + 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