Yocto doesn't support git binary diff - workaround?

chris_f — Wed, 22 Mar 2017 16:41:10 GMT

I'm making minor modifications to my Yocto project using a layer that includes git patch files called up by bbappend files.

This was working fine until I tried to add a new logo BMP file which causes git to produce a binary diff.

This cause bitbake to fail with:

File tools/logos/mx6ullevk.bmp: git binary diffs are not supported.
Patch 0002-First-steps-at-a-useable-python-file-to-create-bitma.patch does not apply (enforce with -f)

That's a pain. Can someone suggest a simple work around?

Build Configuration:
BB_VERSION = "1.30.0"
BUILD_SYS = "x86_64-linux"
NATIVELSBSTRING = "Ubuntu-16.04"
TARGET_SYS = "arm-poky-linux-gnueabi"
MACHINE = "imx6ull14x14evk"
DISTRO = "fsl-imx-fb"
DISTRO_VERSION = "4.1.15-2.0.1"

Re: Yocto doesn't support git binary diff - workaround?

chris_f — Wed, 22 Mar 2017 18:06:03 GMT

I worked around the problem by storing my new bmp in base64 encoded format and using the Makefile to produce the binary. It's not nice but it works.

topic Re: Yocto doesn't support git binary diff - workaround? in i.MX Processors

Yocto doesn't support git binary diff - workaround?

Re: Yocto doesn't support git binary diff - workaround?