From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from moutng.kundenserver.de ([212.227.17.9])
	by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <andreas.biessmann@corscience.de>) id 1TzpkO-0003TR-A9
	for ptxdist@pengutronix.de; Mon, 28 Jan 2013 15:31:45 +0100
Message-ID: <51068BCA.4040806@corscience.de>
Date: Mon, 28 Jan 2013 15:31:38 +0100
From: =?ISO-8859-1?Q?Andreas_Bie=DFmann?=
 <andreas.biessmann@corscience.de>
MIME-Version: 1.0
References: <emaf3af07a-4ae2-422a-8881-4f00e80256b8@nb-mak>
In-Reply-To: <emaf3af07a-4ae2-422a-8881-4f00e80256b8@nb-mak>
Subject: Re: [ptxdist] Binary patches
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de, Matthias Klein <matthias.klein@optimeas.de>

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..9befbf415a9fd8bcc19655ca1dc50966d=
248ebba
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=DFmann

-- =

ptxdist mailing list
ptxdist@pengutronix.de