Re: [flashrom] report for Intel QM67 | Winbond W25Q64 - layout patches

[Frei, Thomas (GE Germany)]

Hi Stefan,

today I loaded the sources again and I got the R1427.

The patches do not work on this.

So: What revision will I have to check out? Which revision are the patches for?

Kind Regards

Thomas
-----Original Message-----
From: Stefan Tauner [mailto:[e-mail]] 
Sent: Freitag, 2. September 2011 12:39
To: Frei, Thomas (GE Germany)
Cc: [e-mail]
Subject: Re: [flashrom] report for Intel QM67 | Winbond W25Q64 - layout patches

On Thu, 1 Sep 2011 15:28:42 +0200
"Frei, Thomas (GE Germany)"  wrote:
> Hi,
>
> I tried to clean the build environment (make clean), and reloaded the sources.
>
> With this clean base I started step by step to patch:
>
> Make -> PASS
> Patch < 0001....patch -> PASS
> Make -> PASS
> Patch < 0002....patch -> ERROR!!!
>
> --- snip ---
> (Stripping trailing CRs from patch)
> patching file cli_classic.c
> Hunk #1 FAILED at 226.
> Hunk #2 FAILED at 318.
> 2 out of 2 hunks FAILED -- saving rejects to cli_classic.c.rej 
> (Stripping trailing CRs from patch) patching file flash.h Hunk #1 
> FAILED at 255.
> 1 out of 1 hunk FAILED -- saving rejects to flash.h.rej (Stripping 
> trailing CRs from patch) patching file layout.c
> --- snip ---
>
> Am I doinf wrong, or what else can be?

you are using the wrong revision of source code (probably the most current one?) imo. the patches encode differences of files. when the files change too much 'patch' is not able to find the right spots to insert the hunks of code in the patches...

i am not using svn but i think the right command to fetch the correct version of source for those patches is:
svn update -r 1421

i am not sure if that eliminates all of your local changes though.
please check with svn st and revert them with svn revert or something similar before you try.

of course i could be wrong too. if the above does not work please post the commands used and complete outputs.
--
Kind regards/Mit freundlichen Grüßen, Stefan Tauner