[opensuse-kernel] How can I list content rejects file include/linux/mm.h.rej
Hello, Q. From the log [1] How can the file include/linux/mm.h.rej content be listed out in obs? or can the 'patch -s -F0 -E -p1 --no-backup-if-mismatch -i' be changed to list the mm.h.rej when encountered It seems to apply ok when used on the command line like this # patch -p1 < reiser4-for-2.6.35.patch result: . . patching file fs/reiser4/vfs_ops.h patching file fs/reiser4/wander.c patching file fs/reiser4/wander.h patching file fs/reiser4/writeout.h patching file fs/reiser4/znode.c patching file fs/reiser4/znode.h patching file include/linux/fs.h Hunk #1 succeeded at 516 (offset 2 lines). Hunk #2 succeeded at 1575 (offset 2 lines). Hunk #3 succeeded at 2096 (offset 2 lines). patching file include/linux/mm.h Hunk #1 succeeded at 861 with fuzz 1 (offset 4 lines). patching file include/linux/writeback.h patching file mm/filemap.c patching file mm/page-writeback.c Hunk #1 succeeded at 1136 (offset -6 lines). How can it be fixed ? Thanks Glenn [1] part content : + cd linux-2.6.35.8 + /usr/src/packages/SOURCES/apply-patches --vanilla /usr/src/packages/SOURCES/series.conf .. + patch -s -F0 -E -p1 --no-backup-if-mismatch -i ../patches.rpmify/reiser4-for-2.6.35.patch 1 out of 1 hunk FAILED -- saving rejects to file include/linux/mm.h.rej ++ echo '*** patch ../patches.rpmify/reiser4-for-2.6.35.patch failed ***' *** patch ../patches.rpmify/reiser4-for-2.6.35.patch failed *** error: Bad exit status from /var/tmp/rpm-tmp.M8v2NU (%prep) Full Log: https://build.opensuse.org/package/live_build_log?arch=x86_64&package=kernel-default&project=home%3Adoiggl&repository=openSUSE_11.3 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org
* doiggl@velocitynet.com.au (doiggl@velocitynet.com.au) [20101103 15:05]:
# patch -p1 < reiser4-for-2.6.35.patch [...] patching file include/linux/mm.h Hunk #1 succeeded at 861 with fuzz 1 (offset 4 lines).
The above is the clue. Use 'patch -p1 --fuzz=0 -i reiser4-for-2.6.35.patch' like it's done for openSUSE and you'll get the same result.
How can it be fixed ? Regenerate the patch so that it applies without fuzz.
Philipp -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org
On Wed, 3 Nov 2010 18:40:13 +0100, Philipp Thomas <pth@suse.de> wrote:
* doiggl@velocitynet.com.au (doiggl@velocitynet.com.au) [20101103 15:05]:
# patch -p1 < reiser4-for-2.6.35.patch [...] patching file include/linux/mm.h Hunk #1 succeeded at 861 with fuzz 1 (offset 4 lines).
The above is the clue. Use 'patch -p1 --fuzz=0 -i reiser4-for-2.6.35.patch' like it's done for openSUSE and you'll get the same result.
How can it be fixed ? Regenerate the patch so that it applies without fuzz.
Philipp
Hello I used "patch -p1 --fuzz=0 -i ../patches.rpmify/reiser4-for-2.6.35.patch" it went a little further and got the following patching file Documentation/Changes patching file Documentation/filesystems/reiser4.txt . . patching file fs/reiser4/znode.c patching file fs/reiser4/znode.h patching file include/linux/fs.h Hunk #1 succeeded at 516 (offset 2 lines). Hunk #2 succeeded at 1575 (offset 2 lines). Hunk #3 succeeded at 2096 (offset 2 lines). patching file include/linux/mm.h Hunk #1 FAILED at 857. 1 out of 1 hunk FAILED -- saving rejects to file include/linux/mm.h.rej patching file include/linux/writeback.h patching file mm/filemap.c patching file mm/page-writeback.c Hunk #1 succeeded at 1136 (offset -6 lines). ++ echo '*** patch ../patches.rpmify/reiser4-for-2.6.35.patch failed ***' *** patch ../patches.rpmify/reiser4-for-2.6.35.patch failed *** - Is it possible to list out the mm.h.rej content if so how can that be done ?. and
Regenerate the patch so that it applies without fuzz
- How can the patch be regenerated ? What else can be done to apply the patch. Thanks Glenn -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org
On Thursday 04 November 2010, 10:50:01 doiggl@velocitynet.com.au wrote:
On Wed, 3 Nov 2010 18:40:13 +0100, Philipp Thomas <pth@suse.de> wrote:
* doiggl@velocitynet.com.au (doiggl@velocitynet.com.au) [20101103
15:05]:
# patch -p1 < reiser4-for-2.6.35.patch
[...]
patching file include/linux/mm.h Hunk #1 succeeded at 861 with fuzz 1 (offset 4 lines).
The above is the clue. Use 'patch -p1 --fuzz=0 -i
reiser4-for-2.6.35.patch'
like it's done for openSUSE and you'll get the same result.
How can it be fixed ?
Regenerate the patch so that it applies without fuzz.
Philipp
Hello I used "patch -p1 --fuzz=0 -i ../patches.rpmify/reiser4-for-2.6.35.patch" it went a little further and got the following
patching file Documentation/Changes patching file Documentation/filesystems/reiser4.txt . . patching file fs/reiser4/znode.c patching file fs/reiser4/znode.h patching file include/linux/fs.h Hunk #1 succeeded at 516 (offset 2 lines). Hunk #2 succeeded at 1575 (offset 2 lines). Hunk #3 succeeded at 2096 (offset 2 lines). patching file include/linux/mm.h Hunk #1 FAILED at 857. 1 out of 1 hunk FAILED -- saving rejects to file include/linux/mm.h.r ej patching file include/linux/writeback.h patching file mm/filemap.c patching file mm/page-writeback.c Hunk #1 succeeded at 1136 (offset -6 lines). ++ echo '*** patch ../patches.rpmify/reiser4-for-2.6.35.patch failed ***' *** patch ../patches.rpmify/reiser4-for-2.6.35.patch failed ***
- Is it possible to list out the mm.h.rej content if so how can that be done ?.
IIRC, patch in rpm kernel build suppresses any .orig/.rej generation, hence you need to osc build this project locally.
and
Regenerate the patch so that it applies without fuzz
- How can the patch be regenerated ?
Try quilt.
What else can be done to apply the patch.
If it is a single patch, osc build the kernel without the patch, and apply it manually after the patch phase. Now you have all you need (.orig, .rej). Real masters of disaster adjust the patch manually with vi (or the SM variant ed), of course. Out of curiosity, isn't reiser4 as dead as dead can be? Good luck, Pete -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org
* doiggl@velocitynet.com.au (doiggl@velocitynet.com.au) [20101104 10:51]:
1 out of 1 hunk FAILED -- saving rejects to file include/linux/mm.h.rej
So as expected you get the same failure.
- Is it possible to list out the mm.h.rej content if so how can that be done ?.
No, you'd have to build locally.
- How can the patch be regenerated ?
Use quilt :) Create a ~/.quiltrc with the following contents -------------------->8 cut 8<-------------------------- #Options passed to GNU diff when generating patches QUILT_DIFF_OPTS="--show-c-function" # Options passed to GNU patch when applying patches QUILT_PATCH_OPTS="--reject-format=unified --backup --fuzz=0" # Options to pass to commands (QUILT_${COMMAND}_ARGS) QUILT_PUSH_ARGS="--color=auto" QUILT_SETUP_ARGS="--fuzz=0" QUILT_DIFF_ARGS="--color=auto" QUILT_REFRESH_ARGS="--backup -p0" -------------------->8 cut 8<-------------------------- Which will make quilt call patch with --fuzz=0. Apply the patch with quilt, adapt it to apply cleanly and then regenerate with quilt. Philipp -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org
On Thu, 4 Nov 2010 14:18:19 +0100, Philipp Thomas <pth@suse.de> wrote:
* doiggl@velocitynet.com.au (doiggl@velocitynet.com.au) [20101104 10:51]:
1 out of 1 hunk FAILED -- saving rejects to file include/linux/mm.h.rej
So as expected you get the same failure.
- Is it possible to list out the mm.h.rej content if so how can that be done ?.
No, you'd have to build locally.
- How can the patch be regenerated ?
Use quilt :) Create a ~/.quiltrc with the following contents
-------------------->8 cut 8<-------------------------- #Options passed to GNU diff when generating patches QUILT_DIFF_OPTS="--show-c-function"
# Options passed to GNU patch when applying patches QUILT_PATCH_OPTS="--reject-format=unified --backup --fuzz=0"
# Options to pass to commands (QUILT_${COMMAND}_ARGS) QUILT_PUSH_ARGS="--color=auto" QUILT_SETUP_ARGS="--fuzz=0" QUILT_DIFF_ARGS="--color=auto" QUILT_REFRESH_ARGS="--backup -p0" -------------------->8 cut 8<--------------------------
Which will make quilt call patch with --fuzz=0. Apply the patch with quilt, adapt it to apply cleanly and then regenerate with quilt.
Philipp
Thanks for the help. Cheers Glenn. This fixed it [from the log] + cd linux-2.6.35.8 + /usr/src/packages/SOURCES/apply-patches --vanilla /usr/src/packages/SOURCES/series.conf .. + patch -p1 --fuzz=1 -i ../patches.rpmify/reiser4-for-2.6.35.patch patching file Documentation/Changes patching file Documentation/filesystems/reiser4.txt patching file fs/fs-writeback.c . . patching file include/linux/fs.h Hunk #1 succeeded at 516 (offset 2 lines). Hunk #2 succeeded at 1575 (offset 2 lines). Hunk #3 succeeded at 2096 (offset 2 lines). patching file include/linux/mm.h Hunk #1 succeeded at 861 with fuzz 1 (offset 4 lines). patching file include/linux/writeback.h patching file mm/filemap.c patching file mm/page-writeback.c Hunk #1 succeeded at 1136 (offset -6 lines). -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org
participants (3)
-
doiggl＠velocitynet.com.au -
Hans-Peter Jansen -
Philipp Thomas