日期:2014-05-16  浏览次数:20622 次

内核补丁怎么打不上???用的是.diff文件。在线等。。。
现在我想给我的linux2.4.19系统打上一个补丁,下载了diff文件,但是怎么老是打不上。
我的系统目录如下:
/usr/src/arm-linux/linux-2.4.19/*

diff文件里面的目录如下:
/trunk/kernel/linux-2.4.19/*

因此我把diff文件拷贝到/usr/src/arm-linux目录,然后使用命令patch -R -p3 <patch.diff;
但是老是报错:
[root@localhost arm-linux]# patch -R -p3 <changeset_r35.diff 
(Stripping trailing CRs from patch.)
patching file linux-2.4.19/include/net/iw_handler.h
Hunk #1 FAILED at 2.
Hunk #2 FAILED at 34.
Hunk #3 FAILED at 207.
Hunk #4 FAILED at 223.
Hunk #5 FAILED at 234.
Hunk #6 FAILED at 288.
Hunk #7 FAILED at 354.
Hunk #8 FAILED at 366.
8 out of 8 hunks FAILED -- saving rejects to file linux-2.4.19/include/net/iw_handler.h.rej
(Stripping trailing CRs from patch.)
can't find file to patch at input line 392
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|Index: /trunk/kernel/linux-2.4.19/include/asm-arm/arch-pxa/hardware.h
|===================================================================
|--- /trunk/kernel/linux-2.4.19/include/asm-arm/arch-pxa/hardware.h (revision 34)
|+++ /trunk/kernel/linux-2.4.19/include/asm-arm/arch-pxa/hardware.h (revision 35)
--------------------------
File to patch: 

请问下这是怎么回事啊?
还有一个zip的补丁压缩包,不知道怎么用,好像里面的目录结构与diff文件里面的一样。

请知道的兄弟指点一二,谢谢!

------解决方案--------------------
你的patch跟你的代码版本不对应.

------解决方案--------------------
你的patch跟你的代码版本不对应.