我怎么知道补丁命令是否有效？

Question

我正在尝试将 seek-for-android 项目提供的补丁应用于我从 Cyanogenmod 下载的代码。用make编译成功的代码，所以我知道所有的文件都在那里。我只是无法了解补丁正在做什么或者它是否正在工作。我尝试了 -verbose 选项。我不知道补丁需要多长时间才能遍历目录并查找要更新的文件。我在我的 CPU 中没有看到太多活动。以下是我遵循的说明： 在此处输入链接描述这是我所看到的屏幕截图：

   root@ubuntu:~/android/system# ls
    abi       cm-11-2      docs             Makefile   sdk
    android   cm-11-3      external         ndk        smartcard-api-3_1_0
    art       cts          frameworks       out        smartcard-api-3_1_0.tgz
    bionic    dalvik       hardware         packages   system
    bootable  developers   kernel           pdk        tools
    build     development  libcore          prebuilt   vendor
    cm-11     device       libnativehelper  prebuilts
    root@ubuntu:~/android/system# cd smartcard-api-3_1_0
    root@ubuntu:~/android/system/smartcard-api-3_1_0# cd ..
    root@ubuntu:~/android/system# patch -p1 smartcard-api-3_1_0/smartcard-api.patch   ^C
     root@ubuntu:~/android/system# patch -p1 -R smartcard-api-3_1_0/smartcard- api.patch 
    ^C
    root@ubuntu:~/android/system# patch -p1 -verbose smartcard-   api-3_1_0/smartcard-  
    api.patch 
    patch 2.6.1
    Copyright (C) 1988 Larry Wall
    Copyright (C) 2003, 2009 Free Software Foundation, Inc.

我想在某些情况下，我应该寻找目标文件？下面的输出似乎说一个补丁成功了，而另一个文件没有找到？我想我必须找到目标文件并指定它？由于某种原因，甚至无法识别完整路径。

root@ubuntu:~/android/system# patch -p1 < smartcard-api-3_1_0/uicc.patch 
patching file frameworks/base/telephony/java/com/android/internal/telephony  /ITelephony.aidl
Hunk #1 FAILED at 304.
1 out of 1 hunk FAILED -- saving rejects to file frameworks/base/telephony /java/com/android/internal/telephony/ITelephony.aidl.rej
patching file frameworks/base/telephony/java/com/android/internal/telephony  /RILConstants.java
Hunk #1 FAILED at 55.
Hunk #2 FAILED at 262.
2 out of 2 hunks FAILED -- saving rejects to file frameworks/base/telephony/java/com/android/internal/telephony/RILConstants.java.rej
patching file frameworks/opt/telephony/src/java/com/android/internal/telephony /CommandException.java
Hunk #1 FAILED at 42.
Hunk #2 FAILED at 83.
2 out of 2 hunks FAILED -- saving rejects to file frameworks/opt/telephony  /src/java/com/android/internal/telephony/CommandException.java.rej
patching file frameworks/opt/telephony/src/java/com/android/internal/telephony /CommandsInterface.java
Hunk #1 succeeded at 1250 (offset 109 lines).
patching file frameworks/opt/telephony/src/java/com/android/internal/telephony /IccCard.java
Hunk #1 FAILED at 214.
1 out of 1 hunk FAILED -- saving rejects to file frameworks/opt/telephony  /src/java/com/android/internal/telephony/IccCard.java.rej
patching file frameworks/opt/telephony/src/java/com/android/internal/telephony  /RIL.java
Hunk #1 succeeded at 2592 (offset 253 lines).
Hunk #2 succeeded at 4109 (offset 467 lines).
Hunk #3 succeeded at 4619 (offset 543 lines).
patching file frameworks/opt/telephony/src/java/com/android/internal/telephony/sip/SipCommandInterface.java
Hunk #1 FAILED at 536.
1 out of 1 hunk FAILED -- saving rejects to file frameworks/opt/telephony/src/java/com/android/internal/telephony/sip/SipCommandInterface.java.rej
patching file frameworks/opt/telephony/src/java/com/android/internal/telephony  /test/SimulatedCommands.java
Hunk #1 FAILED at 1655.
1 out of 1 hunk FAILED -- saving rejects to file frameworks/opt/telephony /src/java/com/android/internal/telephony/test/SimulatedCommands.java.rej
patching file frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/IccCardProxy.java
Hunk #1 succeeded at 844 (offset 102 lines).
patching file frameworks/opt/telephony/src/java/com/android/internal/telephony/uicc/UiccCardApplication.java
Hunk #1 FAILED at 44.
Hunk #2 succeeded at 437 (offset 100 lines).
Hunk #3 succeeded at 941 (offset 194 lines).
1 out of 3 hunks FAILED -- saving rejects to file frameworks/opt/telephony  /src/java/com/android/internal/telephony/uicc/UiccCardApplication.java.rej
patching file frameworks/opt/telephony/tests/telephonytests/src/com/android    /internal/telephony/gsm/UsimDataDownloadCommands.java
Hunk #1 succeeded at 651 with fuzz 2 (offset 21 lines).
can't find file to patch at input line 404
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
 diff --git a/packages/apps/Phone/src/com/android/phone  /PhoneInterfaceManager.java b/packages/apps/Phone/src/com/android/phone    /PhoneInterfaceManager.java
|index 6600ae5..2ae6739 100644
|--- a/packages/apps/Phone/src/com/android/phone/PhoneInterfaceManager.java
|+++ b/packages/apps/Phone/src/com/android/phone/PhoneInterfaceManager.java
--------------------------
File to patch: 

Answer 1

一个非常简单的解决方案是在应用补丁之前将您的文件置于版本控制之下。目前常用的版本控制工具是 Git 和 Mercurial。我个人使用并推荐 Mercurial。

此外，如果您想查看补丁适用于哪些文件，您可以运行

diffstat patchname

使用 Mercurial 的示例输出：

apt-get source hello
cd hello-2.9
hello-2.9$ hg init
hello-2.9$ hg add
hello-2.9$ hg ci     # brings up an editor - add a commit message
hello-2.9$ patch -p1 < debian/patches/99-config-guess-config-sub 
    patching file build-aux/config.guess
    patching file build-aux/config.sub
hello-2.9$ hg st
    M build-aux/config.guess
    M build-aux/config.sub
hello-2.9$ hg diff   # diff output
hello-2.9$ diffstat debian/patches/99-config-guess-config-sub
    config.guess |  149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------
    config.sub   |   36 ++++++++++++++++++++----------------
    2 files changed, 106 insertions(+), 79 deletions(-)

Answer 2

由于某种原因，补丁文件必须通过重定向输入补丁程序，即

     patch file

不起作用，但是

    patch < file

作品