[OpenAFS-devel] patch format?

[Derek Atkins]

Um, why are you trying to patch your kernel sources?
The 'diff' is between OpenAFS revisions, it lets you "patch"
your existing OpenAFS source tree up to the new version.

You probably just want the tarball, not the patch.

-derek

Roland Kuhn <rkuhn@e18.physik.tu-muenchen.de> writes:

> Hi!
>
> Maybe I'm missing something way too obvious, but I can't apply the  
> 1.4.3rc1 patch:
>
> rkuhn@othello:/afs/e18/sw/compile/kernel/linux-2.6.19.2-modules/ 
> openafs$ patch -u -p1 <../../PATCHES/openafs-1.4.3rc1-src.diff
> patch: **** Only garbage was found in the patch input.
> rkuhn@othello:/afs/e18/sw/compile/kernel/linux-2.6.19.2-modules/ 
> openafs$ patch -n -p1 <../../PATCHES/openafs-1.4.3rc1-src.diff
> patch: **** Only garbage was found in the patch input.
> rkuhn@othello:/afs/e18/sw/compile/kernel/linux-2.6.19.2-modules/ 
> openafs$ patch -c -p1 <../../PATCHES/openafs-1.4.3rc1-src.diff
> can't find file to patch at input line 5
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |Index: openafs/src/WINNT/afsd/afsd_init.c
> |diff -c openafs/src/WINNT/afsd/afsd_init.c:1.40.2.37 openafs/src/ 
> WINNT/afsd/afsd_init.c:1.40.2.39
> |*** openafs/src/WINNT/afsd/afsd_init.c:1.40.2.37       Sun Oct  8  
> 21:50:25 2006
> |--- openafs/src/WINNT/afsd/afsd_init.c Fri Jan  5 13:55:20 2007
> --------------------------
> File to patch: [^C]
> rkuhn@othello:/afs/e18/sw/compile/kernel/linux-2.6.19.2-modules/ 
> openafs$ patch --version
> patch 2.5.9
> Copyright (C) 1988 Larry Wall
> Copyright (C) 2003 Free Software Foundation, Inc.
>
> This program comes with NO WARRANTY, to the extent permitted by law.
> You may redistribute copies of this program
> under the terms of the GNU General Public License.
> For more information about these matters, see the file named COPYING.
>
> written by Larry Wall and Paul Eggert
>
> What patch format is it? Unified diff doesn't produce these '***'  
> lines... (and the 'patch' output looks the same as 'patch -c')
>
> Ciao,
>                     Roland
>
> --
> TU Muenchen, Physik-Department E18, James-Franck-Str., 85748 Garching
> Telefon 089/289-12575; Telefax 089/289-12570
> --
> CERN office: 892-1-D23 phone: +41 22 7676540 mobile: +41 76 487 4482
> --
> Any society that would give up a little liberty to gain a little
> security will deserve neither and lose both.  - Benjamin Franklin
> -----BEGIN GEEK CODE BLOCK-----
> Version: 3.12
> GS/CS/M/MU d-(++) s:+ a-> C+++ UL++++ P+++ L+++ E(+) W+ !N K- w--- M 
> + !V Y+
> PGP++ t+(++) 5 R+ tv-- b+ DI++ e+++>++++ h---- y+++
> ------END GEEK CODE BLOCK------
>
>

-- 
       Derek Atkins, SB '93 MIT EE, SM '95 MIT Media Laboratory
       Member, MIT Student Information Processing Board  (SIPB)
       URL: http://web.mit.edu/warlord/    PP-ASEL-IA     N1NWH
       warlord@MIT.EDU                        PGP key available