Applying 2.5.4-pre1 patch

Applying 2.5.4-pre1 patch

[Pierre Rousselet]

Patching drivers/char/gameport with /dev/null doesn't work for me. What 
is the trick ?

Pierre
-- 
------------------------------------------------
  Pierre Rousselet <pierre.rousselet@wanadoo.fr>
------------------------------------------------

Re: Applying 2.5.4-pre1 patch

[Alessandro Suardi]

Pierre Rousselet wrote:
> 
> Patching drivers/char/gameport with /dev/null doesn't work for me. What
> is the trick ?

In my case has been

 - untar 2.5.3 in /usr/src/linux
 - cd linux; ln -s linux a
 - patch
 - cd /usr/src; mv b/drivers/input/* /usr/src/linux/drivers/input
 - build

I only have to reboot and see if it works :)

--alessandro

 "If your heart is a flame burning brightly
   you'll have light and you'll never be cold
  And soon you will know that you just grow / You're not growing old"
                              (Husker Du, "Flexible Flyer")

Re: Applying 2.5.4-pre1 patch

[Alessandro Suardi]

Alessandro Suardi wrote:
> 
> Pierre Rousselet wrote:
> >
> > Patching drivers/char/gameport with /dev/null doesn't work for me. What
> > is the trick ?
> 
> In my case has been
> 
>  - untar 2.5.3 in /usr/src/linux
>  - cd linux; ln -s linux a
>  - patch
>  - cd /usr/src; mv b/drivers/input/* /usr/src/linux/drivers/input
>  - build
> 
> I only have to reboot and see if it works :)
>

Hmm - oops on boot :( maybe later I'll have some time to repeat,
 copy down oops and decode it.

--alessandro

 "If your heart is a flame burning brightly
   you'll have light and you'll never be cold
  And soon you will know that you just grow / You're not growing old"
                              (Husker Du, "Flexible Flyer")

Re: Applying 2.5.4-pre1 patch

[Jeff Garzik]

Pierre Rousselet wrote:
> 
> Patching drivers/char/gameport with /dev/null doesn't work for me. What
> is the trick ?

/dev/null indicates a new, or a removed, file.

-- 
Jeff Garzik      | "I went through my candy like hot oatmeal
Building 1024    |  through an internally-buttered weasel."
MandrakeSoft     |             - goats.com

Re: Applying 2.5.4-pre1 patch

[Pierre Rousselet]

Jeff Garzik wrote:
> Pierre Rousselet wrote:
> 
>>Patching drivers/char/gameport with /dev/null doesn't work for me. What
>>is the trick ?
>>
> 
> /dev/null indicates a new, or a removed, file.

'patch -p0 < patch' is confused by this : "sure you want to delete this 
file ?"

Are there some arguments to add on the cmd line ?

Pierre
-- 
------------------------------------------------
  Pierre Rousselet <pierre.rousselet@wanadoo.fr>
------------------------------------------------

Re: Applying 2.5.4-pre1 patch

[Brian Gerst]

Pierre Rousselet wrote:
> 
> Jeff Garzik wrote:
> > Pierre Rousselet wrote:
> >
> >>Patching drivers/char/gameport with /dev/null doesn't work for me. What
> >>is the trick ?
> >>
> >
> > /dev/null indicates a new, or a removed, file.
> 
> 'patch -p0 < patch' is confused by this : "sure you want to delete this
> file ?"
> 
> Are there some arguments to add on the cmd line ?

Use patch -p1.  Also, make sure you are using an up to date version of
patch.

--

				Brian Gerst

Re: Applying 2.5.4-pre1 patch

[Jeff Garzik]

Pierre Rousselet wrote:
> 
> Jeff Garzik wrote:
> > Pierre Rousselet wrote:
> >
> >>Patching drivers/char/gameport with /dev/null doesn't work for me. What
> >>is the trick ?
> >>
> >
> > /dev/null indicates a new, or a removed, file.
> 
> 'patch -p0 < patch' is confused by this : "sure you want to delete this
> file ?"

Linus's patches should be applied with -p1.

-- 
Jeff Garzik      | "I went through my candy like hot oatmeal
Building 1024    |  through an internally-buttered weasel."
MandrakeSoft     |             - goats.com

Re: Applying 2.5.4-pre1 patch

[Pierre Rousselet]

Jeff Garzik wrote:
> Pierre Rousselet wrote:
> 
>>Jeff Garzik wrote:
>>
>>>Pierre Rousselet wrote:
>>>
>>>
>>>>Patching drivers/char/gameport with /dev/null doesn't work for me. What
>>>>is the trick ?
>>>>
>>>>
>>>/dev/null indicates a new, or a removed, file.
>>>
>>'patch -p0 < patch' is confused by this : "sure you want to delete this
>>file ?"
>>
> 
> Linus's patches should be applied with -p1.

OK, it works. But you cannot use the patch-file outside of the linux 
directory. It means also the patch-kernel script is dead.

Pierre
-- 
------------------------------------------------
  Pierre Rousselet <pierre.rousselet@wanadoo.fr>
------------------------------------------------

Re: Applying 2.5.4-pre1 patch

[Jeff Garzik]

Pierre Rousselet wrote:
> 
> Jeff Garzik wrote:
> > Pierre Rousselet wrote:
> >
> >>Jeff Garzik wrote:
> >>
> >>>Pierre Rousselet wrote:
> >>>
> >>>
> >>>>Patching drivers/char/gameport with /dev/null doesn't work for me. What
> >>>>is the trick ?
> >>>>
> >>>>
> >>>/dev/null indicates a new, or a removed, file.
> >>>
> >>'patch -p0 < patch' is confused by this : "sure you want to delete this
> >>file ?"
> >>
> >
> > Linus's patches should be applied with -p1.
> 
> OK, it works. But you cannot use the patch-file outside of the linux
> directory.

This is normal with everybody else's patches, such as Alan's.  Linus is
just sorta catching up.


> It means also the patch-kernel script is dead.

Did you actually try patch-kernel, from inside the kernel dir?  It
appears to use 'p1' to apply patches.

	Jeff


-- 
Jeff Garzik      | "I went through my candy like hot oatmeal
Building 1024    |  through an internally-buttered weasel."
MandrakeSoft     |             - goats.com