This is what I got:
$ git remote show origin
* remote origin
Fetch URL: git://git.yoctoproject.org/poky
Push URL: git://git.yoctoproject.org/poky
HEAD branch: master
latest commit:
bca260ef4dca87c11fc9d30b2b8a17664dc2d879 ninja: Upgrade from 1.7.2 to
major release 1.8.2
385944254d0ef88bd6450a221a54cbcb40020b42 tcmode-default.inc: drop
preferred version of gzip-native
On 02/02/2018 12:58 PM, Burton, Ross wrote:
On 2 February 2018 at 19:06, Alejandro Enedino Hernandez Samaniego
<aleja...@xilinx.com <mailto:aleja...@xilinx.com>> wrote:
This makes no sense to me, I rebased to master just before sending it.
Are you sure that the master you're rebasing is the actual upstream
master?
Applying: ninja: Upgrade from 1.7.2 to major release 1.8.2
Using index info to reconstruct a base tree...
error: patch failed: meta/recipes-devtools/ninja/ninja_1.7.2.bb:1
<http://ninja_1.7.2.bb:1>
error: meta/recipes-devtools/ninja/ninja_1.7.2.bb
<http://ninja_1.7.2.bb>: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Patch failed at 0001 ninja: Upgrade from 1.7.2 to major release 1.8.2
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
