[ECOS] how to apply the patches for i386

[ECOS] how to apply the patches for i386

[niky]

Hi,

I got the patches Fabrice Gautier provides for i386 from

    ftp://ftp.sigmadesigns.com/ecos/

when I used the patch hal-i386-pc.patch under the packages diretory

    patch -r0 < hal-i386-pc.patch

it showed

can't find file to patch at input line 9
Perhaps you should have used the -p or --strip option?
The text leading up to this was:
--------------------------
|? hal/i386/pc/current/include/plf_io.h
|Index: hal/i386/arch/current/include/basetype.h
|===================================================================
|RCS file:
/cvs/ecos/ecos/packages/hal/i386/arch/current/include/basetype.h,v
|retrieving revision 1.7
|diff -u -w -b -B -r1.7 basetype.h
|--- basetype.h 2000/09/05 15:44:11 1.7 
|+++ basetype.h 2000/11/02 20:50:30
--------------------------
File to patch:

it could not find the file basetype.h, but
    hal/i386/arch/current/include/basetype.h really exists.
Patch finds the basetype.h according to Index, doesnt it ?
How could I apply the patch ?
Thanks for your help!

Re: [ECOS] how to apply the patches for i386

[Jonathan Larmour]

niky wrote:
> when I used the patch hal-i386-pc.patch under the packages diretory
> 
>     patch -r0 < hal-i386-pc.patch

You mean "patch -p0"

Jifl
-- 
Red Hat, 35 Cambridge Place, Cambridge, UK. CB2 1NS  Tel: +44 (1223) 728762
"Plan to be spontaneous tomorrow."  ||  These opinions are all my own fault

RE: [ECOS] how to apply the patches for i386

[Gary Thomas]

On 29-Nov-2000 Fabrice Gautier wrote:
> Hi,
> 
> You're right the filenames are wrong, (it's because the eCos cvs server is
> old and broken.) Someone from cygnus (Jifl?) sent a perl script to correct
> the paths in their patch. It should be in the archives.
> 
> 
>> -----Original Message-----
>> From: niky [ mailto:b4506051@csie.ntu.edu.tw ]
>> Subject: [ECOS] how to apply the patches for i386
>> 
>  
>> can't find file to patch at input line 9
>> Perhaps you should have used the -p or --strip option?
>> The text leading up to this was:
>> --------------------------
>> |? hal/i386/pc/current/include/plf_io.h
>> |Index: hal/i386/arch/current/include/basetype.h
>> |===================================================================
>> |RCS file:
>> /cvs/ecos/ecos/packages/hal/i386/arch/current/include/basetype.h,v
>> |retrieving revision 1.7
>> |diff -u -w -b -B -r1.7 basetype.h
>> |--- basetype.h 2000/09/05 15:44:11 1.7 
>> |+++ basetype.h 2000/11/02 20:50:30
>> --------------------------
>> File to patch:
>> 
>> it could not find the file basetype.h, but
>>     hal/i386/arch/current/include/basetype.h really exists.
>> Patch finds the basetype.h according to Index, doesnt it ?
>> How could I apply the patch ?
>> Thanks for your help!
> 
> -- 
> Fabrice Gautier
> fabrice_gautier@sdesigns.com 
> 
>  

Just pass the patch file through this filter.

------- FixPatch -------------------------------------------------------------

#! /usr/bin/perl -wi

# From: Jason Merrill <jason@cygnus.com>
# Date: 07 Dec 1997 01:29:36 -0800
#
# When I do a cvs diff, I always pass the output through this script, which
# copies the filename from the Index line into the patch itself.

while (<>)
{
  if (/^Index: (.*)/) 
    {
      $full = $1;
      print;
      for (1..7)
        {
          $_ = <>;
          s/ [^\t]+\t/ $full\t/;
          print;
        }
    }
  else
    {
      print;
    }
}

Re: [ECOS] how to apply the patches for i386

[Jonathan Larmour]

Fabrice Gautier wrote:
> 
> You're right the filenames are wrong, (it's because the eCos cvs server is
> old and broken.) Someone from cygnus (Jifl?) sent a perl script to correct
> the paths in their patch. It should be in the archives.

Attached.

Jifl
-- 
Red Hat, 35 Cambridge Place, Cambridge, UK. CB2 1NS  Tel: +44 (1223) 728762
"Plan to be spontaneous tomorrow."  ||  These opinions are all my own fault
#! /usr/bin/perl -wi

# From: Jason Merrill <jason@cygnus.com>
# Date: 07 Dec 1997 01:29:36 -0800
#
# When I do a cvs diff, I always pass the output through this script, which
# copies the filename from the Index line into the patch itself.

while (<>)
{
  if (/^Index: (.*)/) 
    {
      $full = $1;
      print;
      for (1..7)
	{
	  $_ = <>;
	  s/ [^\t]+\t/ $full\t/;
	  print;
	}
    }
  else
    {
      print;
    }
}

RE: [ECOS] how to apply the patches for i386

[Fabrice Gautier]

Hi,

You're right the filenames are wrong, (it's because the eCos cvs server is
old and broken.) Someone from cygnus (Jifl?) sent a perl script to correct
the paths in their patch. It should be in the archives.


> -----Original Message-----
> From: niky [ mailto:b4506051@csie.ntu.edu.tw ]
> Subject: [ECOS] how to apply the patches for i386
> 
 
> can't find file to patch at input line 9
> Perhaps you should have used the -p or --strip option?
> The text leading up to this was:
> --------------------------
> |? hal/i386/pc/current/include/plf_io.h
> |Index: hal/i386/arch/current/include/basetype.h
> |===================================================================
> |RCS file:
> /cvs/ecos/ecos/packages/hal/i386/arch/current/include/basetype.h,v
> |retrieving revision 1.7
> |diff -u -w -b -B -r1.7 basetype.h
> |--- basetype.h 2000/09/05 15:44:11 1.7 
> |+++ basetype.h 2000/11/02 20:50:30
> --------------------------
> File to patch:
> 
> it could not find the file basetype.h, but
>     hal/i386/arch/current/include/basetype.h really exists.
> Patch finds the basetype.h according to Index, doesnt it ?
> How could I apply the patch ?
> Thanks for your help!

-- 
Fabrice Gautier
fabrice_gautier@sdesigns.com