Bug 13559

Summary:	nvidia-kernel on 2.5.{53,54,55}
Product:	Gentoo Linux	Reporter:	Patrik Kullman <patrik>
Component:	[OLD] Core system	Assignee:	Martin Schlemmer (RETIRED) <azarah>
Status:	RESOLVED WORKSFORME
Severity:	major	CC:	lostlogic, zyl
Priority:	High
Version:	1.4_rc1
Hardware:	x86
OS:	Linux
Whiteboard:
Package list:		Runtime testing required:	---
Attachments:	a modification of the 2.5-2.5.3 diff patch

Description Patrik Kullman 2003-01-09 06:16:59 UTC

Having made an own ebuild for nvidia-kernel (4191-r1) with the new patch from 
minion.de/nvidia (2.5.54.diff), it won't patch:

cat /var/tmp/portage/nvidia-kernel-1.0.4191-r1/temp/NVIDIA_kernel-1.0-4191-
2.5.54.diff-3509.out
***** NVIDIA_kernel-1.0-4191-2.5.54.diff *****

==============================================

PATCH COMMAND:  patch  -p0 < /usr/portage.local/media-video/nvidia-
kernel/files/NVIDIA_kernel-1.0-41
91-2.5.54.diff

==============================================
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 -ru NVIDIA_kernel-1.0-4191-2.5-tl/Makefile NVIDIA_kernel-1.0-4191-
2.5.54/Makefile
|--- NVIDIA_kernel-1.0-4191-2.5-tl/Makefile     Fri Dec 27 05:36:52 2002
|+++ NVIDIA_kernel-1.0-4191-2.5.54/Makefile     Fri Jan  3 16:35:20 2003
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored
==============================================

PATCH COMMAND:  patch  -p1 < /usr/portage.local/media-video/nvidia-
kernel/files/NVIDIA_kernel-1.0-41
91-2.5.54.diff

==============================================
patching file Makefile
Hunk #2 FAILED at 58.
Hunk #3 succeeded at 136 (offset -1 lines).
1 out of 3 hunks FAILED -- saving rejects to file Makefile.rej
Hunk #2 FAILED at 58.
Hunk #3 succeeded at 136 (offset -1 lines).
1 out of 3 hunks FAILED -- saving rejects to file Makefile.rej
==============================================

PATCH COMMAND:  patch  -p2 < /usr/portage.local/media-video/nvidia-
kernel/files/NVIDIA_kernel-1.0-4191-2.5.54.diff

==============================================
missing header for unified diff at line 4 of 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 -ru NVIDIA_kernel-1.0-4191-2.5-tl/Makefile NVIDIA_kernel-1.0-4191-
2.5.54/Makefile
|--- NVIDIA_kernel-1.0-4191-2.5-tl/Makefile     Fri Dec 27 05:36:52 2002
|+++ NVIDIA_kernel-1.0-4191-2.5.54/Makefile     Fri Jan  3 16:35:20 2003
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored
==============================================

PATCH COMMAND:  patch  -p3 < /usr/portage.local/media-video/nvidia-
kernel/files/NVIDIA_kernel-1.0-4191-2.5.54.diff

==============================================
missing header for unified diff at line 4 of 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 -ru NVIDIA_kernel-1.0-4191-2.5-tl/Makefile NVIDIA_kernel-1.0-4191-
2.5.54/Makefile
|--- NVIDIA_kernel-1.0-4191-2.5-tl/Makefile     Fri Dec 27 05:36:52 2002
|+++ NVIDIA_kernel-1.0-4191-2.5.54/Makefile     Fri Jan  3 16:35:20 2003
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored
==============================================

PATCH COMMAND:  patch  -p4 < /usr/portage.local/media-video/nvidia-
kernel/files/NVIDIA_kernel-1.0-4191-2.5.54.diff

==============================================
missing header for unified diff at line 4 of 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 -ru NVIDIA_kernel-1.0-4191-2.5-tl/Makefile NVIDIA_kernel-1.0-4191-
2.5.54/Makefile
|--- NVIDIA_kernel-1.0-4191-2.5-tl/Makefile     Fri Dec 27 05:36:52 2002
|+++ NVIDIA_kernel-1.0-4191-2.5.54/Makefile     Fri Jan  3 16:35:20 2003
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored

Comment 1 Lesley van Zijl 2003-01-09 11:39:51 UTC

http://exci.xs4all.nl/logs/NVIDIA_kernel-1.0-4191-rmap.diff-2057.out

I can't patch the nvidia-kernel with 2.5.55

Comment 2 Brandon Low (RETIRED) gentoo-dev

2003-01-09 14:38:51 UTC

I believe that azarah you deal with this?

Comment 3 Patrik Kullman 2003-01-10 20:43:33 UTC

Created attachment 7179 [details, diff]
a modification of the 2.5-2.5.3 diff patch

This patch makes compilation possible on 2.5.{53,54,55}

(Wee, my second patch!)

Comment 4 Patrik Kullman 2003-01-12 04:43:52 UTC

Also, this works with 2.5.56.

Comment 5 Martin Schlemmer (RETIRED) gentoo-dev

2003-01-12 14:00:27 UTC

Fixed on CVS.  Patching not really included.

Comment 6 Martin Schlemmer (RETIRED) gentoo-dev

2003-01-12 14:01:58 UTC

> Patching not really included.

Should be 'Patching not really required' ...