[ptxdist] Binary patches

[ptxdist] Binary patches

[Matthias Klein]

[-- Attachment #1.1: Type: text/plain, Size: 330 bytes --]

Hello,

I try to create a patch file for the kernel which adds a binary file 
(firmware blob).
I tried git diff --binary but then I get following error from patch:

applying 'firmware.diff'
patch: **** Only garbage was found in the patch input.

How can I create a patch for binary files?


Best regards,

Matthias

[-- Attachment #1.2: Type: text/html, Size: 961 bytes --]

[-- Attachment #2: Type: text/plain, Size: 48 bytes --]

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Binary patches

[Matthias Klein]

[-- Attachment #1.1: Type: text/plain, Size: 593 bytes --]

Does anyone have a tip howto make a binary patch for ptxdist ?


------ Originalnachricht ------
Von: "Matthias Klein" <matthias.klein@optimeas.de>
An: ptxdist@pengutronix.de
Gesendet: 23.01.2013 11:54:55
Betreff: [ptxdist] Binary patches
>Hello,
>
>I try to create a patch file for the kernel which adds a binary file 
>(firmware blob).
>I tried git diff --binary but then I get following error from patch:
>
>applying 'firmware.diff'
>patch: **** Only garbage was found in the patch input.
>
>How can I create a patch for binary files?
>
>
>Best regards,
>
>Matthias
>

[-- Attachment #1.2: Type: text/html, Size: 1958 bytes --]

[-- Attachment #2: Type: text/plain, Size: 48 bytes --]

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Binary patches

[Andreas Bießmann]

Hi Matthias,

On 28.01.2013 14:19, Matthias Klein wrote:
> Does anyone have a tip howto make a binary patch for ptxdist ?

What is your intention here? Do you want a binary BLOB which should be
applied later on or would you like to have a patch that contains a
binary BLOB (your firmware file).

> ------ Originalnachricht ------
> Von: "Matthias Klein" <matthias.klein@optimeas.de
> <mailto:matthias.klein@optimeas.de>>
> An: ptxdist@pengutronix.de <mailto:ptxdist@pengutronix.de>
> Gesendet: 23.01.2013 11:54:55
> Betreff: [ptxdist] Binary patches
>> Hello,
>>  
>> I try to create a patch file for the kernel which adds a binary file
>> (firmware blob).
>> I tried git diff --binary but then I get following error from patch:
>>  
>> applying 'firmware.diff'
>> patch: **** Only garbage was found in the patch input.
>>  
>> How can I create a patch for binary files?

I used to put commits into the patch directory that can be sent via
email (aka 'git format-patch). If you export you patch that way git will
handle binary files probably:

---8<---
diff --git a/CKFA.bin b/CKFA.bin
new file mode 100755
index
0000000000000000000000000000000000000000..9befbf415a9fd8bcc19655ca1dc50966d248ebba
GIT binary patch
literal 6668
zcmbtZ3w)DBwx91y`ZfLf<Y`}~vGPa>FOhY<B9MGZ)AUJ+H4EN?Jo-okn_eCttS?$9
zP*ODI0|OKva4nDz*5!(Ny{v*D0akga
...
--->8---

vs

---8<---
diff --git a/CKFA.bin b/CKFA.bin
new file mode 100755
index 0000000..9befbf4
Binary files /dev/null and b/CKFA.bin differ
--->8---

BTW the preferred way to fill the patches directory is:

% ./p clean <package>
% mkdir -p patches/<package>-<version>
% touch patches/<package>-<version>/series
% ./p extract --git <package>
% cd platform-<config>/build-target/<package>-<version>

make your changes in this git reposritory

% git ptx-patches
% cd -
% ./p clean <package>
% ./p extract <package>

And watch the patching foo

Best regards

Andreas Bießmann

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Binary patches

[Matthias Klein]

Hi Andreas,

my intension is to create a patch file (containing the firmware) which 
will be applied at the kernel.prepare step using the series file.
(Then at the kernel.compile step the firmware should be compiled into 
the kernel.)


Best regards,

Matthias

------ Originalnachricht ------
Von: "Andreas Bießmann" <andreas.biessmann@corscience.de>
An: ptxdist@pengutronix.de; "Matthias Klein" 
<matthias.klein@optimeas.de>
Gesendet: 28.01.2013 15:31:38
Betreff: Re: [ptxdist] Binary patches
>Hi Matthias,
>
>On 28.01.2013 14:19, Matthias Klein wrote:
>>  Does anyone have a tip howto make a binary patch for ptxdist ?
>
>What is your intention here? Do you want a binary BLOB which should be
>applied later on or would you like to have a patch that contains a
>binary BLOB (your firmware file).
>
>>  ------ Originalnachricht ------
>>  Von: "Matthias Klein" <matthias.klein@optimeas.de
>>  <mailto:matthias.klein@optimeas.de>>
>>  An: ptxdist@pengutronix.de <mailto:ptxdist@pengutronix.de>
>>  Gesendet: 23.01.2013 11:54:55
>>  Betreff: [ptxdist] Binary patches
>>>  Hello,
>>>
>>>  I try to create a patch file for the kernel which adds a binary file
>>>  (firmware blob).
>>>  I tried git diff --binary but then I get following error from patch:
>>>
>>>  applying 'firmware.diff'
>>>  patch: **** Only garbage was found in the patch input.
>>>
>>>  How can I create a patch for binary files?
>
>I used to put commits into the patch directory that can be sent via
>email (aka 'git format-patch). If you export you patch that way git 
>will
>handle binary files probably:
>
>---8<---
>diff --git a/CKFA.bin b/CKFA.bin
>new file mode 100755
>index
>0000000000000000000000000000000000000000..9befbf415a9fd8bcc19655ca1dc50966d248ebba
>GIT binary patch
>literal 6668
>zcmbtZ3w)DBwx91y`ZfLf<Y`}~vGPa>FOhY<B9MGZ)AUJ+H4EN?Jo-okn_eCttS?$9
>zP*ODI0|OKva4nDz*5!(Ny{v*D0akga
>...
>--->8---
>
>vs
>
>---8<---
>diff --git a/CKFA.bin b/CKFA.bin
>new file mode 100755
>index 0000000..9befbf4
>Binary files /dev/null and b/CKFA.bin differ
>--->8---
>
>BTW the preferred way to fill the patches directory is:
>
>% ./p clean <package>
>% mkdir -p patches/<package>-<version>
>% touch patches/<package>-<version>/series
>% ./p extract --git <package>
>% cd platform-<config>/build-target/<package>-<version>
>
>make your changes in this git reposritory
>
>% git ptx-patches
>% cd -
>% ./p clean <package>
>% ./p extract <package>
>
>And watch the patching foo
>
>Best regards
>
>Andreas Bießmann
>


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Binary patches

[Andreas Bießmann]

Hi Matthias,

please do not top post full quote.

On 28.01.2013 15:38, Matthias Klein wrote:
> Hi Andreas,
> 
> my intension is to create a patch file (containing the firmware) which
> will be applied at the kernel.prepare step using the series file.

Well, as I thought, so please try my step by step guide.

And to be exact the patches will be applied in the extract phase. The
prepare phase will call the configure stuff for the respective package
you build.

> (Then at the kernel.compile step the firmware should be compiled into
> the kernel.)

That is why we need the patches ;)

Best regards

Andreas Bießmann


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Binary patches

[Matthias Klein]

Hi Andreas,

>Well, as I thought, so please try my step by step guide.
>
Sorry, at the first reading I have your step guide.


I have followed your step guide, and git creates a now patch file in the 
format you described (GIT binary patch) and added it to the series file.
Very nice. Is the "extract --git" and "git ptx-patches" somewhere 
documented?


But then at the normal "extract" I get a error from patch:

applying '0050-SDMA-firmware.patch'
patch: **** Only garbage was found in the patch input.
make: *** [.../platform-tx53/state/kernel.extract] Error 2

Do I make something wrong, or do I need a speacial "patch" version for 
GIT binary patches?



Best regards,

Matthias


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Binary patches

[Andreas Bießmann]

Hi Matthias,

On 29.01.2013 09:39, Matthias Klein wrote:
> Hi Andreas,
> 
>> Well, as I thought, so please try my step by step guide.
>>
> Sorry, at the first reading I have your step guide.
> 
> 
> I have followed your step guide, and git creates a now patch file in the
> format you described (GIT binary patch) and added it to the series file.
> Very nice. Is the "extract --git" and "git ptx-patches" somewhere
> documented?

I do not know if this made it into the 'How to become a PTXdist Guru'
document. I got this hint by Michael last year:
http://article.gmane.org/gmane.comp.embedded.ptxdist.devel/8544

> But then at the normal "extract" I get a error from patch:
> 
> applying '0050-SDMA-firmware.patch'
> patch: **** Only garbage was found in the patch input.
> make: *** [.../platform-tx53/state/kernel.extract] Error 2
> 
> Do I make something wrong, or do I need a speacial "patch" version for
> GIT binary patches?
Not that I know of, patch 2.6.1 works for me here as expected (Debian
Wheezy):

---8<---
0078-add-binary-blob.patch
patchin: git: done

finished target kernel.extract
./p_normal extract kernel  29,22s user 7,69s system 74% cpu 49,745 total
abiessmann@azuregos % git --version
git version 1.7.10.4
abiessmann@azuregos % patch --version
patch 2.6.1
abiessmann@azuregos % ls -la
platform-test/build-target/linux-3.4/firmware/CKFA.bin
-rwxr-xr-x 1 abiessmann abiessmann 6668 Jan 29 10:25
platform-test/build-target/linux-3.4/firmware/CKFA.bin*
abiessmann@azuregos % head -20 patches/linux-3.4/0078-add-binary-blob.patch
From: =?UTF-8?q?Andreas=20Bie=C3=9Fmann?= <andreas.biessmann@corscience.de>
Date: Tue, 29 Jan 2013 10:24:15 +0100
Subject: [PATCH] add binary blob
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Bießmann <andreas.biessmann@corscience.de>
---
 firmware/CKFA.bin |  Bin 0 -> 6668 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100755 firmware/CKFA.bin

diff --git a/firmware/CKFA.bin b/firmware/CKFA.bin
new file mode 100755
index
0000000000000000000000000000000000000000..9befbf415a9fd8bcc19655ca1dc50966d248ebba
GIT binary patch
literal 6668
zcmbtZ3w)DBwx91y`ZfLf<Y`}~vGPa>FOhY<B9MGZ)AUJ+H4EN?Jo-okn_eCttS?$9
zP*ODI0|OKva4nDz*5!(Ny{v*D0akgat6r8xmSq*uYqIFtE&`Ho&zU5oRFwO>H~CG@
--->8---

Beside that, have you thought about Roberts comment?
You can not distribute binary BLOB in a GPLv2 software and refuse
disclosure of that blob. To load binary closed source firmware blobs the
linux kernel provides a userspace interface. You should use that if you
intend to sell this device.

Best regards

Andreas Bießmann

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Binary patches

[Juergen Beisert]

Andreas Bießmann wrote:
> On 29.01.2013 09:39, Matthias Klein wrote:
> >> Well, as I thought, so please try my step by step guide.
> >
> > Sorry, at the first reading I have your step guide.
> >
> >
> > I have followed your step guide, and git creates a now patch file in the
> > format you described (GIT binary patch) and added it to the series file.
> > Very nice. Is the "extract --git" and "git ptx-patches" somewhere
> > documented?
>
> I do not know if this made it into the 'How to become a PTXdist Guru'
> document.

No, not yet. Some volunteers?

> I got this hint by Michael last year: 
> http://article.gmane.org/gmane.comp.embedded.ptxdist.devel/8544
>
> > But then at the normal "extract" I get a error from patch:
> >
> > applying '0050-SDMA-firmware.patch'
> > patch: **** Only garbage was found in the patch input.
> > make: *** [.../platform-tx53/state/kernel.extract] Error 2
> >
> > Do I make something wrong, or do I need a speacial "patch" version for
> > GIT binary patches?

Maybe only git itself is able to apply its own binary patches again, but not 
the 'patch' tool.

> [...]

Regards,
Juergen

-- 
Pengutronix e.K.                              | Juergen Beisert             |
Linux Solutions for Science and Industry      | http://www.pengutronix.de/  |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Binary patches

[Matthias Klein]

Hi Juergen,

 >Maybe only git itself is able to apply its own binary patches again, 
but not
 >the 'patch' tool.

Does that mean that the normal "ptxdist extract" step does not support 
binary patches (only "ptxdist extract --git") ?


Best regards,

Matthias


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Binary patches

[Andreas Bießmann]

Hi Matthias,

On 29.01.2013 11:26, Matthias Klein wrote:
> Hi Juergen,
> 
>>Maybe only git itself is able to apply its own binary patches again,
> but not
>>the 'patch' tool.
> 
> Does that mean that the normal "ptxdist extract" step does not support
> binary patches (only "ptxdist extract --git") ?

Oups, it seems so. I used to set the 'Developer Option' 'use git to
apply patches'. Removing that produces the smae error for me:

---8<---
Applying patch 0078-add-binary-blob.patch
patch: **** Only garbage was found in the patch input.
Patch 0078-add-binary-blob.patch does not apply (enforce with -f)
--->---

Best regards

Andreas Bießmann

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Binary patches

[Bernhard Walle]

* Andreas Bießmann <andreas.biessmann@corscience.de> [2013-01-29 12:12]:
> On 29.01.2013 11:26, Matthias Klein wrote:
> > Hi Juergen,
> > 
> >>Maybe only git itself is able to apply its own binary patches again,
> > but not
> >>the 'patch' tool.
> > 
> > Does that mean that the normal "ptxdist extract" step does not support
> > binary patches (only "ptxdist extract --git") ?
> 
> Oups, it seems so. I used to set the 'Developer Option' 'use git to
> apply patches'. Removing that produces the smae error for me:

Which version of patch do you have? Or do you use quilt to apply
patches? Because the latest GNU patch at least claims to support binary
git patches.


Regards,
Bernhard

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Binary patches

[Bernhard Walle]

* Bernhard Walle <bernhard@bwalle.de> [2013-01-29 13:06]:
> * Andreas Bießmann <andreas.biessmann@corscience.de> [2013-01-29 12:12]:
> > On 29.01.2013 11:26, Matthias Klein wrote:
> > > Hi Juergen,
> > > 
> > >>Maybe only git itself is able to apply its own binary patches again,
> > > but not
> > >>the 'patch' tool.
> > > 
> > > Does that mean that the normal "ptxdist extract" step does not support
> > > binary patches (only "ptxdist extract --git") ?
> > 
> > Oups, it seems so. I used to set the 'Developer Option' 'use git to
> > apply patches'. Removing that produces the smae error for me:
> 
> Which version of patch do you have? Or do you use quilt to apply
> patches? Because the latest GNU patch at least claims to support binary
> git patches.

Okay, "supported" only means that it recognizes it and complains that it
doesn't support... :(

Regards,
Bernhard

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Binary patches

[Andreas Bießmann]

Hi Bernhard,

On 29.01.2013 13:30, Bernhard Walle wrote:
> * Bernhard Walle <bernhard@bwalle.de> [2013-01-29 13:06]:
>> * Andreas Bießmann <andreas.biessmann@corscience.de> [2013-01-29 12:12]:
>>> On 29.01.2013 11:26, Matthias Klein wrote:
>>>> Hi Juergen,
>>>>
>>>>> Maybe only git itself is able to apply its own binary patches again,
>>>> but not
>>>>> the 'patch' tool.
>>>>
>>>> Does that mean that the normal "ptxdist extract" step does not support
>>>> binary patches (only "ptxdist extract --git") ?
>>>
>>> Oups, it seems so. I used to set the 'Developer Option' 'use git to
>>> apply patches'. Removing that produces the smae error for me:
>>
>> Which version of patch do you have? Or do you use quilt to apply
>> patches? Because the latest GNU patch at least claims to support binary
>> git patches.

The 'fallback' for git in PTXdist (in fact the default setup) is quilt,
isn't it?
I did a short test with my CKFA blob and didn't manage to create a patch
with quilt. Only pointer I found was [1] ... however I have currently no
time to dig into this.

> Okay, "supported" only means that it recognizes it and complains that it
> doesn't support... :(

;) I will stick to git as patch backend.

Best regards

Andreas Bießmann

[1] http://lists.gnu.org/archive/html/quilt-dev/2007-01/msg00001.html

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Binary patches

[Bernhard Walle]

* Andreas Bießmann <andreas.biessmann@corscience.de> [2013-01-29 14:29]:
> 
> The 'fallback' for git in PTXdist (in fact the default setup) is quilt,
> isn't it?

Only if it's present. If not, it falls back to plain 'patch'.

> > Okay, "supported" only means that it recognizes it and complains that it
> > doesn't support... :(
> 
> ;) I will stick to git as patch backend.

It's quite slow with large source trees (like the kernel). The initial
import takes ~ 20 secs AFAIR.


Regards,
Bernhard

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Binary patches

[Bernhard Walle]

* Juergen Beisert <jbe@pengutronix.de> [2013-01-29 11:20]:
> Andreas Bießmann wrote:
> > On 29.01.2013 09:39, Matthias Klein wrote:
> > >> Well, as I thought, so please try my step by step guide.
> > >
> > > Sorry, at the first reading I have your step guide.
> > >
> > >
> > > I have followed your step guide, and git creates a now patch file in the
> > > format you described (GIT binary patch) and added it to the series file.
> > > Very nice. Is the "extract --git" and "git ptx-patches" somewhere
> > > documented?
> >
> > I do not know if this made it into the 'How to become a PTXdist Guru'
> > document.
> 
> No, not yet. Some volunteers?

Are the latex sources of that document available in the publi?


Regards,
Bernhard

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Binary patches

[Robert Schwebel]

On Mon, Jan 28, 2013 at 02:38:12PM +0000, Matthias Klein wrote:
> my intension is to create a patch file (containing the firmware) which
> will be applied at the kernel.prepare step using the series file.
> (Then at the kernel.compile step the firmware should be compiled into
> the kernel.)

Is the firmware allowed to be distributed?

rsc
-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Binary patches

[Bernhard Walle]

* Matthias Klein <matthias.klein@optimeas.de> [2013-01-28 15:38]:
> 
> my intension is to create a patch file (containing the firmware)
> which will be applied at the kernel.prepare step using the series
> file.
> (Then at the kernel.compile step the firmware should be compiled
> into the kernel.)

Because I have the same problem I used another solution: Create a
directory local_src/firmware, copy the binary files there and
set in the kernel configuration

  Device drivers --->
    Generic Driver Options  --->
      [*]   Include in-kernel firmware blobs in kernel binary   
          (your_firmware) External firmware blobs to build into the kernel binary 
          (../../../local_src/firmware) Firmware blobs root directory   

That avoids the problem with binary patches.


Regards,
Bernhard

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Binary patches

[Matthias Klein]

[Bernhard Walle <bernhard@bwalle.de> 29.01.2013 14:12:11]
>Because I have the same problem I used another solution: Create a
>directory local_src/firmware, copy the binary files there and
>set in the kernel configuration
>
>   Device drivers --->
>     Generic Driver Options --->
>       [*] Include in-kernel firmware blobs in kernel binary
>           (your_firmware) External firmware blobs to build into the 
>kernel binary
>           (../../../local_src/firmware) Firmware blobs root directory
>
>That avoids the problem with binary patches.
>
>

Thank you for the tip !

But support for binary patches in ptxdist would be nice.


Best regards,

Matthias


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] Binary patches

[Alexander Stein]

Hello Andreas,

On Monday 28 January 2013 15:31:38, Andreas Bießmann wrote:
> BTW the preferred way to fill the patches directory is:
> 
> % ./p clean <package>
> % mkdir -p patches/<package>-<version>
> % touch patches/<package>-<version>/series
> % ./p extract --git <package>
> % cd platform-<config>/build-target/<package>-<version>
> 
> make your changes in this git reposritory
> 
> % git ptx-patches
> % cd -
> % ./p clean <package>
> % ./p extract <package>
> 
> And watch the patching foo

Thanks for this instruction list. You might have added that ptx-patches is an git alias which is created automatically while patching using git. A git user not knowing about ptx-patches might get confused :)

Best regards,
Alexander


-- 
ptxdist mailing list
ptxdist@pengutronix.de