Arch Linux

tomk

Forum Fellow

From: Ireland

Registered: 2004-07-21

Posts: 9,839

Question about patching

Before I make a fool of myself on a devel ML that I really shouldn't be on, can someone confirm something for me?

I have a patch that starts something like this:

--- file.c.orig    2006-03-31 14:37:18.000000000 +0200
+++ file.c    2006-03-31 14:41:10.000000000 +0200
@@ -65,6 +65,15 @@
 #define FOO_BAR
 #include <foo/bar.h>
 
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
+#include <bar/foo.h>
+#else
..
..

My understanding of this is:
- Line 65 of the unpatched file shoud read #define FOO_BAR
- Line 66 should read #include <foo/bar.h>
- Line 67 should be blank
- The lines beginning with + will be added after the existing line 67

Is that correct?

TIA, anyone who's bothered.

stavrosg

Member

From: Rhodes, Greece

Registered: 2005-05-01

Posts: 330

Website

Re: Question about patching

Yes, that's correct.

tomk

Forum Fellow

From: Ireland

Registered: 2004-07-21

Posts: 9,839

Re: Question about patching

Many thanks, stavrosg.