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

[Stuart Hughes]

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,
>
> I resend since this message does not seem to have been properly 
> displayed in the latest LTIB digest.
>
> LTIB patches mux_server.c with mux_server-1.0-fs-decl.patch. On my 
> machine, patch command creates a rej file:
>
> ***************
> *** 648,659 ****
>       struct sockaddr_in sockaddr;
>       struct iochan *c;
>       int num_bind_retries = 0;
>       int rc;
>  
>       if (verbose)
>           printf("tcp_listen_channel %d %d\n",port,stream_id);
>  
> -     int fd  = socket(PF_INET, SOCK_STREAM, 0);
>       if (fd < 0) {
>           fatal("socket() failed for stream %d", stream_id);
>       }
> --- 648,660 ----
>       struct sockaddr_in sockaddr;
>       struct iochan *c;
>       int num_bind_retries = 0;
> +     int fd;
>       int rc;
>  
>       if (verbose)
>           printf("tcp_listen_channel %d %d\n",port,stream_id);
>  
> +     fd  = socket(PF_INET, SOCK_STREAM, 0);
>       if (fd < 0) {
>           fatal("socket() failed for stream %d", stream_id);
>       }
>
> I read man pages on "diff" and "patch" so that I can understand now the 
> underlying concepts of patch mechanisms. I understand what this patch 
> file wants to modifiy but I do not understand what the rej file means. 
> Where is the error?
>
> For safety, I browsed http://www.zee2.com/gpp/ in order to make sure 
> there is not another release. Indeed, I do work with the same patch 
> version as the one on http://www.zee2.com/gpp/.
>
> Thanks for your help.
>
> Franz