[Buildroot] patch: **** Only garbage was found in the patch input.

[Buildroot] patch: **** Only garbage was found in the patch input.

[Johan Sagaert]

Hi

Applying 0001-logo.patch using patch:
patch: **** Only garbage was found in the patch input.
Patch failed!  Please fix 0001-logo.patch!


I always use  git format patch to create patches  to use them
as usual in buildroot.
The modified files where image files, so this yields a binary patch.

It looks like patch does not understand the binary format that git 
format patch creates.

Is there any workaround this or do i have to revert to the old diff 
method for making patches
of non text files ?

Regards Johan

[Buildroot] patch: **** Only garbage was found in the patch input.

[Peter Korsgaard]

>>>>> "Johan" == Johan Sagaert <sagaert.johan@proximus.be> writes:

 > Hi
 > Applying 0001-logo.patch using patch:
 > patch: **** Only garbage was found in the patch input.
 > Patch failed!  Please fix 0001-logo.patch!

 > I always use  git format patch to create patches  to use them
 > as usual in buildroot.
 > The modified files where image files, so this yields a binary patch.

 > It looks like patch does not understand the binary format that git
 > format patch creates.

Indeed, gnu patch afaik doesn't support the binary git diff format.

 > Is there any workaround this or do i have to revert to the old diff
 > method for making patches
 > of non text files ?

Is this patch really something that is needed to fix a build issue of
the package? From the file name it more sounds like som project specific
customization of the rootfs. If that is so, why not just include the
image in your rootfs overlay?

-- 
Bye, Peter Korsgaard

[Buildroot] patch: **** Only garbage was found in the patch input.

[Johan Sagaert]

Hi Peter ,

Op 9/03/2016 om 7:23 schreef Peter Korsgaard:
>>>>>> "Johan" == Johan Sagaert<sagaert.johan@proximus.be>  writes:
>   > Hi
>   > Applying 0001-logo.patch using patch:
>   > patch: **** Only garbage was found in the patch input.
>   > Patch failed!  Please fix 0001-logo.patch!
>
>   > I always use  git format patch to create patches  to use them
>   > as usual in buildroot.
>   > The modified files where image files, so this yields a binary patch.
>
>   > It looks like patch does not understand the binary format that git
>   > format patch creates.
>
> Indeed, gnu patch afaik doesn't support the binary git diff format.
>
>   > Is there any workaround this or do i have to revert to the old diff
>   > method for making patches
>   > of non text files ?
>
> Is this patch really something that is needed to fix a build issue of
> the package? From the file name it more sounds like som project specific
> customization of the rootfs. If that is so, why not just include the
> image in your rootfs overlay?
>
I have to replace a logo bitmap in the u-boot sources that are pulled 
from a git repository .
So  i will have to add a |PRE_BUILD_HOOK for the u-boot loader in this 
case to replace the
logo bmp file before building, since diff cant create patches of binary 
files.

Regards, Johan



|
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20160309/077f46c8/attachment.html>

[Buildroot] patch: **** Only garbage was found in the patch input.

[Peter Korsgaard]

>>>>> "Johan" == Johan Sagaert <sagaert.johan@proximus.be> writes:

Hi,

 >> Is this patch really something that is needed to fix a build issue of
 >> the package? From the file name it more sounds like som project specific
 >> customization of the rootfs. If that is so, why not just include the
 >> image in your rootfs overlay?
 >> 
 > I have to replace a logo bitmap in the u-boot sources that are pulled
 > from a git repository .
 > So  i will have to add a |PRE_BUILD_HOOK for the u-boot loader in this
 > case to replace the
 > logo bmp file before building, since diff cant create patches of
 > binary files.

Or commit the logo change to u-boot git (possibly after cloning it
somewhere else if this is upstream u-boot git).

-- 
Venlig hilsen,
Peter Korsgaard