Yocto doesn't support git binary diff - workaround?

cancel
Showing results for 
Show  only  | Search instead for 
Did you mean: 

Yocto doesn't support git binary diff - workaround?

Jump to solution
4,064 Views
chris_f
Contributor V

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"

Labels (2)
Tags (1)
1 Solution
3,219 Views
chris_f
Contributor V

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.

View solution in original post

0 Kudos
Reply
1 Reply
3,220 Views
chris_f
Contributor V

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.

0 Kudos
Reply