Procedure to make a patch

Pete Zaitcev zaitcev at redhat.com
Tue Apr 22 00:35:34 UTC 2008


On Tue, 22 Apr 2008 00:49:04 +0100, "Oliveiros Cristina" <oliveiros.cristina at gmail.com> wrote:

> diff -uNrp kernel-2.6.24.orig/linux-2.6.24.i686/include/linux/tipc_config.h
> kernel-2.6.24.new/linux-2.6.24.i686/include/linux/tipc_config.h

Exactly, this causes the error you reported.

> But I guess I should have rather used
> 
> diff -uNrp kernel-2.6.x.orig/linux-2.6.24.i686
> kernel-2.6.x.new/linux-2.6.24-i686 >
> ../SOURCES/linux-2.6-my-new-patch.patch

No, it has to be:
diff -uNrp linux-2.6.24.i686.orig linux-2.6.24-i686.new

When you run rpmbuild -bp it creates an extra level, but that's
done because this is how RPMs are done. But patches we apply are
compatible with upstream format, that's why there's a mismatch.

-- Pete




More information about the Fedora-kernel-list mailing list