|
发表于 2005-1-12 10:10:43
|
显示全部楼层
patch 的正规用法是
patch [options] [originalfile [patchfile]]
不过通常 当你把你的patch文件拷贝到需要patch的目录(/usr/src/linux)下时
你只需要使用
patch -pnum <patchfile
patch有很多参数 重用的有:(这些都是从 man patch中拷贝出来的,没有完全拷贝出来)
-b or --backup
Make backup files. That is, when patching a file, rename or copy the original instead of removing it. When backing
up a file that does not exist, an empty, unreadable backup file is created as a placeholder to represent the nonexis?
tent file. See the -V or --version-control option for details about how backup file names are determined.
--backup-if-mismatch
Back up a file if the patch does not match the file exactly and if backups are not otherwise requested. This is the
default unless patch is conforming to POSIX.
--no-backup-if-mismatch
Do not back up a file if the patch does not match the file exactly and if backups are not otherwise requested. This
is the default if patch is conforming to POSIX.
-B pref or --prefix=pref
Prefix pref to a file name when generating its simple backup file name. For example, with -B /junk/ the simple
backup file name for src/patch/util.c is /junk/src/patch/util.c.
--binary
Read and write all files in binary mode, except for standard output and /dev/tty. This option has no effect on
POSIX-conforming systems. On systems like DOS where this option makes a difference, the patch should be generated by
diff -a --binary.
-c or --context
Interpret the patch file as a ordinary context diff.
-d dir or --directory=dir
Change to the directory dir immediately, before doing anything else.
-D define or --ifdef=define
Use the #ifdef ... #endif construct to mark changes, with define as the differentiating symbol.
--dry-run
Print the results of applying the patches without actually changing any files.
-e or --ed
Interpret the patch file as an ed script.
-E or --remove-empty-files
Remove output files that are empty after the patches have been applied. Normally this option is unnecessary, since
patch can examine the time stamps on the header to determine whether a file should exist after patching. However, if
the input is not a context diff or if patch is conforming to POSIX, patch does not remove empty patched files unless
this option is given. When patch removes a file, it also attempts to remove any empty ancestor directories.
-f or --force
Assume that the user knows exactly what he or she is doing, and do not ask any questions. Skip patches whose headers
do not say which file is to be patched; patch files even though they have the wrong version for the Prereq: line in
the patch; and assume that patches are not reversed even if they look like they are. This option does not suppress
commentary; use -s for that.
-F num or --fuzz=num
Set the maximum fuzz factor. This option only applies to diffs that have context, and causes patch to ignore up to
that many lines in looking for places to install a hunk. Note that a larger fuzz factor increases the odds of a
faulty patch. The default fuzz factor is 2, and it may not be set to more than the number of lines of context in the
context diff, ordinarily 3.
-g num or --get=num
This option controls patch's actions when a file is under RCS or SCCS control, and does not exist or is read-only and
matches the default version, or when a file is under ClearCase control and does not exist. If num is positive, patch
gets (or checks out) the file from the revision control system; if zero, patch ignores RCS, ClearCase, and SCCS and
does not get the file; and if negative, patch asks the user whether to get the file. The default value of this
option is given by the value of the PATCH_GET environment variable if it is set; if not, the default value is zero if
patch is conforming to POSIX, negative otherwise.
--help
Print a summary of options and exit.
-i patchfile or --input=patchfile
Read the patch from patchfile. If patchfile is -, read from standard input, the default.
-l or --ignore-whitespace
Match patterns loosely, in case tabs or spaces have been munged in your files. Any sequence of one or more blanks in
the patch file matches any sequence in the original file, and sequences of blanks at the ends of lines are ignored.
Normal characters must still match exactly. Each line of the context must still match a line in the original file.
-n or --normal
Interpret the patch file as a normal diff.
-N or --forward
Ignore patches that seem to be reversed or already applied. See also -R.
-o outfile or --output=outfile
Send output to outfile instead of patching files in place.
-pnum or --strip=num
Strip the smallest prefix containing num leading slashes from each file name found in the patch file. A sequence of
one or more adjacent slashes is counted as a single slash. This controls how file names found in the patch file are
treated, in case you keep your files in a different directory than the person who sent out the patch. For example,
supposing the file name in the patch file was
/u/howard/src/blurfl/blurfl.c
setting -p0 gives the entire file name unmodified, -p1 gives
u/howard/src/blurfl/blurfl.c
without the leading slash, -p4 gives
blurfl/blurfl.c
and not specifying -p at all just gives you blurfl.c. Whatever you end up with is looked for either in the current
directory, or the directory specified by the -d option.
--posix
Conform more strictly to the POSIX standard, as follows.
?Take the first existing file from the list (old, new, index) when intuiting file names from diff headers.
?Do not remove files that are empty after patching.
?Do not ask whether to get files from RCS, ClearCase, or SCCS.
?Require that all options precede the files in the command line.
?Do not backup files when there is a mismatch.
--quoting-style=word
Use style word to quote output names. The word should be one of the following:
literal
Output names as-is.
shell Quote names for the shell if they contain shell metacharacters or would cause ambiguous output.
shell-always
Quote names for the shell, even if they would normally not require quoting.
c Quote names as for a C language string.
escape Quote as with c except omit the surrounding double-quote characters.
You can specify the default value of the --quoting-style option with the environment variable QUOTING_STYLE. If that
environment variable is not set, the default value is shell.
-r rejectfile or --reject-file=rejectfile
Put rejects into rejectfile instead of the default .rej file.
-R or --reverse
Assume that this patch was created with the old and new files swapped. (Yes, I'm afraid that does happen occasion?
ally, human nature being what it is.) patch attempts to swap each hunk around before applying it. Rejects come out
in the swapped format. The -R option does not work with ed diff scripts because there is too little information to
reconstruct the reverse operation.
If the first hunk of a patch fails, patch reverses the hunk to see if it can be applied that way. If it can, you are
asked if you want to have the -R option set. If it can't, the patch continues to be applied normally. (Note: this
method cannot detect a reversed patch if it is a normal diff and if the first command is an append (i.e. it should
have been a delete) since appends always succeed, due to the fact that a null context matches anywhere. Luckily,
most patches add or change lines rather than delete them, so most reversed normal diffs begin with a delete, which
fails, triggering the heuristic.)
-s or --silent or --quiet
Work silently, unless an error occurs.
-t or --batch
Suppress questions like -f, but make some different assumptions: skip patches whose headers do not contain file names
(the same as -f); skip patches for which the file has the wrong version for the Prereq: line in the patch; and assume
that patches are reversed if they look like they are.
-T or --set-time
Set the modification and access times of patched files from time stamps given in context diff headers, assuming that
the context diff headers use local time. This option is not recommended, because patches using local time cannot
easily be used by people in other time zones, and because local time stamps are ambiguous when local clocks move
backwards during daylight-saving time adjustments. Instead of using this option, generate patches with UTC and use
the -Z or --set-utc option instead.
-u or --unified
Interpret the patch file as a unified context diff.
-v or --version
Print out patch's revision header and patch level, and exit.
这些我也没有都用过,我只用过 N 、i和pnum这种形式的
N代表的是忽略那些颠倒的或者已经应用过的补丁
i代表从补丁文件中读取补丁
(可以参看这个 我的英文不是很好 这次cet6又挂了 :( 就不翻译了
-i patchfile or --input=patchfile
Read the patch from patchfile. If patchfile is -, read from standard input, the default.)
pnum这种 其中的num就是参数的意思 代表补丁所要修改文件名的深度 (这么翻译可能是错误的,下面的原文 你自己看吧还有例子:))
-pnum or --strip=num
Strip the smallest prefix containing num leading slashes from each file name found in the patch file. A sequence of
one or more adjacent slashes is counted as a single slash. This controls how file names found in the patch file are
treated, in case you keep your files in a different directory than the person who sent out the patch. For example,
supposing the file name in the patch file was
/u/howard/src/blurfl/blurfl.c
setting -p0 gives the entire file name unmodified, -p1 gives
u/howard/src/blurfl/blurfl.c
without the leading slash, -p4 gives
blurfl/blurfl.c
and not specifying -p at all just gives you blurfl.c. Whatever you end up with is looked for either in the current
directory, or the directory specified by the -d option.
下面是几个例子
patch -Np1 -i ../gcc-3.3.2-no_fixincludes-1.patch
patch -Np1 -i ../gcc-3.3.2-specs-1.patch
-i 后面接的是上级目录中的 补丁文件 gcc-3.3.2-no_fixincludes-1.patch
我最近经常使用的补丁是MTD的补丁
patch -p1 << mtd-2.2.17.patch
<< 的作用和 - i是相同的 都是表示补丁文件 |
|