2013-12-17 37 views
4

我想申請一個補丁到u-boot源代碼,但是一些如何,Linux不允許我。我有什麼:爲什麼補丁找不到這個文件?

[email protected]:~/NextGen/trunk/FW/thirdparty/u-boot$ patch -p1 < ../u-boot/u-boot-2013.01-wr.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 -uNr u-boot-2013.01/arch/powerpc/cpu/mpc85xx/cpu_init.c u-boot-2013.01.modified/arch/powerpc/cpu/mpc85xx/cpu_init.c 
|--- u-boot-2013.01/arch/powerpc/cpu/mpc85xx/cpu_init.c 2013-01-15 13:47:42.000000000 -0800 
|+++ u-boot-2013.01.modified/arch/powerpc/cpu/mpc85xx/cpu_init.c  2013-05-16 10:58:08.973906692 -0700 
-------------------------- 
File to patch: ^C 
[email protected]:~/NextGen/trunk/FW/thirdparty/u-boot$ ls -l u-boot-2013.01/arch/powerpc/cpu/mpc85xx/cpu_init.c 
-rw-r--r-- 1 reg reg 16745 Jan 15 2013 u-boot-2013.01/arch/powerpc/cpu/mpc85xx/cpu_init.c 
[email protected]:~/NextGen/trunk/FW/thirdparty/u-boot$ 

那麼,爲什麼當它完美地在正確的位置找不到文件呢?這裏發生了什麼?

回答

11

這裏涉及到三種文件路徑:

  • 補丁的原始文件:u-boot-2013.01/arch/powerpc/cpu/mpc85xx/cpu_init.c
  • 補丁的目標文件:u-boot-2013.01.modified/arch/powerpc/cpu/mpc85xx/cpu_init.c
  • 汽提出的目標文件,因爲-p1arch/powerpc/cpu/mpc85xx/cpu_init.c

修補程序查找剝離的目標文件,但它不存在。

cd u-boot-2013.01然後patch -p1 < ../../u-boot/u-boot-2013.01-wr.patch,你應該有更多的運氣。