一、单文件
Step1.生成补丁
diff –uN from-file to-file > to-file.patch
示例:diff -uN ../great/device/qcom/great/great.mk device/qcom/great/great.mk > patch001-great.mk.diff
Step2. 打补丁或去除补丁
patch –p0 < to-file.patch //打补丁
示例:patch -p0 < patch001-great.mk.diff
patch –R –p0 < to-file.patch //去除补丁
示例:patch -R -p0 < patch001-great.mk.diff
Step3. 检查 *.rej文件,是否存在异常!
二、多文件(目录)
diff –uNr from-dir to-dir > to-dir.patch //生成补丁
cd from-dir
patch –p1 < to-dir.patch //打补丁
patch –R –p1 < to-dir.patch //去除补丁
示例:
AndroidR$ diff -uNrp device/qcom/sepolicy_vndr/ ../great/device/qcom/sepolicy_vndr/ > patch003-sepolicy_vndr.diff --exclude=.git
AndroidR$ patch -p0 patch003-sepolicy_vndr.diff