Skip to contentSkip to conversation

2.6.14.1/2 patch Makefile hunk FAILED

DISCUSSION Nick Warne 2 participants 3 messages Nov 11, 2005

lore
Share & tools
lore

Nick Warne

author
#0 lore raw

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

Signature · 4 lines
http://sourceforge.net/projects/quake2plus

"Person who say it cannot be done should not interrupt person doing it."
-Chinese Proverb
author
#1 lore raw

Sorry, wasting your time. I am an _idiot_.

Nick

Quoted 35 lines · Nick Warne

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

Signature · 4 lines
http://sourceforge.net/projects/quake2plus

"Person who say it cannot be done should not interrupt person doing it."
-Chinese Proverb
#2 lore raw
In reply to Nick Warne
Quoted 4 lines · Nick Warne

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.

Quoted 31 lines

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

Signature · 10 lines
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.