Re: [Ltib] mux_server.c / mux_server-1.0-fs-decl.patch / reject file

[Stuart Hughes]

Franz Trierweiler wrote:
> Le 18/10/2009 12:34, Stuart Hughes a écrit :
> > Hi Franz,
> >
> > First of all the GPP is http://bitshrine.org/gpp, not 
> > http://www.zee2.com/gpp/, I've mirrored some files there, and they are 
> > the same, but this is the wrong location (I may remove it).  Please us 
> > use bitshrine.org/gpp for future gpp references.
> >
> > From your earlier email I see: the problem was here:
> >
> > + cd mux_sever-1.0
> > + /bin/cp /opt/freescale/ltib/usr/src/rpm/SOURCES/mux_server.c 
> > mux_server.c
> > + echo 'Patch #0 (mux_sever-1.0-fs-decl.patch):'
> > Patch #0 (mux_sever-1.0-fs-decl.patch):
> > + patch -p1 -s
> > 1 out of 1 hunk FAILED -- saving rejects to file mux_server.c.rej
> >
> > Try temporarily changing the spec file like this (turn off the -s 
> > flag) and after removing the failed build:
> > $ rm -r /opt/freescale/ltib/usr/src/rpm/BUILD/mux*
> > and then re-run and see if you get any more output.
> >
> > diff -u -r1.2 mux_server.spec
> > --- dist/lfs-5.1/mux_server/mux_server.spec    13 Jul 2009 10:33:48 
> > -0000    1.2
> > +++ dist/lfs-5.1/mux_server/mux_server.spec    18 Oct 2009 10:32:05 -0000
> > @@ -19,7 +19,8 @@
> >  %prep
> >  %setup -T -c -n %{name}-%{version}
> >  %{__cp} %{SOURCE0} mux_server.c
> > -%patch0 -p1
> > +#%patch0 -p1
> > +patch -p1 < %{PATCH0}
> >
> >
> > NOTE also the Freescale spec file is out of date.  I made this change 
> > a while back. 
> > http://cvs.savannah.gnu.org/viewvc/ltib/dist/lfs-5.1/mux_server/mux_server.spec?root=ltib&r1=1.1&r2=1.2 
> >
> >
> > Regards, Stuart
> >
> >
> > Franz Trierweiler wrote:
> > > Good morning,

> + /bin/cp /opt/freescale/ltib/usr/src/rpm/SOURCES/mux_server.c mux_server.c
> + patch -p1
> (Stripping trailing CRs from patch.)
> patching file mux_server.c
> Hunk #1 FAILED at 648.
> 1 out of 1 hunk FAILED -- saving rejects to file mux_server.c.rej
> error: Bad exit status from /home/franz/ltib/tmp/rpm-tmp.22788 (%prep)

Okay, I don't get these warnings.  The correct version of this file 
doesn't have those characters (CRs = \r).  Given what you told me 
off-line it looks like the content of this BSP is corrupt.  The MD5sum 
of this file should be:

$ md5sum mux_sever-1.0-fs-decl.patch
66bb8e89417251598feeab548e1f586d  mux_sever-1.0-fs-decl.patch

If it is not, then the file you have is corrupt.  This calls into 
question all the other files in the ISO package payload.  I will 
generate a list of MD5SUMS and post later.

> You say that the Freescale spec file is out of date and that you made 
> this change a while back. 
> http://cvs.savannah.gnu.org/viewvc/ltib/dist/lfs-5.1/mux_server/mux_server.spec?root=ltib&r1=1.1&r2=1.2 
> but when I check the version 1.2 on Savannah, I do not see the 
> modification you are talking about (is that "patch -p1 < %{PATCH0}" ??? 
> - version 1.2 does not have this change). Thus, I must admit I am a bit 
> lost...

No, the change I told you to make was just a temporary change.  The 
change I made is in that link.  In the name section I changed it from:
mux_sever -> mux_server (added an 'r')

Regards, Stuart