Re: Kernel diff-style patches

On Mon, Mar 21, 2005 at 11:58:13AM +0800, Wong Louis wrote:
> Sorry I am new to posting a reply, I don't know how to
> link it to the reply thread.
> 
> I try to patch the  linux-2.6.11.5 with 
> linux-2.6.11-xbox.patch
> but I got this
> 
> hidden1:/usr/src/linux# patch -p0 <
> linux-2.6.11-xbox.patch 
> can't find file to patch at input line 4
> Perhaps you used the wrong -p or --strip option?
> The text leading up to this was:
> --------------------------
> |diff -uprN a/Makefile b/Makefile
> |--- a/Makefile 2005-03-18 16:40:44.000000000 -0500
> |+++ b/Makefile 2005-03-18 16:45:54.000000000 -0500
> --------------------------
> File to patch: 

Use patch -p1 instead.

> or 
> 
> hidden1:/usr/src/linux# patch  <
> linux-2.6.11-xbox.patch 
> patching file Makefile
> Hunk #1 FAILED at 1.
> 1 out of 1 hunk FAILED -- saving rejects to file
> Makefile.rej

EXTRAVERSION seems to be the culprit here; you may simply change it to
read:

EXTRAVERSION = .5-xbox

> can't find file to patch at input line 16
> Perhaps you should have used the -p or --strip option?
> The text leading up to this was:
> --------------------------
> |diff -uprN a/arch/i386/Kconfig b/arch/i386/Kconfig
> |--- a/arch/i386/Kconfig        2005-03-18
> 16:40:46.000000000 -0500
> |+++ b/arch/i386/Kconfig        2005-03-18
> 16:45:54.000000000 -0500
> --------------------------
> File to patch: 
>
> Why are there the .5 revision to the kernel? Its the
> first time I see it, I use linux a little bit before
> but the .5 (2.6.11.5) thing is new to me
> 
> Thanks
 
2.6 recently adopted a finer-grained versioning scheme, 2.6.x.y as
opposed to the older 2.6.x, mainly out of concern for a "stable"
tree since alot of development was taking place in 2.6.x and not,
say, 2.7.x like in the past.

Briefly, 2.6.x.y releases are strictly bug/security fix releases.
More details here: http://kerneltrap.org/mailarchive/1/message/33322/thread

That said, xbox-linux patches are against 2.6.x releases, ie.
linux-2.6.11-xbox applies to 2.6.11, and not 2.6.11.y.

If you do intend to use the -stable tree, I'd suggest first applying
the xbox-specific patches ontop of 2.6.11, then applying the -stable
patches thereafter. There will be rejects you might have to fix by hand
though.

Hope that helps,

	Arthur


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click