Skip to contentSkip to conversation

: Applying patches ontop of patches (2.4.1pre7 to 2.4.1pre8)

QUESTION Shawn Starr 4 participants 5 messages Jan 17, 2001

lore
Share & tools
lore

Shawn Starr

author
#0 lore raw

What is the best way to apply a patch on top of a patch already applied?

For example, with original sources 2.4.0 i applied 2.4.1pre7 but now that pre8 is out, how do i apply those new patches without having to delete the whole linux dir and untar 2.4.0 again just to apply pre8?

thanks,

Shawn S.

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/

#1 lore raw
Quoted 5 lines · Shawn Starr

What is the best way to apply a patch on top of a patch already applied?

For example, with original sources 2.4.0 i applied 2.4.1pre7 but now that pre8 is out, how do i apply those new patches without having to delete the whole linux dir and untar 2.4.0 again just to apply pre8?

reverse the patch for 2.4.1pre7

for example: cd /usr/src/linux ; zcat 2.4.1pre7.gz | patch -p1 -R

after that apply pre8

c'ya
sven

Signature · 7 lines
The Internet treats censorship as a routing problem, and routes around it.
(John Gilmore on http://www.cygnus.com/~gnu/)

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/
author
#2 lore raw

Re: [QUESTION]: Applying patches ontop of patches (2.4.1pre7 to2.4.1pre8)

Thanks to everyone who replied :)

Quoted 19 lines · Sven Koch
Quoted 5 lines · Shawn Starr

What is the best way to apply a patch on top of a patch already applied?

For example, with original sources 2.4.0 i applied 2.4.1pre7 but now that pre8 is out, how do i apply those new patches without having to delete the whole linux dir and untar 2.4.0 again just to apply pre8?

reverse the patch for 2.4.1pre7

for example: cd /usr/src/linux ; zcat 2.4.1pre7.gz | patch -p1 -R

after that apply pre8

c'ya
sven

--

Quoted 7 lines

The Internet treats censorship as a routing problem, and routes around it. (John Gilmore on http://www.cygnus.com/~gnu/)

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/

#3 lore raw
In reply to Shawn Starr
Quoted 6 lines · Shawn Starr

What is the best way to apply a patch on top of a patch already applied?

For example, with original sources 2.4.0 i applied 2.4.1pre7 but now that pre8 is out, how do i apply those new patches without having to delete the whole linux dir and untar 2.4.0 again just to apply pre8?

You can unapply -pre7 (patch -R) or make a hard-linked tree to apply the pre patches to. Patch will break the hard links on the files it modifies, so the second tree hardly takes up any disk space. To make the second tree do:

cp -al linux-2.4.0 linux-2.4.1-pre8

--

Brian Gerst
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
Please read the FAQ at http://www.tux.org/lkml/

#4 lore raw
In reply to Shawn Starr
Quoted 5 lines · Sven Koch

reverse the patch for 2.4.1pre7

for example: cd /usr/src/linux ; zcat 2.4.1pre7.gz | patch -p1 -R

after that apply pre8

You can also use interdiff:

$ interdiff 2.4.1pre7 2.4.1pre8 | patch -p1

It's mostly reliable.

Tim.
*/