wayland-protocols: upgrade to 1.11

Message ID 1507836933-142066-1-git-send-email-denis@denix.org
State New
Headers show
Series
  • wayland-protocols: upgrade to 1.11
Related show

Commit Message

Denys Dmytriyenko Oct. 12, 2017, 7:35 p.m.
From: Denys Dmytriyenko <denys@ti.com>


Signed-off-by: Denys Dmytriyenko <denys@ti.com>

---
 .../wayland/{wayland-protocols_1.10.bb => wayland-protocols_1.11.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/wayland/{wayland-protocols_1.10.bb => wayland-protocols_1.11.bb} (85%)

-- 
2.7.4

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Burton, Ross Oct. 13, 2017, 11:33 a.m. | #1
On 12 October 2017 at 20:35, Denys Dmytriyenko <denis@denix.org> wrote:

> From: Denys Dmytriyenko <denys@ti.com>

>

> Signed-off-by: Denys Dmytriyenko <denys@ti.com>

>


One day I'll figure out why quilt appears to be non-deterministic about
this but:

ERROR: wayland-protocols-1.11-r0 do_patch: Command Error: 'quilt --quiltrc
/data/poky-tmp/master/build/work/all-poky-linux/wayland-protocols/1.11-r0/recipe-sysroot-native/etc/quiltrc
push' exited with 0  Output:
Applying patch usesysrootprefixforpkgdatadirvariable.patch
patching file wayland-protocols.pc.in
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- rejects in file wayland-protocols.pc.in
Patch usesysrootprefixforpkgdatadirvariable.patch can be reverse-applied

Ross
<div dir="ltr">On 12 October 2017 at 20:35, Denys Dmytriyenko <span dir="ltr">&lt;<a href="mailto:denis@denix.org" target="_blank">denis@denix.org</a>&gt;</span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">From: Denys Dmytriyenko &lt;<a href="mailto:denys@ti.com">denys@ti.com</a>&gt;<br>
<br>
Signed-off-by: Denys Dmytriyenko &lt;<a href="mailto:denys@ti.com">denys@ti.com</a>&gt;<br></blockquote><div><br></div><div>One day I&#39;ll figure out why quilt appears to be non-deterministic about this but:</div><div><br></div><div>ERROR: wayland-protocols-1.11-r0 do_patch: Command Error: &#39;quilt --quiltrc /data/poky-tmp/master/build/work/all-poky-linux/wayland-protocols/1.11-r0/recipe-sysroot-native/etc/quiltrc push&#39; exited with 0  Output:</div><div>Applying patch usesysrootprefixforpkgdatadirvariable.patch</div><div>patching file <a href="http://wayland-protocols.pc.in">wayland-protocols.pc.in</a></div><div>Hunk #1 FAILED at 1.</div><div>1 out of 1 hunk FAILED -- rejects in file <a href="http://wayland-protocols.pc.in">wayland-protocols.pc.in</a></div><div>Patch usesysrootprefixforpkgdatadirvariable.patch can be reverse-applied</div><div><br></div><div>Ross </div></div></div></div>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Denys Dmytriyenko Oct. 13, 2017, 4:28 p.m. | #2
On Fri, Oct 13, 2017 at 12:33:35PM +0100, Burton, Ross wrote:
> On 12 October 2017 at 20:35, Denys Dmytriyenko <denis@denix.org> wrote:

> 

> > From: Denys Dmytriyenko <denys@ti.com>

> >

> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>

> >

> 

> One day I'll figure out why quilt appears to be non-deterministic about

> this but:

> 

> ERROR: wayland-protocols-1.11-r0 do_patch: Command Error: 'quilt --quiltrc

> /data/poky-tmp/master/build/work/all-poky-linux/wayland-protocols/1.11-r0/recipe-sysroot-native/etc/quiltrc

> push' exited with 0  Output:

> Applying patch usesysrootprefixforpkgdatadirvariable.patch


I don't see this patch in master. Works fine in distroless and poky from 
master.


> patching file wayland-protocols.pc.in

> Hunk #1 FAILED at 1.

> 1 out of 1 hunk FAILED -- rejects in file wayland-protocols.pc.in

> Patch usesysrootprefixforpkgdatadirvariable.patch can be reverse-applied

> 

> Ross

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Khem Raj Oct. 13, 2017, 11:12 p.m. | #3
On Fri, Oct 13, 2017 at 4:34 AM Burton, Ross <ross.burton@intel.com> wrote:

> On 12 October 2017 at 20:35, Denys Dmytriyenko <denis@denix.org> wrote:

>

>> From: Denys Dmytriyenko <denys@ti.com>

>>

>> Signed-off-by: Denys Dmytriyenko <denys@ti.com>

>>

>

> One day I'll figure out why quilt appears to be non-deterministic about

> this but:

>


Does it have CR LF end of line botch ups

>

> ERROR: wayland-protocols-1.11-r0 do_patch: Command Error: 'quilt --quiltrc

> /data/poky-tmp/master/build/work/all-poky-linux/wayland-protocols/1.11-r0/recipe-sysroot-native/etc/quiltrc

> push' exited with 0  Output:

> Applying patch usesysrootprefixforpkgdatadirvariable.patch

> patching file wayland-protocols.pc.in

> Hunk #1 FAILED at 1.

> 1 out of 1 hunk FAILED -- rejects in file wayland-protocols.pc.in

> Patch usesysrootprefixforpkgdatadirvariable.patch can be reverse-applied

>

> Ross

> --

> _______________________________________________

> Openembedded-core mailing list

> Openembedded-core@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

>
<div><br><div class="gmail_quote"><div dir="auto">On Fri, Oct 13, 2017 at 4:34 AM Burton, Ross &lt;<a href="mailto:ross.burton@intel.com">ross.burton@intel.com</a>&gt; wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div>On 12 October 2017 at 20:35, Denys Dmytriyenko <span>&lt;<a href="mailto:denis@denix.org" target="_blank">denis@denix.org</a>&gt;</span> wrote:<br></div><div><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">From: Denys Dmytriyenko &lt;<a href="mailto:denys@ti.com" target="_blank">denys@ti.com</a>&gt;<br>
<br>
Signed-off-by: Denys Dmytriyenko &lt;<a href="mailto:denys@ti.com" target="_blank">denys@ti.com</a>&gt;<br></blockquote><div><br></div></div></div></div><div><div class="gmail_extra"><div class="gmail_quote"><div>One day I&#39;ll figure out why quilt appears to be non-deterministic about this but:</div><div></div></div></div></div></blockquote><div dir="auto"><br></div><div dir="auto">Does it have CR LF end of line botch ups </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div class="gmail_extra"><div class="gmail_quote"><div><br></div><div>ERROR: wayland-protocols-1.11-r0 do_patch: Command Error: &#39;quilt --quiltrc /data/poky-tmp/master/build/work/all-poky-linux/wayland-protocols/1.11-r0/recipe-sysroot-native/etc/quiltrc push&#39; exited with 0  Output:</div><div>Applying patch usesysrootprefixforpkgdatadirvariable.patch</div><div>patching file <a href="http://wayland-protocols.pc.in" target="_blank">wayland-protocols.pc.in</a></div><div>Hunk #1 FAILED at 1.</div><div>1 out of 1 hunk FAILED -- rejects in file <a href="http://wayland-protocols.pc.in" target="_blank">wayland-protocols.pc.in</a></div><div>Patch usesysrootprefixforpkgdatadirvariable.patch can be reverse-applied</div></div></div></div><div><div class="gmail_extra"><div class="gmail_quote"><div><br></div><div>Ross </div></div></div></div>

--<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div></div>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Denys Dmytriyenko Oct. 16, 2017, 5:48 p.m. | #4
On Fri, Oct 13, 2017 at 12:28:25PM -0400, Denys Dmytriyenko wrote:
> On Fri, Oct 13, 2017 at 12:33:35PM +0100, Burton, Ross wrote:

> > On 12 October 2017 at 20:35, Denys Dmytriyenko <denis@denix.org> wrote:

> > 

> > > From: Denys Dmytriyenko <denys@ti.com>

> > >

> > > Signed-off-by: Denys Dmytriyenko <denys@ti.com>

> > >

> > 

> > One day I'll figure out why quilt appears to be non-deterministic about

> > this but:

> > 

> > ERROR: wayland-protocols-1.11-r0 do_patch: Command Error: 'quilt --quiltrc

> > /data/poky-tmp/master/build/work/all-poky-linux/wayland-protocols/1.11-r0/recipe-sysroot-native/etc/quiltrc

> > push' exited with 0  Output:

> > Applying patch usesysrootprefixforpkgdatadirvariable.patch

> 

> I don't see this patch in master. Works fine in distroless and poky from 

> master.


Ping.


> > patching file wayland-protocols.pc.in

> > Hunk #1 FAILED at 1.

> > 1 out of 1 hunk FAILED -- rejects in file wayland-protocols.pc.in

> > Patch usesysrootprefixforpkgdatadirvariable.patch can be reverse-applied

> > 

> > Ross

> -- 

> _______________________________________________

> Openembedded-core mailing list

> Openembedded-core@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Burton, Ross Oct. 16, 2017, 8:31 p.m. | #5
On 16 October 2017 at 18:48, Denys Dmytriyenko <denis@denix.org> wrote:

> On Fri, Oct 13, 2017 at 12:28:25PM -0400, Denys Dmytriyenko wrote:

> > On Fri, Oct 13, 2017 at 12:33:35PM +0100, Burton, Ross wrote:

> > > On 12 October 2017 at 20:35, Denys Dmytriyenko <denis@denix.org>

> wrote:

> > >

> > > > From: Denys Dmytriyenko <denys@ti.com>

> > > >

> > > > Signed-off-by: Denys Dmytriyenko <denys@ti.com>

> > > >

> > >

> > > One day I'll figure out why quilt appears to be non-deterministic about

> > > this but:

> > >

> > > ERROR: wayland-protocols-1.11-r0 do_patch: Command Error: 'quilt

> --quiltrc

> > > /data/poky-tmp/master/build/work/all-poky-linux/wayland-

> protocols/1.11-r0/recipe-sysroot-native/etc/quiltrc

> > > push' exited with 0  Output:

> > > Applying patch usesysrootprefixforpkgdatadirvariable.patch

> >

> > I don't see this patch in master. Works fine in distroless and poky from

> > master.

>

> Ping.

>


The patch fails here, so I'm waiting for a v2.

Ross
<div dir="ltr">On 16 October 2017 at 18:48, Denys Dmytriyenko <span dir="ltr">&lt;<a href="mailto:denis@denix.org" target="_blank">denis@denix.org</a>&gt;</span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On Fri, Oct 13, 2017 at 12:28:25PM -0400, Denys Dmytriyenko wrote:<br>
&gt; On Fri, Oct 13, 2017 at 12:33:35PM +0100, Burton, Ross wrote:<br>
&gt; &gt; On 12 October 2017 at 20:35, Denys Dmytriyenko &lt;<a href="mailto:denis@denix.org">denis@denix.org</a>&gt; wrote:<br>
&gt; &gt;<br>
&gt; &gt; &gt; From: Denys Dmytriyenko &lt;<a href="mailto:denys@ti.com">denys@ti.com</a>&gt;<br>
&gt; &gt; &gt;<br>
&gt; &gt; &gt; Signed-off-by: Denys Dmytriyenko &lt;<a href="mailto:denys@ti.com">denys@ti.com</a>&gt;<br>
&gt; &gt; &gt;<br>
&gt; &gt;<br>
&gt; &gt; One day I&#39;ll figure out why quilt appears to be non-deterministic about<br>
&gt; &gt; this but:<br>
&gt; &gt;<br>
&gt; &gt; ERROR: wayland-protocols-1.11-r0 do_patch: Command Error: &#39;quilt --quiltrc<br>
&gt; &gt; /data/poky-tmp/master/build/<wbr>work/all-poky-linux/wayland-<wbr>protocols/1.11-r0/recipe-<wbr>sysroot-native/etc/quiltrc<br>
&gt; &gt; push&#39; exited with 0  Output:<br>
&gt; &gt; Applying patch usesysrootprefixforpkgdatadirv<wbr>ariable.patch<br>
&gt;<br>
&gt; I don&#39;t see this patch in master. Works fine in distroless and poky from<br>
&gt; master.<br>
<br>
</span>Ping.<br></blockquote><div><br></div><div>The patch fails here, so I&#39;m waiting for a v2.</div><div><br></div><div>Ross </div></div></div></div>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Denys Dmytriyenko Oct. 16, 2017, 8:54 p.m. | #6
On Mon, Oct 16, 2017 at 09:31:49PM +0100, Burton, Ross wrote:
> On 16 October 2017 at 18:48, Denys Dmytriyenko <denis@denix.org> wrote:

> 

> > On Fri, Oct 13, 2017 at 12:28:25PM -0400, Denys Dmytriyenko wrote:

> > > On Fri, Oct 13, 2017 at 12:33:35PM +0100, Burton, Ross wrote:

> > > > On 12 October 2017 at 20:35, Denys Dmytriyenko <denis@denix.org>

> > wrote:

> > > >

> > > > > From: Denys Dmytriyenko <denys@ti.com>

> > > > >

> > > > > Signed-off-by: Denys Dmytriyenko <denys@ti.com>

> > > > >

> > > >

> > > > One day I'll figure out why quilt appears to be non-deterministic about

> > > > this but:

> > > >

> > > > ERROR: wayland-protocols-1.11-r0 do_patch: Command Error: 'quilt

> > --quiltrc

> > > > /data/poky-tmp/master/build/work/all-poky-linux/wayland-

> > protocols/1.11-r0/recipe-sysroot-native/etc/quiltrc

> > > > push' exited with 0  Output:

> > > > Applying patch usesysrootprefixforpkgdatadirvariable.patch

> > >

> > > I don't see this patch in master. Works fine in distroless and poky from

> > > master.

> >

> > Ping.

> 

> The patch fails here, so I'm waiting for a v2.


As I said above - there's no usesysrootprefixforpkgdatadirvariable.patch in 
wayland-protocols recipe in master, master-next or rocko branches:

http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb

Are you sure you don't have something in your local tree?

-- 
Denys
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Burton, Ross Oct. 16, 2017, 8:56 p.m. | #7
On 16 October 2017 at 21:54, Denys Dmytriyenko <denis@denix.org> wrote:

> On Mon, Oct 16, 2017 at 09:31:49PM +0100, Burton, Ross wrote:

> > On 16 October 2017 at 18:48, Denys Dmytriyenko <denis@denix.org> wrote:

> >

> > > On Fri, Oct 13, 2017 at 12:28:25PM -0400, Denys Dmytriyenko wrote:

> > > > On Fri, Oct 13, 2017 at 12:33:35PM +0100, Burton, Ross wrote:

> > > > > On 12 October 2017 at 20:35, Denys Dmytriyenko <denis@denix.org>

> > > wrote:

> > > > >

> > > > > > From: Denys Dmytriyenko <denys@ti.com>

> > > > > >

> > > > > > Signed-off-by: Denys Dmytriyenko <denys@ti.com>

> > > > > >

> > > > >

> > > > > One day I'll figure out why quilt appears to be non-deterministic

> about

> > > > > this but:

> > > > >

> > > > > ERROR: wayland-protocols-1.11-r0 do_patch: Command Error: 'quilt

> > > --quiltrc

> > > > > /data/poky-tmp/master/build/work/all-poky-linux/wayland-

> > > protocols/1.11-r0/recipe-sysroot-native/etc/quiltrc

> > > > > push' exited with 0  Output:

> > > > > Applying patch usesysrootprefixforpkgdatadirvariable.patch

> > > >

> > > > I don't see this patch in master. Works fine in distroless and poky

> from

> > > > master.

> > >

> > > Ping.

> >

> > The patch fails here, so I'm waiting for a v2.

>

> As I said above - there's no usesysrootprefixforpkgdatadirvariable.patch

> in

> wayland-protocols recipe in master, master-next or rocko branches:

>

> http://cgit.openembedded.org/openembedded-core/tree/meta/

> recipes-graphics/wayland/wayland-protocols_1.10.bb

>

> Are you sure you don't have something in your local tree?

>


Damnit, yes.  There's an earlier series to remove the nasty hacks. I
realised this when I saw your first reply to my patch but then forgot
again, sorry!

One of them needs to land first, and they won.  Wait for master to re-open,
or rebase on top of ross/mut.

Ross
<div dir="ltr">On 16 October 2017 at 21:54, Denys Dmytriyenko <span dir="ltr">&lt;<a href="mailto:denis@denix.org" target="_blank">denis@denix.org</a>&gt;</span> wrote:<br><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On Mon, Oct 16, 2017 at 09:31:49PM +0100, Burton, Ross wrote:<br>
&gt; On 16 October 2017 at 18:48, Denys Dmytriyenko &lt;<a href="mailto:denis@denix.org">denis@denix.org</a>&gt; wrote:<br>
&gt;<br>
&gt; &gt; On Fri, Oct 13, 2017 at 12:28:25PM -0400, Denys Dmytriyenko wrote:<br>
&gt; &gt; &gt; On Fri, Oct 13, 2017 at 12:33:35PM +0100, Burton, Ross wrote:<br>
&gt; &gt; &gt; &gt; On 12 October 2017 at 20:35, Denys Dmytriyenko &lt;<a href="mailto:denis@denix.org">denis@denix.org</a>&gt;<br>
&gt; &gt; wrote:<br>
&gt; &gt; &gt; &gt;<br>
&gt; &gt; &gt; &gt; &gt; From: Denys Dmytriyenko &lt;<a href="mailto:denys@ti.com">denys@ti.com</a>&gt;<br>
&gt; &gt; &gt; &gt; &gt;<br>
&gt; &gt; &gt; &gt; &gt; Signed-off-by: Denys Dmytriyenko &lt;<a href="mailto:denys@ti.com">denys@ti.com</a>&gt;<br>
&gt; &gt; &gt; &gt; &gt;<br>
&gt; &gt; &gt; &gt;<br>
&gt; &gt; &gt; &gt; One day I&#39;ll figure out why quilt appears to be non-deterministic about<br>
&gt; &gt; &gt; &gt; this but:<br>
&gt; &gt; &gt; &gt;<br>
&gt; &gt; &gt; &gt; ERROR: wayland-protocols-1.11-r0 do_patch: Command Error: &#39;quilt<br>
&gt; &gt; --quiltrc<br>
&gt; &gt; &gt; &gt; /data/poky-tmp/master/build/<wbr>work/all-poky-linux/wayland-<br>
&gt; &gt; protocols/1.11-r0/recipe-<wbr>sysroot-native/etc/quiltrc<br>
&gt; &gt; &gt; &gt; push&#39; exited with 0  Output:<br>
&gt; &gt; &gt; &gt; Applying patch usesysrootprefixforpkgdatadirv<wbr>ariable.patch<br>
&gt; &gt; &gt;<br>
&gt; &gt; &gt; I don&#39;t see this patch in master. Works fine in distroless and poky from<br>
&gt; &gt; &gt; master.<br>
&gt; &gt;<br>
&gt; &gt; Ping.<br>
&gt;<br>
&gt; The patch fails here, so I&#39;m waiting for a v2.<br>
<br>
</span>As I said above - there&#39;s no usesysrootprefixforpkgdatadirv<wbr>ariable.patch in<br>
wayland-protocols recipe in master, master-next or rocko branches:<br>
<br>
<a href="http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb" rel="noreferrer" target="_blank">http://cgit.openembedded.org/<wbr>openembedded-core/tree/meta/<wbr>recipes-graphics/wayland/<wbr>wayland-protocols_1.10.bb</a><br>
<br>
Are you sure you don&#39;t have something in your local tree?<br></blockquote><div><br></div><div>Damnit, yes.  There&#39;s an earlier series to remove the nasty hacks. I realised this when I saw your first reply to my patch but then forgot again, sorry!</div><div><br></div><div>One of them needs to land first, and they won.  Wait for master to re-open, or rebase on top of ross/mut.</div><div><br></div><div>Ross </div></div></div></div>
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.11.bb
similarity index 85%
rename from meta/recipes-graphics/wayland/wayland-protocols_1.10.bb
rename to meta/recipes-graphics/wayland/wayland-protocols_1.11.bb
index 4f9e9f3..26b0094 100644
--- a/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb
+++ b/meta/recipes-graphics/wayland/wayland-protocols_1.11.bb
@@ -11,8 +11,8 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
 
 SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
            "
-SRC_URI[md5sum] = "84a7846c2b6a6a3e265fc9be36453e60"
-SRC_URI[sha256sum] = "5719c51d7354864983171c5083e93a72ac99229e2b460c4bb10513de08839c0a"
+SRC_URI[md5sum] = "8d0338556d77ad86d7fca84ff086af88"
+SRC_URI[sha256sum] = "3afcee1d51c5b1d70b59da790c9830b354236324b19b2b7af9683bd3b7be6804"
 
 inherit allarch autotools pkgconfig