On Wed, Mar 28, 2001 at 12:02:06PM -0600, Brock wrote: > Can you verify that the patches are or are not displayed correctly on the BTS, > and secondly, how exactly to I go about patching these files? Yes, the BTS does indeed display #82991 incorrectly, guess it doesn't like attachments too much :-/ I've attached a reformatted version. > I don't do much patching, except for the kernel source, in which I use: > cat patchfile | patch -p0 This would work. I always check the top of the patch to see how many levels of directories the patch expects. From that it's quite trivial to deduce the correct value for -p parameter. -- Tommi Komulainen Tommi.Komulainen@iki.fi GPG 1024D/68388EE6 6FD6 DD79 EB38 BF6F 3533 09C0 04A8 9871 6838 8EE6
--- Makefile.orig Thu Nov 2 11:54:25 2000 +++ Makefile Tue Dec 12 17:18:54 2000 @@ -22,7 +22,11 @@ endif # ifeq ($OPT_CFLAGS),) -CFLAGS := -DMODULE -D__KERNEL__ -I/usr/src/linux/include $(OPT_CFLAGS) +ifeq ($(KSRC),) +KSRC := /usr/src/linux +endif + +CFLAGS := -DMODULE -D__KERNEL__ -I$(KSRC)/include $(OPT_CFLAGS) ############################################################################### # You should never need to change anything below. @@ -32,17 +36,17 @@ # Sanity checks sanity: @( \ - if [ ! -e /usr/src/linux ]; then \ - echo "Expect kernel source at location /usr/src/linux"; \ - echo "Sym.link /usr/src/linux -> where you have your sources"; \ + if [ ! -e $(KSRC) ]; then \ + echo "Expect kernel source at location $(KSRC)"; \ + echo "Sym.link $(KSRC) -> where you have your sources"; \ exit -1; \ fi; \ - if [ ! -r /usr/src/linux/include ]; then \ - echo "Expect readable headers in /usr/src/linux/include"; \ + if [ ! -r $(KSRC)/include ]; then \ + echo "Expect readable headers in $(KSRC)/include"; \ exit -1; \ fi; \ - if [ ! -r /usr/src/linux/include/linux/version.h ]; then \ - echo "Missing /usr/src/linux/include/linux/version.h"; \ + if [ ! -r $(KSRC)/include/linux/version.h ]; then \ + echo "Missing $(KSRC)/include/linux/version.h"; \ echo "Configure and install the kernel first"; \ exit -1; \ fi; \
Attachment:
pgpL4dzcArsAV.pgp
Description: PGP signature