linux – 如何知道patch命令是否正常工作？

weixin_38064085 2019-09-12 11:54:01

我正在尝试将seek-for-android项目提供的补丁应用于我从Cyanogenmod下载的代码.代码用make编译成功,所以我知道所有文件都在那里.我无法了解补丁正在做什么或者它是否正常工作.我尝试了-verbose选项.我不知道补丁遍历目录并查找要更新的文件需要多长时间.我的cpu中没有看到太多活动.以下是我所遵循的说明：enter link description here以下是我看到的屏幕截图： 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:

...全文