First Last Prev Next    No search results available      Search page      Enter new bug
Bug#: 97048
Alias:
Product:
Component:
Status: RESOLVED
Resolution: FIXED
Assigned To: Gentoo's Team for Core System packages <base-system@gentoo.org>
Hardware:
OS:
Version:
Priority:
Severity:
Reporter: Sander Sweers <Sander.Sweers@gmail.com>
Add CC:
CC:
Remove selected CCs
URL:
Summary:
Status Whiteboard:
Keywords:

Filename Description Type Creator Created Size Actions
reiser4progs-1.0.4.pset.patch reiser4progs-1.0.4.pset.patch patch Sander Sweers 2005-06-25 09:56 0000 2.71 KB Details | Diff
Create a New Attachment (proposed patch, testcase, etc.) View All

Bug 97048 depends on: Show dependency tree
Show dependency graph
Bug 97048 blocks:
Votes: 0    Show votes for this bug    Vote for this bug

Additional Comments: (this is where you put emerge --info)







View Bug Activity   |   Format For Printing   |   XML   |   Clone This Bug


Description:   Opened: 2005-06-25 09:51 0000
This little patch makes reiser4progs aware of the new ondisk format of the
latest reiser4 patches. Without it fsck will complain about one node containing
an unrecognizable module. The 2.6.12-mm series will have the new patches.

Reproducible: Always
Steps to Reproduce:

------- Comment #1 From Sander Sweers 2005-06-25 09:56:17 0000 -------
Created an attachment (id=61919) [edit]
reiser4progs-1.0.4.pset.patch

Attached is the patch from namesys for reiser4progs 1.0.4. It applies clean and
compiles fine under amd64. Mailinglist archive link to post and patch:
http://marc.theaimsgroup.com/?l=reiserfs&m=111926747110056

------- Comment #2 From SpanKY 2005-06-25 23:22:18 0000 -------
now in portage

------- Comment #3 From Ruben Jenster 2005-06-27 07:53:47 0000 -------
The patch is garbage. Reiser4progs compile fails here because of that patch. 
Please get a patch that applies cleanly. 
 
Regards  
 
Ruben 
 
Calculating dependencies ...done! 
>>> emerge (1 of 1) sys-fs/reiser4progs-1.0.4 to / 
>>> md5 files   ;-) ChangeLog 
>>> md5 files   ;-) metadata.xml 
>>> md5 files   ;-) reiser4progs-1.0.3.ebuild 
>>> md5 files   ;-) reiser4progs-1.0.4.ebuild 
>>> md5 files   ;-) files/reiser4progs-1.0.3-gcc4.patch 
>>> md5 files   ;-) files/reiser4progs-1.0.4-gcc4.patch 
>>> md5 files   ;-) files/reiser4progs-1.0.4.pset.patch 
>>> md5 files   ;-) files/digest-reiser4progs-1.0.3 
>>> md5 files   ;-) files/digest-reiser4progs-1.0.4 
>>> md5 src_uri ;-) reiser4progs-1.0.4.tar.gz 
>>> Unpacking source... 
>>> Unpacking reiser4progs-1.0.4.tar.gz 
to /var/tmp/portage/reiser4progs-1.0.4/work 
Using `AC_PROG_RANLIB' is rendered obsolete by `AC_PROG_LIBTOOL' 
 * Applying reiser4progs-1.0.4-gcc4.patch ...                                                                                       
[ ok ] 
 * Applying reiser4progs-1.0.4.pset.patch ... 
 
 * Failed Patch: reiser4progs-1.0.4.pset.patch ! 
 *  ( /usr/portage/sys-fs/reiser4progs/files/reiser4progs-1.0.4.pset.patch ) 
 * 
 * Include in your bugreport the contents of: 
 * 
 
*   /var/tmp/portage/reiser4progs-1.0.4/temp/reiser4progs-1.0.4.pset.patch-3725.out 
 
 
!!! ERROR: sys-fs/reiser4progs-1.0.4 failed. 
!!! Function epatch, Line 361, Exitcode 0 
!!! Failed Patch: reiser4progs-1.0.4.pset.patch! 
!!! If you need support, post the topmost build error, NOT this status message. 
 
***** reiser4progs-1.0.4.pset.patch ***** 
 
========================================= 
 
PATCH COMMAND:  patch -p0 -g0 --no-backup-if-mismatch 
< /usr/portage/sys-fs/reiser4progs/files/reiser4progs-1.0.4.pset.patch 
 
========================================= 
can't find file to patch at input line 4 
Perhaps you used the wrong -p or --strip option? 
The text leading up to this was: 
-------------------------- 
|===== include/reiser4/plugin.h 1.739 vs edited ===== 
|--- 1.739/include/reiser4/plugin.h     2005-01-30 15:57:02 +03:00 
|+++ edited/include/reiser4/plugin.h    2005-06-18 16:53:14 +04:00 
-------------------------- 
No file to patch.  Skipping patch. 
1 out of 1 hunk ignored 
can't find file to patch at input line 40 
Perhaps you used the wrong -p or --strip option? 
The text leading up to this was: 
-------------------------- 
|===== libreiser4/pset.c 1.19 vs edited ===== 
|--- 1.19/libreiser4/pset.c     2004-11-24 12:09:22 +03:00 
|+++ edited/libreiser4/pset.c   2005-06-18 17:00:27 +04:00 
-------------------------- 
No file to patch.  Skipping patch. 
2 out of 2 hunks ignored 
can't find file to patch at input line 85 
Perhaps you used the wrong -p or --strip option? 
The text leading up to this was: 
-------------------------- 
|===== plugin/sdext/sdext_plug/sdext_plug_repair.c 1.10 vs edited ===== 
|--- 1.10/plugin/sdext/sdext_plug/sdext_plug_repair.c   2004-09-22 18:21:08 
+04:00 
|+++ edited/plugin/sdext/sdext_plug/sdext_plug_repair.c 2005-06-18 17:00:16 
+04:00 
-------------------------- 
No file to patch.  Skipping patch. 
1 out of 1 hunk ignored 
========================================= 
 
PATCH COMMAND:  patch -p1 -g0 --no-backup-if-mismatch 
< /usr/portage/sys-fs/reiser4progs/files/reiser4progs-1.0.4.pset.patch 
 
========================================= 
patching file include/reiser4/plugin.h 
Hunk #1 FAILED at 285. 
1 out of 1 hunk FAILED -- saving rejects to file include/reiser4/plugin.h.rej 
patching file libreiser4/pset.c 
Hunk #1 FAILED at 111. 
Hunk #2 FAILED at 119. 
2 out of 2 hunks FAILED -- saving rejects to file libreiser4/pset.c.rej 
patching file plugin/sdext/sdext_plug/sdext_plug_repair.c 
Hunk #1 FAILED at 22. 
1 out of 1 hunk FAILED -- saving rejects to file 
plugin/sdext/sdext_plug/sdext_plug_repair.c.rej 
========================================= 
 
PATCH COMMAND:  patch -p2 -g0 --no-backup-if-mismatch 
< /usr/portage/sys-fs/reiser4progs/files/reiser4progs-1.0.4.pset.patch 
 
========================================= 
can't find file to patch at input line 4 
Perhaps you used the wrong -p or --strip option? 
The text leading up to this was: 
-------------------------- 
|===== include/reiser4/plugin.h 1.739 vs edited ===== 
|--- 1.739/include/reiser4/plugin.h     2005-01-30 15:57:02 +03:00 
|+++ edited/include/reiser4/plugin.h    2005-06-18 16:53:14 +04:00 
-------------------------- 
No file to patch.  Skipping patch. 
1 out of 1 hunk ignored 
can't find file to patch at input line 40 
Perhaps you used the wrong -p or --strip option? 
The text leading up to this was: 
-------------------------- 
|===== libreiser4/pset.c 1.19 vs edited ===== 
|--- 1.19/libreiser4/pset.c     2004-11-24 12:09:22 +03:00 
|+++ edited/libreiser4/pset.c   2005-06-18 17:00:27 +04:00 
-------------------------- 
No file to patch.  Skipping patch. 
2 out of 2 hunks ignored 
can't find file to patch at input line 85 
Perhaps you used the wrong -p or --strip option? 
The text leading up to this was: 
-------------------------- 
|===== plugin/sdext/sdext_plug/sdext_plug_repair.c 1.10 vs edited ===== 
|--- 1.10/plugin/sdext/sdext_plug/sdext_plug_repair.c   2004-09-22 18:21:08 
+04:00 
|+++ edited/plugin/sdext/sdext_plug/sdext_plug_repair.c 2005-06-18 17:00:16 
+04:00 
-------------------------- 
No file to patch.  Skipping patch. 
1 out of 1 hunk ignored 
========================================= 
 
PATCH COMMAND:  patch -p3 -g0 --no-backup-if-mismatch 
< /usr/portage/sys-fs/reiser4progs/files/reiser4progs-1.0.4.pset.patch 
 
========================================= 
can't find file to patch at input line 4 
Perhaps you used the wrong -p or --strip option? 
The text leading up to this was: 
-------------------------- 
|===== include/reiser4/plugin.h 1.739 vs edited ===== 
|--- 1.739/include/reiser4/plugin.h     2005-01-30 15:57:02 +03:00 
|+++ edited/include/reiser4/plugin.h    2005-06-18 16:53:14 +04:00 
-------------------------- 
No file to patch.  Skipping patch. 
1 out of 1 hunk ignored 
missing header for unified diff at line 40 of patch 
can't find file to patch at input line 40 
Perhaps you used the wrong -p or --strip option? 
The text leading up to this was: 
-------------------------- 
|===== libreiser4/pset.c 1.19 vs edited ===== 
|--- 1.19/libreiser4/pset.c     2004-11-24 12:09:22 +03:00 
|+++ edited/libreiser4/pset.c   2005-06-18 17:00:27 +04:00 
-------------------------- 
No file to patch.  Skipping patch. 
2 out of 2 hunks ignored 
can't find file to patch at input line 85 
Perhaps you used the wrong -p or --strip option? 
The text leading up to this was: 
-------------------------- 
|===== plugin/sdext/sdext_plug/sdext_plug_repair.c 1.10 vs edited ===== 
|--- 1.10/plugin/sdext/sdext_plug/sdext_plug_repair.c   2004-09-22 18:21:08 
+04:00 
|+++ edited/plugin/sdext/sdext_plug/sdext_plug_repair.c 2005-06-18 17:00:16 
+04:00 
-------------------------- 
No file to patch.  Skipping patch. 
1 out of 1 hunk ignored 
========================================= 
 
PATCH COMMAND:  patch -p4 -g0 --no-backup-if-mismatch 
< /usr/portage/sys-fs/reiser4progs/files/reiser4progs-1.0.4.pset.patch 
 
========================================= 
missing header for unified diff at line 4 of patch 
can't find file to patch at input line 4 
Perhaps you used the wrong -p or --strip option? 
The text leading up to this was: 
-------------------------- 
|===== include/reiser4/plugin.h 1.739 vs edited ===== 
|--- 1.739/include/reiser4/plugin.h     2005-01-30 15:57:02 +03:00 
|+++ edited/include/reiser4/plugin.h    2005-06-18 16:53:14 +04:00 
-------------------------- 
No file to patch.  Skipping patch. 
1 out of 1 hunk ignored 
missing header for unified diff at line 40 of patch 
can't find file to patch at input line 40 
Perhaps you used the wrong -p or --strip option? 
The text leading up to this was: 
-------------------------- 
|===== libreiser4/pset.c 1.19 vs edited ===== 
|--- 1.19/libreiser4/pset.c     2004-11-24 12:09:22 +03:00 
|+++ edited/libreiser4/pset.c   2005-06-18 17:00:27 +04:00 
-------------------------- 
No file to patch.  Skipping patch. 
2 out of 2 hunks ignored 
can't find file to patch at input line 85 
Perhaps you used the wrong -p or --strip option? 
The text leading up to this was: 
-------------------------- 
|===== plugin/sdext/sdext_plug/sdext_plug_repair.c 1.10 vs edited ===== 
|--- 1.10/plugin/sdext/sdext_plug/sdext_plug_repair.c   2004-09-22 18:21:08 
+04:00 
|+++ edited/plugin/sdext/sdext_plug/sdext_plug_repair.c 2005-06-18 17:00:16 
+04:00 
-------------------------- 
No file to patch.  Skipping patch. 
1 out of 1 hunk ignored 
 

------- Comment #4 From Sander Sweers 2005-06-27 08:20:28 0000 -------
Sorry but i can not reproduce this error. I have synced me portage tree and
emerged reiser4progs from portage (not my overlay) and the patch applies without
problem. Could you sync yours and retry?

------- Comment #5 From SpanKY 2005-06-27 10:34:24 0000 -------
issue is prob the fact the patch has dos newlines

i'll covert it to unix and commit

------- Comment #6 From SpanKY 2005-06-27 21:43:51 0000 -------
*** Bug 97226 has been marked as a duplicate of this bug. ***

First Last Prev Next    No search results available      Search page      Enter new bug