mirror of
https://git.busybox.net/buildroot.git
synced 2024-11-27 07:23:30 +08:00
8f88a644ed
This patch was created as a fix to a problem that occurred during the compilation of QEMU: >>> qemu 8.1.1 Patching Applying 0001-tests-fp-disable-fp-bench-build-by-default.patch using patch: patching file tests/fp/meson.build Hunk #1 succeeded at 138 with fuzz 2 (offset -502 lines). Applying 0002-softmmu-qemu-seccomp.c-add-missing-header-for-CLONE_.patch using patch: patching file softmmu/qemu-seccomp.c Applying 0004-tracing-install-trace-events-file-only-if-necessary.patch using patch: patching file trace/meson.build With the bump to version 8.1.1, the patch that disabled the compilation of the fp-bench test does not report any errors, even though the patch itself is no longer applicable. The only noticeable message is: "Hunk #1 succeeded at 138 with fuzz 2 (offset -502 lines)." As reported by the patch man page: "With context diffs, and to a lesser extent with normal diffs, patch can detect when the line numbers mentioned in the patch are incorrect, and attempts to find the correct place to apply each hunk of the patch. As a first guess, it takes the line number mentioned for the hunk, plus or minus any offset used in applying the previous hunk. If that is not the correct place, patch scans both forwards and backwards for a set of lines matching the context given in the hunk. First patch looks for a place where all lines of the context match. If no such place is found, and it's a context diff, and the maximum fuzz factor is set to 1 or more, then another scan takes place ignoring the first and last line of context. If that fails, and the maximum fuzz factor is set to 2 or more, the first two and last two lines of context are ignored, and another scan is made. The default maximum fuzz factor is 2. If the hunk is installed at a different line from the line number specified in the diff, you are told the offset. A single large offset may indicate that a hunk was installed in the wrong place. You are also told if a fuzz factor was used to make the match, in which case you should also be slightly suspicious." By setting the maximum fuzz factor to 0, we avoid that patches which cannot be applied are incorrectly reported as valid, with positive side-effects on version bumps. Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> Signed-off-by: Arnout Vandecappelle <arnout@mind.be> |
||
|---|---|---|
| .. | ||
| apply-patches.sh | ||
| boot-qemu-image.py | ||
| br2-external | ||
| brpkgutil.py | ||
| check-bin-arch | ||
| check-dotconfig.py | ||
| check-host-rpath | ||
| check-kernel-headers.sh | ||
| check-merged-usr.sh | ||
| cve.py | ||
| expunge-gconv-modules | ||
| fix-configure-powerpc64.sh | ||
| fix-rpath | ||
| gen-bootlin-toolchains | ||
| generate-gitlab-ci-yml | ||
| genimage.sh | ||
| graph-build-time | ||
| graph-depends | ||
| hardlink-or-copy | ||
| mkmakefile | ||
| mkusers | ||
| pkg-stats | ||
| pyinstaller.py | ||
| setlocalversion | ||
| size-stats | ||