Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Mike Zick <minimod@morethan.org>
To: buildroot@busybox.net
Subject: [Buildroot] git binary diffs are not supported
Date: Wed, 16 Jul 2014 12:36:48 -0500	[thread overview]
Message-ID: <20140716123648.47d7b652@core2quad.morethan.org> (raw)
In-Reply-To: <20140716152504.4bd10dbb@free-electrons.com>

On Wed, 16 Jul 2014 15:25:04 +0200
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:

> Dear J?rg Krause,
> 
> On Wed, 16 Jul 2014 13:44:49 +0200, J?rg Krause wrote:
> 
> > I am trying to apply a git binary patch to add a firmware binary
> > blob to the linux kernel firmware directory. I am using git
> > format-patch --binary -M -n -s to create the patch and copy it to
> > the global patch directory. Trying to build linux fails while
> > patching with the following error message:
> > 
> >     git binary diffs are not supported.
> > 
> > Do I missed something? I would be glad for any advice!
> 
> We don't use git to apply patches when building packages in Buildroot,
> we use the plain old patch, which indeed doesn't support binary diffs.
>

The bsdiff / bspatch pair of utilities is probably still the preferred
tools for patching binaries.

With that thought in mind, it should still be possible to find an
alternative to patching binaries in a build system.

Those utilities where intended for use in post-build situations.

Mike

> Not sure how to solve this situation. Does your firmware really needs
> to be part of the kernel build process? Can't it be loaded from the
> filesystem at boot time, as is done for all the firmwares in the
> linux-firmware package? If that was possible, then you would simply
> have to create a simple Buildroot package that installs your firmware
> into /lib/firmware/.
> 
> Best regards,
> 
> Thomas

  reply	other threads:[~2014-07-16 17:36 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-16 11:44 [Buildroot] git binary diffs are not supported Jörg Krause
2014-07-16 13:25 ` Thomas Petazzoni
2014-07-16 17:36   ` Mike Zick [this message]
2014-07-17 21:14     ` Jörg Krause
2014-07-17 21:13   ` Jörg Krause
2014-07-17 21:29     ` Thomas Petazzoni
2014-07-18 15:29       ` Jörg Krause

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140716123648.47d7b652@core2quad.morethan.org \
    --to=minimod@morethan.org \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox