On Tue, 17 Feb 2015 13:57:53 +0100, Benjamin Denisart <p.drouand@gmail.com> wrote:
On 02/17/2015 01:47 PM, doiggl@velocitynet.com.au wrote:
Hello Some questions: How can two patches be joined together as one and be applied ? Thanks for your help. Thanks Glenn
- I attempted to join two patches together to make one patch and apply it .
Patch fails with
[ 67s] patch unexpectedly ends in middle of line [ 67s] /usr/bin/patch: **** malformed patch at line 2302
Join 2 patches together patch 1 - http://www.spinics.net/lists/reiserfs-devel/msg04590.html patch 2 - http://www.spinics.net/lists/reiserfs-devel/msg04591.html
To make one patch and apply patch to package.
https://build.opensuse.org/package/view_file/home:doiggl/reiser4progs/reiser...
The build fails with error [ 67s] + /usr/bin/gzip -dc /home/abuild/rpmbuild/SOURCES/reiser4progs-1.0.9.tar.gz [ 67s] + /bin/tar -xf - [ 67s] + STATUS=0 [ 67s] + '[' 0 -ne 0 ']' [ 67s] + cd reiser4progs-1.0.9 [ 67s] + /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w . [ 67s] + echo 'Patch #0
(reiser4progs-1.0.9-add-node41-support.patch):'
[ 67s] Patch #0 (reiser4progs-1.0.9-add-node41-support.patch): [ 67s] + /usr/bin/cat
/home/abuild/rpmbuild/SOURCES/reiser4progs-1.0.9-add-node41-support.patch
. . . [ 67s] patching file plugin/format/format40/format40.c [ 67s] patching file plugin/format/format40/format40.h [ 67s] patch unexpectedly ends in middle of line [ 67s] /usr/bin/patch: **** malformed patch at line 2302: [ 67s] [ 67s] error: Bad exit status from /var/tmp/rpm-tmp.IJCDWK (%prep) [ 67s] [ 67s] [ 67s] RPM build errors: [ 67s] Bad exit status from /var/tmp/rpm-tmp.IJCDWK (%prep)
Full log
https://build.opensuse.org/package/live_build_log/home:doiggl/reiser4progs/o...
package https://build.opensuse.org/package/show/home:doiggl/reiser4progs
You'll see, it's very silly. You just have to go in the end of the last line, press "enter" and save.
Thanks yes, found out with the following --Glenn # diff reiser4progs-1.0.9-add-node41-support.patch reiser4-node41-layout-support-joined.patch 1d0 < #http://www.spinics.net/lists/reiserfs-devel/msg04590.html 618,620d616 < < #http://www.spinics.net/lists/reiserfs-devel/msg04591.html < 2303c2299 < +*/ \ No newline at end of file -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org