Re: [OpenAFS-devel] patch format?

[Roland Kuhn]

Hi Jeffrey!

On 30 Jan 2007, at 19:40, Jeffrey Hutzelman wrote:

On Tuesday, January 30, 2007 11:44:35 AM +0100 Roland Kuhn <[EMAIL PROTECTED]> wrote:

Hi!

Maybe I'm missing something way too obvious, but I can't apply the
1.4.3rc1 patch:


patch -u -p1 <../../PATCHES/openafs-1.4.3rc1-src.diff
patch: **** Only garbage was found in the patch input.

patch -n -p1 <../../PATCHES/openafs-1.4.3rc1-src.diff
patch: **** Only garbage was found in the patch input.

patch -c -p1 <../../PATCHES/openafs-1.4.3rc1-src.diff
can't find file to patch at input line 5

[EMAIL PROTECTED]:/afs/e18/sw/compile/kernel/linux-2.6.19.2-modules/ openafs$ [EMAIL PROTECTED]:/afs/e18/sw/compile/kernel/linux-2.6.19.2-modules/ openafs$ [EMAIL PROTECTED]:/afs/e18/sw/compile/kernel/linux-2.6.19.2-modules/ openafs$

If you don't give any of the -u, -n, or -c options, then patch will virtually always figure out what kind of patch you have. I believe it's possible to construct a case where it gets it wrong, but such things generally do not occur in nature.

Okay, that's also what I expected.

If you say -p1, then the current directory should be the top-level OpenAFS source directory; that is, the one where configure and the top-level Makefile live. Otherwise patch will not be able to find the files to patch.

Yep.

The incremental version patches distributed by the OpenAFS project apply to the entire tree. If you are applying the patch to a directory tree which contains only a subset of the distributed source, such as that included in the openafs-modules-source or openafs-kernel-source packages, then you will need to modify the patch to elide the parts that modify files you don't have.

Okay, didn't know that one. Adding a -f solved the problem without editing the patch (the WINNT directory was missing). But alas, now it doesn't build... (something with INIT_WORK expecting 3 arguments and getting only 2). I suspect that I'll simply wait until a 1.4.3 Debian package is out, don't have too much time to spend for this.

Thanks for your help.

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

PGP++ t+(++) 5 R+ tv-- b+ DI++ e+++>++++ h---- y+++
------END GEEK CODE BLOCK------

GS/CS/M/MU d-(++) s:+ a-> C+++ UL++++ P+++ L+++ E(+) W+ !N K- w--- M + !V Y+

smime.p7s
Description: S/MIME cryptographic signature

PGP.sig
Description: This is a digitally signed message part