Applying multiple patches

Applying multiple patches

[Elgar, Jeremy]

Hi,
Sorry if this is covered somewhere but I had a look last night (and asked
various people) but came up blank.

Is there a way to apply multiple patches to a source tree (if the patches
were produced from the same base tree)

The problem I have is thus,  I want to apply patch-2.4.9-ac6 (I guess might
as well do ac7 now) and the xfs patch
but both are from a vanilla 2-4-9.

Is there a standard way of doing this or is a `by hand solution`

(I managed to apply the ac first then the xfs (ignoring a couple of files
that are older in ac) but it was the config file that was messed up)

Its probably quite simple but I couldn't figure it

Cheers

Jeremy




 
===============================================================
Information contained in this email message is intended only for
use of the individual or entity named above. If the reader of this
message is not the intended recipient, or the employee or agent
responsible to deliver it to the intended recipient, you are hereby
notified that any dissemination, distribution or copying of this
communication is strictly prohibited. If you have received this
communication in error, please immediately notify us by email
to postmaster@ndsuk.com and destroy the original message. 

Re: Applying multiple patches

[Peter Wächtler]

"Elgar, Jeremy" wrote:
> 
> Hi,
> Sorry if this is covered somewhere but I had a look last night (and asked
> various people) but came up blank.
> 
> Is there a way to apply multiple patches to a source tree (if the patches
> were produced from the same base tree)
> 
> The problem I have is thus,  I want to apply patch-2.4.9-ac6 (I guess might
> as well do ac7 now) and the xfs patch
> but both are from a vanilla 2-4-9.
> 
> Is there a standard way of doing this or is a `by hand solution`
> 
> (I managed to apply the ac first then the xfs (ignoring a couple of files
> that are older in ac) but it was the config file that was messed up)
> 
> Its probably quite simple but I couldn't figure it
> 
Apply them in any order (perhaps starting with the bigger one).
While patch runs, it prints out diagnostic messages.
If one reads "... Hunk failed ..." it generates files like
config.in 
config.in.rej
config.in.orig

Then you have to open config.in.rej look at the lines with "-" and "+"
in front and apply the patch manually to "config.in".

I would search with 

/usr/src/linux# find . -name "*.rej"
and apply the above procedure to every found file, deleting the .rej 
and .orig when done.

Re: Applying multiple patches

[Thomas Duffy]

On Tue, 2001-09-04 at 06:07, Elgar, Jeremy wrote:

> The problem I have is thus,  I want to apply patch-2.4.9-ac6 (I guess might
> as well do ac7 now) and the xfs patch
> but both are from a vanilla 2-4-9.

I would suggest not trying this out as your first patch conflict fix
attempt.  Both xfs and ac are large and touch a bunch of core linux
files.  Getting xfs to apply on top of ac requires an intimate knowledge
of the xfs (and some ac) code.  If you are interested in trying out, see
how it was done for the 2.4.3-SGI_XFS_1.0.1 rpm that SGI put out for
xfs-enabled redhat 7.1.

If you download the src.rpm from oss.sgi.com/projects/xfs, you will find
an xfs patch that applies on an ac patch.  Now, both xfs and ac have
changed a bunch from the 2.4.3 days, but this will give you a good start
at figuring out what was done to get the two to play nice together.

-tduffy

RE: Applying multiple patches

[Elgar, Jeremy]

Yes I noticed that last night when I started looking through the .rej and
.orig file,
so beeing week I gave up and installed the ac7 patch only (least that got
the NetGear ea101 working) ill leave the file system ill ive got the laptop
set up,

still need to apply the xfsm path for an indy i have (but that will be on a
plain old
2.4.9

Cheers

Jeremy



> -----Original Message-----
> From: Thomas Duffy [mailto:Thomas.Duffy.99@alumni.brown.edu]
> Sent: 04 September 2001 23:54
> To: Elgar, Jeremy
> Cc: linux-kernel@vger.kernel.org
> Subject: Re: Applying multiple patches
> 
> 
> On Tue, 2001-09-04 at 06:07, Elgar, Jeremy wrote:
> 
> > The problem I have is thus,  I want to apply 
> patch-2.4.9-ac6 (I guess might
> > as well do ac7 now) and the xfs patch
> > but both are from a vanilla 2-4-9.
> 
> I would suggest not trying this out as your first patch conflict fix
> attempt.  Both xfs and ac are large and touch a bunch of core linux
> files.  Getting xfs to apply on top of ac requires an 
> intimate knowledge
> of the xfs (and some ac) code.  If you are interested in 
> trying out, see
> how it was done for the 2.4.3-SGI_XFS_1.0.1 rpm that SGI put out for
> xfs-enabled redhat 7.1.
> 
> If you download the src.rpm from oss.sgi.com/projects/xfs, 
> you will find
> an xfs patch that applies on an ac patch.  Now, both xfs and ac have
> changed a bunch from the 2.4.3 days, but this will give you a 
> good start
> at figuring out what was done to get the two to play nice together.
> 
> -tduffy
> 
> 


 
===============================================================
Information contained in this email message is intended only for
use of the individual or entity named above. If the reader of this
message is not the intended recipient, or the employee or agent
responsible to deliver it to the intended recipient, you are hereby
notified that any dissemination, distribution or copying of this
communication is strictly prohibited. If you have received this
communication in error, please immediately notify us by email
to postmaster@ndsuk.com and destroy the original message.