Hi, On 05/23/2017 11:43 PM, Martin Jansa wrote: > Please check 2 meson changes from Ricardo Ribalda Delgado sent few days > before yours and rebase your change on top of it. > > One of those patches don't apply now on this version: > http://errors.yoctoproject.org/Errors/Details/143049/
Oh, sorry for that. I missed that other patch. I've asked upstream if there is a better solution so we don't have to touch meson in OE. If there isn't any, I'll port the patch. Thanks! Daniel > On Tue, May 23, 2017 at 2:34 PM, Daniel Mack <dan...@zonque.org > <mailto:dan...@zonque.org>> wrote: > > Signed-off-by: Daniel Mack <dan...@zonque.org > <mailto:dan...@zonque.org>> > --- > meta-oe/recipes-devtools/meson/{meson_0.37.1.bb > <http://meson_0.37.1.bb> => meson_0.40.1.bb > <http://meson_0.40.1.bb>} | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > rename meta-oe/recipes-devtools/meson/{meson_0.37.1.bb > <http://meson_0.37.1.bb> => meson_0.40.1.bb > <http://meson_0.40.1.bb>} (87%) > > diff --git a/meta-oe/recipes-devtools/meson/meson_0.37.1.bb > <http://meson_0.37.1.bb> > b/meta-oe/recipes-devtools/meson/meson_0.40.1.bb > <http://meson_0.40.1.bb> > similarity index 87% > rename from meta-oe/recipes-devtools/meson/meson_0.37.1.bb > <http://meson_0.37.1.bb> > rename to meta-oe/recipes-devtools/meson/meson_0.40.1.bb > <http://meson_0.40.1.bb> > index a83af77..2ba2fc8 100644 > --- a/meta-oe/recipes-devtools/meson/meson_0.37.1.bb > <http://meson_0.37.1.bb> > +++ b/meta-oe/recipes-devtools/meson/meson_0.40.1.bb > <http://meson_0.40.1.bb> > @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = > "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" > > SRC_URI = "git://github.com/mesonbuild/meson.git > <http://github.com/mesonbuild/meson.git>" > > -SRCREV = "3d4bfdcb22314ea7db45a5b075f8b2a9c1498aab" > +SRCREV = "b25d3e4d3f2b4d37029a507cc089bdde643c6240" > > S = "${WORKDIR}/git" > > -- > 2.9.4 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > <mailto:Openembedded-devel@lists.openembedded.org> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel > <http://lists.openembedded.org/mailman/listinfo/openembedded-devel> > > -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel