[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: modutils udeb



David Whedon wrote:
> 
> Currently a patch exists in the BTS, look for bugs against modutils.
> 

The patch didn't apply cleanly for me. Do you have any suggestions
what might have gone wrong? I tried to apply the patch to latest
modutils debian source. What do I apply that patch to?

orion:debian-boot$ dpkg-source -x modutils_2.4.1-2.dsc 
dpkg-source: extracting modutils in modutils-2.4.1
orion:debian-boot$ cd modutils-2.4.1
orion:modutils-2.4.1$ patch -p1 <../modutils-patch 
patching file Makefile.common.in
Hunk #1 FAILED at 9.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.common.in.rej
patching file debian/control
Hunk #1 succeeded at 2 with fuzz 2.
Hunk #2 succeeded at 17 (offset 1 line).
patching file debian/rules
Hunk #1 FAILED at 4.
Hunk #2 FAILED at 17.
Hunk #3 succeeded at 58 with fuzz 2.
Hunk #4 FAILED at 132.
3 out of 4 hunks FAILED -- saving rejects to file debian/rules.rej
orion:modutils-2.4.1$ 
orion:modutils-2.4.1$ more ../modutils-patch 
diff -ur modutils-2.4.1.orig/Makefile.common.in modutils-2.4.1/Makefile.common.in
--- modutils-2.4.1.orig/Makefile.common.in      Thu Jan  4 17:45:19 2001
+++ modutils-2.4.1/Makefile.common.in   Thu Jan 25 21:10:49 2001
@@ -9,7 +9,7 @@
 AR             = @AR@
 ARCH           = @ARCH@
 CC             = @CC@
-CFLAGS         = @CFLAGS@
+CFLAGS         = @CFLAGS@ $(UDEB_CFLAGS)
 BUILDCC                = @BUILDCC@
 BUILDCFLAGS    = @BUILDCFLAGS@

That's the patch I cut&pasted from the patch on bts.

Maybe I haven't gotten enough sleep, but I haven't been able to apply it.

Thanks,

-- 
Eray (exa) Ozkural
Comp. Sci. Dept., Bilkent University, Ankara
e-mail: erayo@cs.bilkent.edu.tr
www: http://www.cs.bilkent.edu.tr/~erayo



Reply to: