"git binary diffs are not supported" error using yocto

Question

I have one git repo where i maintain some binary files. Now i want to create patches of last few commits & integrate them in Yocto build.

I have created patches like

git format-patch -3 --binary

Now i have integrate these patches in Yocto recipe files. And Yocto gives below error while git apply in do_patch()

git binary diffs are not supported.
Patch xyz.patch does not apply (enforce with -f)

Am i missing anything while creating binary patches here?

or

Is there any Yocto Hacks which i can do in my recipe file to handle with binary patches?

Answer 1

I also ran into this with patches created using the yocto tooling (devtool update-recipe), and I do not want to change the way I create the patches.

By default yocto uses quilt to apply patches, I addressed the issue using git instead.

This can be configured by setting the PATCHTOOL variable in the recipe:

PATCHTOOL = "git"

Answer 2

Maybe you need to use this cmd with additional flag --full-index

git format-patch -3 --full-index --binary

https://git-scm.com/docs/git-format-patch --binary In addition to --full-index, output a binary diff that can be applied with git-apply.