| Message ID | 1507836933-142066-1-git-send-email-denis@denix.org |
|---|---|
| State | New |
| Headers | show |
| Series | wayland-protocols: upgrade to 1.11 | expand |
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"><<a href="mailto:denis@denix.org" target="_blank">denis@denix.org</a>></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 <<a href="mailto:denys@ti.com">denys@ti.com</a>><br> <br> Signed-off-by: Denys Dmytriyenko <<a href="mailto:denys@ti.com">denys@ti.com</a>><br></blockquote><div><br></div><div>One day I'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: '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:</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
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
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 <<a href="mailto:ross.burton@intel.com">ross.burton@intel.com</a>> 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><<a href="mailto:denis@denix.org" target="_blank">denis@denix.org</a>></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 <<a href="mailto:denys@ti.com" target="_blank">denys@ti.com</a>><br> <br> Signed-off-by: Denys Dmytriyenko <<a href="mailto:denys@ti.com" target="_blank">denys@ti.com</a>><br></blockquote><div><br></div></div></div></div><div><div class="gmail_extra"><div class="gmail_quote"><div>One day I'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: '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:</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
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
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"><<a href="mailto:denis@denix.org" target="_blank">denis@denix.org</a>></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> > On Fri, Oct 13, 2017 at 12:33:35PM +0100, Burton, Ross wrote:<br> > > On 12 October 2017 at 20:35, Denys Dmytriyenko <<a href="mailto:denis@denix.org">denis@denix.org</a>> wrote:<br> > ><br> > > > From: Denys Dmytriyenko <<a href="mailto:denys@ti.com">denys@ti.com</a>><br> > > ><br> > > > Signed-off-by: Denys Dmytriyenko <<a href="mailto:denys@ti.com">denys@ti.com</a>><br> > > ><br> > ><br> > > One day I'll figure out why quilt appears to be non-deterministic about<br> > > this but:<br> > ><br> > > ERROR: wayland-protocols-1.11-r0 do_patch: Command Error: 'quilt --quiltrc<br> > > /data/poky-tmp/master/build/<wbr>work/all-poky-linux/wayland-<wbr>protocols/1.11-r0/recipe-<wbr>sysroot-native/etc/quiltrc<br> > > push' exited with 0 Output:<br> > > Applying patch usesysrootprefixforpkgdatadirv<wbr>ariable.patch<br> ><br> > I don't see this patch in master. Works fine in distroless and poky from<br> > master.<br> <br> </span>Ping.<br></blockquote><div><br></div><div>The patch fails here, so I'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
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
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"><<a href="mailto:denis@denix.org" target="_blank">denis@denix.org</a>></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> > On 16 October 2017 at 18:48, Denys Dmytriyenko <<a href="mailto:denis@denix.org">denis@denix.org</a>> wrote:<br> ><br> > > On Fri, Oct 13, 2017 at 12:28:25PM -0400, Denys Dmytriyenko wrote:<br> > > > On Fri, Oct 13, 2017 at 12:33:35PM +0100, Burton, Ross wrote:<br> > > > > On 12 October 2017 at 20:35, Denys Dmytriyenko <<a href="mailto:denis@denix.org">denis@denix.org</a>><br> > > wrote:<br> > > > ><br> > > > > > From: Denys Dmytriyenko <<a href="mailto:denys@ti.com">denys@ti.com</a>><br> > > > > ><br> > > > > > Signed-off-by: Denys Dmytriyenko <<a href="mailto:denys@ti.com">denys@ti.com</a>><br> > > > > ><br> > > > ><br> > > > > One day I'll figure out why quilt appears to be non-deterministic about<br> > > > > this but:<br> > > > ><br> > > > > ERROR: wayland-protocols-1.11-r0 do_patch: Command Error: 'quilt<br> > > --quiltrc<br> > > > > /data/poky-tmp/master/build/<wbr>work/all-poky-linux/wayland-<br> > > protocols/1.11-r0/recipe-<wbr>sysroot-native/etc/quiltrc<br> > > > > push' exited with 0 Output:<br> > > > > Applying patch usesysrootprefixforpkgdatadirv<wbr>ariable.patch<br> > > ><br> > > > I don't see this patch in master. Works fine in distroless and poky from<br> > > > master.<br> > ><br> > > Ping.<br> ><br> > The patch fails here, so I'm waiting for a v2.<br> <br> </span>As I said above - there'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't have something in your local tree?<br></blockquote><div><br></div><div>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!</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
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 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
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. -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
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