Re: [SSI-devel] e2fsprogs patch for FC3 CVS tree fails to apply

[Roger T. <rog...@gm...>]

Remove your e2fsprogs.base directory and try rebuilding e2fsprogs
again.  CVS keyword subsitution broke e2fsprogs.base which lead to a
bad e2fsprogs-ssi.patch.

Roger

On 9/20/06, Jurgen van der Linden <Jur...@qu...> wrote:
> Yes, it is generated automatically based on the
> e2fsprogs.base and e2fsprogs in the opensssi folder.
>
> However the sources to which the patch is applied do not match
> for some files. The /usr/src/redhat/BUILDe2fsprogs-1.38 come from the
> e2fsprogs-1.38-tar.tz in /usr/src/redhat/SOURCES, installed from the
> source
> RPM as retrieved from CVS with:
>
> cvs -z3 -d:pserver:ano...@cv...:/cvsroot/ssic-linux co -r
> OPENS
> SI-FC srpms
>
> If you look at the actual .rej files, you will see for example:
>   ## Process this file with automake to get Makefile.in
> - ## $Id: Makefile.am.byteorder,v 1.1.2.2 2006/07/24 05:47:30 rogertsang
> Exp $
>
>   sbin_PROGRAMS = ext2resize ext2prepare ext2online
>   #noinst_PROGRAMS = tst
> --- 1,5 ----
>   ## Process this file with automake to get Makefile.in
> + ## $Id: Makefile.am.byteorder,v 1.1.4.2 2006/06/01 02:01:47 rogertsang
> Exp $
>
>   sbin_PROGRAMS = ext2resize ext2prepare ext2online
>   #noinst_PROGRAMS = tst
>
> Those lines do not exist in
> /usr/src/redhat/BUILD/e2fsprogs-1.38 files.
>
> Here are the build errors:
>
> /usr/src/redhat/BUILD/e2fsprogs-1.38
> + echo 'Patch #31 (e2fsprogs-1.38-man_no_ext2resize.patch):'
> Patch #31 (e2fsprogs-1.38-man_no_ext2resize.patch):
> + patch -p1 -b --suffix .man_no_ext2resize -s
> + echo 'Patch #100 (e2fsprogs-ssi.patch):'
> Patch #100 (e2fsprogs-ssi.patch):
> + patch -p1 -b --suffix .ssi -s
> 1 out of 1 hunk FAILED -- saving rejects to file
> config/mkinstalldirs.rej
> 1 out of 1 hunk FAILED -- saving rejects to file
> ext2resize-1.1.17/src/Makefile.
>  am.byteorder.rej
> 1 out of 1 hunk FAILED -- saving rejects to file
> ext2resize-1.1.17/src/ext2.c.by
>  teorder.rej
> 1 out of 1 hunk FAILED -- saving rejects to file
> ext2resize-1.1.17/src/ext2.h.by
>  teorder.rej
> 1 out of 1 hunk FAILED -- saving rejects to file
> ext2resize-1.1.17/src/ext2_unix
>  _io.c.nowrite.rej
> 1 out of 1 hunk FAILED -- saving rejects to file
> ext2resize-1.1.17/src/ext2onlin
>  e.c.byteorder.rej
> 1 out of 1 hunk FAILED -- saving rejects to file
> ext2resize-1.1.17/src/ext2onlin
>  e.c.nofallback.rej
> error: Bad exit status from /var/tmp/rpm-tmp.40552 (%prep)
>
>
>                         JURGEN
>
> | -----Original Message-----
> | From: Roger Tsang [mailto:rog...@gm...]
> | Sent: Wednesday, September 20, 2006 4:22 PM
> | To: Jurgen van der Linden
> | Cc: ssi...@li...
> | Subject: Re: [SSI-devel] e2fsprogs patch for FC3 CVS tree
> | fails to apply
> |
> |
> | What patch you talking about?  I believe that e2fsprogs-ssi.patch in
> | patches directory is auto generated.
> |
> | Roger
> |
> |
> | On 9/20/06, Jurgen van der Linden
> | <Jur...@qu...> wrote:
> | >
> | >
> | >
> | >
> | > The patch to e2fsprogs in the top of the CVS source tree
> | for Fedora Core 3
> | > fails.
> | > The patch is "funky", it only seems to adjust the CVS
> | keyword lines in the
> | > e2fsprogs-1.38 source tree.
> | > Perhaps created against the wrong e2fsprogs version?
> | >
> | >                         Jurgen.
> | >
> | --------------------------------------------------------------
> | -----------
> | > Take Surveys. Earn Cash. Influence the Future of IT
> | > Join SourceForge.net's Techsay panel and you'll get the
> | chance to share your
> | > opinions on IT & business topics through brief surveys --
> | and earn cash
> | >
> | http://www.techsay.com/default.php?page=join.php&p=sourceforge
> &CID=DEVDEV
> >
> > _______________________________________________
> > ssic-linux-devel mailing list
> > ssi...@li...
> > https://lists.sourceforge.net/lists/listinfo/ssic-linux-devel
> >
> >
> >
>