[PATCH] wayland-protocols: upgrade to 1.11

[PATCH] wayland-protocols: upgrade to 1.11

[Denys Dmytriyenko]

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%)

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
 
-- 
2.7.4

Re: [PATCH] wayland-protocols: upgrade to 1.11

[Burton, Ross]

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

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

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

Re: [PATCH] wayland-protocols: upgrade to 1.11

[Denys Dmytriyenko]

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

Re: [PATCH] wayland-protocols: upgrade to 1.11

[Khem Raj]

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

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
>

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

Re: [PATCH] wayland-protocols: upgrade to 1.11

[Denys Dmytriyenko]

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

Re: [PATCH] wayland-protocols: upgrade to 1.11

[Burton, Ross]

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

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

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

Re: [PATCH] wayland-protocols: upgrade to 1.11

[Denys Dmytriyenko]

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

Re: [PATCH] wayland-protocols: upgrade to 1.11

[Burton, Ross]

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

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

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

Re: [PATCH] wayland-protocols: upgrade to 1.11

[Denys Dmytriyenko]

On Mon, Oct 16, 2017 at 09:56:56PM +0100, Burton, Ross wrote:
> 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.

I'm not sure how this is possible, when new revisions of that patch are still 
coming in - v5 was just submitted yesterday, while ross/mut shows the patch 
was merged 6 hours ago (unless you rebased your branch, of course)...

Anyway, looks like the patch that breaks for you is a backport from version 
1.11, for which I submitted the update, so it simply needs to be dropped.

-- 
Denys

Re: [PATCH] wayland-protocols: upgrade to 1.11

[Denys Dmytriyenko]

On Tue, Oct 17, 2017 at 06:53:25PM -0400, Denys Dmytriyenko wrote:
> On Mon, Oct 16, 2017 at 09:56:56PM +0100, Burton, Ross wrote:
> > 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.
> 
> I'm not sure how this is possible, when new revisions of that patch are still 
> coming in - v5 was just submitted yesterday, while ross/mut shows the patch 
> was merged 6 hours ago (unless you rebased your branch, of course)...
> 
> Anyway, looks like the patch that breaks for you is a backport from version 
> 1.11, for which I submitted the update, so it simply needs to be dropped.

v2 has been posted.