🚀 go-pugleaf

John Saunders (johns@rd.scitec.com.au) wrote:
: Anthony Lovell (alovell@kerberos.demon.co.uk) wrote:
: > WE Metzenthen (billm@jacobi.maths.monash.edu.au) wrote:

: > : RTFM (Read The Failure Message ;-), then look at binfmt_elf.c and
: > : take about 1 minute to conclude that binfmt_elf.c actually contains
: > : two complete (but slightly different) versions of the same thing.
: > : Then look at patch54.gz to confirm that Linus didn't have a
: > : binfmt_elf.c to patch against -- SNAFU.

: > : Solution: A number of possibilities, but I chose to edit binfmt_elf.c
: > : by hand to remove the old version from the file.

: > I'm supprised that so many people had problems with that, it doesn't take
: > much to look at the error and read the file that failed.

: I'm surprised that I didn't have this problem. How did I manage to
: patch Linux all the way to 1.1.56 without this problem occuring?

I don't know, but perhaps you didn't do it all by patches?  Or maybe
you are smarter than most of us and actually read the patches to find
any deleted files :-).

I am not certain about where I jumped on the 1.1.?? bandwagon,
but I have a copy of linux-1.1.13.gz floating around and it has the
file:
     -rw-r--r-- root/root     17857 May  3 01:34 1994 linux/fs/binfmt_elf.c
in it, so I guess that I got it from there.

It appears that the file got shifted from the fs directory to the icbs
directory in patch14.gz.  That patch contains:
     Only in v1.1.13/linux/fs: binfmt_elf.c
and a complete new copy of the file in the icbs directory.  An alert
patcher would no doubt have seen this and manually removed the file
from his/her source tree.

None of the later patches (up to patch57.gz) contains an:
     Only in v1.1.??/linux/ibcs: binfmt_elf.c
so I guess that Linus has two copies in his source tree now.

: BTW why does binfmt_elf.c exist in both the icbs and fs directories?

Perhaps because Linus forgot to remove it from the icbs directory?

I notice that I also have a copy of binfmt_coff.c in both the fs and
icbs directories.  This file also got shifted at patch14.gz, so I
guess that there are others out there who also have two copies of
this file.  There are other files which have been deleted or shifted
at some patch level but are still hanging around in my source tree...

--
Bill Metzenthen
Mathematics Department
Monash University
Clayton, Victoria, Australia
email: billm@vaxc.cc.monash.edu.au
       billm@euler.maths.monash.edu.au