2005-11-11 16:48:46

by Nick Warne

[permalink] [raw]
Subject: 2.6.14.1/2 patch Makefile hunk FAILED

Hi all,

Just an eyes-up here - applying the combined 2.6.14.1/2 patch from kernel.org

http://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv2.6%2Fincr%2Fpatch-2.6.14.1-2.bz2

produces REJ on Makefile when applied to virgin 2.6.14 as EXTRAVERSION
isn't .1:


***************
*** 1,7 ****
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 14
- EXTRAVERSION = .1
NAME=Affluent Albatross

# *DOCUMENTATION*
--- 1,7 ----
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 14
+ EXTRAVERSION = .2
NAME=Affluent Albatross

# *DOCUMENTATION*



Simple to fix manually though.

Nick
--
http://sourceforge.net/projects/quake2plus

"Person who say it cannot be done should not interrupt person doing it."
-Chinese Proverb


2005-11-11 16:52:41

by Nick Warne

[permalink] [raw]
Subject: Re: 2.6.14.1/2 patch Makefile hunk FAILED

Sorry, wasting your time. I am an _idiot_.

Nick

On Friday 11 November 2005 16:48, Nick Warne wrote:
> Hi all,
>
> Just an eyes-up here - applying the combined 2.6.14.1/2 patch from
> kernel.org
>
> http://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2Fv2.6
>%2Fincr%2Fpatch-2.6.14.1-2.bz2
>
> produces REJ on Makefile when applied to virgin 2.6.14 as EXTRAVERSION
> isn't .1:
>
>
> ***************
> *** 1,7 ****
> VERSION = 2
> PATCHLEVEL = 6
> SUBLEVEL = 14
> - EXTRAVERSION = .1
> NAME=Affluent Albatross
>
> # *DOCUMENTATION*
> --- 1,7 ----
> VERSION = 2
> PATCHLEVEL = 6
> SUBLEVEL = 14
> + EXTRAVERSION = .2
> NAME=Affluent Albatross
>
> # *DOCUMENTATION*
>
>
>
> Simple to fix manually though.
>
> Nick

--
http://sourceforge.net/projects/quake2plus

"Person who say it cannot be done should not interrupt person doing it."
-Chinese Proverb

2005-11-11 17:04:54

by Gene Heskett

[permalink] [raw]
Subject: Re: 2.6.14.1/2 patch Makefile hunk FAILED

On Friday 11 November 2005 11:48, Nick Warne wrote:
>Hi all,
>
>Just an eyes-up here - applying the combined 2.6.14.1/2 patch from
> kernel.org

I had no such problems here. My script patches 2.6.14 to 2.6.14.1, then
to 2.6.14.2. It built and I'm running it right now.

I don't believe the .2 patch I saved from the email includes the .1
patch. I didn't get the bz2 version however, so it could be combined.
Somone else will have to clarify that.

>
>http://www.kernel.org/diff/diffview.cgi?file=%2Fpub%2Flinux%2Fkernel%2F
>v2.6%2Fincr%2Fpatch-2.6.14.1-2.bz2
>
>produces REJ on Makefile when applied to virgin 2.6.14 as EXTRAVERSION
>isn't .1:
>
>
>***************
>*** 1,7 ****
> VERSION = 2
> PATCHLEVEL = 6
> SUBLEVEL = 14
>- EXTRAVERSION = .1
> NAME=Affluent Albatross
>
> # *DOCUMENTATION*
>--- 1,7 ----
> VERSION = 2
> PATCHLEVEL = 6
> SUBLEVEL = 14
>+ EXTRAVERSION = .2
> NAME=Affluent Albatross
>
> # *DOCUMENTATION*
>
>
>
>Simple to fix manually though.
>
>Nick

--
Cheers, Gene
"There are four boxes to be used in defense of liberty:
soap, ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
99.36% setiathome rank, not too shabby for a WV hillbilly
Free OpenDocument reader/writer/converter download:
http://www.openoffice.org
Yahoo.com and AOL/TW attorneys please note, additions to the above
message by Gene Heskett are:
Copyright 2005 by Maurice Eugene Heskett, all rights reserved.