Skip to contentSkip to conversation

Comments RE Martin Devera's May and July HTB patches

LARTC gypsy 1 participant 1 message Jul 6, 2003

lore
Share & tools
lore

gypsy

author
#0 lore raw

http://luxik.cdi.cz/~devik/qos/htb/ says that htb_killdbg_2421.diff is cumulative but it is not because it expects version 1.20 - while the pristine source is v 1.17

Both the htb_3.10_3.12_2.diff patch and the killdbg patch will not cleanly install because there is an error in hunk 1. The bad line in the killdbg patch is

- * $Id: sch_htb.c,v 1.20 2003/06/18 19:55:49 devik Exp $

because the actual line is

* $Id: sch_htb.c,v 1.20 2003/06/18 19:55:49 devik Exp devik $

so that final "devik " causes the hunk to fail.

My advice is to
Download the 3.10_3.12_2 patch from http://luxik.cdi.cz/~devik/qos/htb/
Download the killdbg patch from http://luxik.cdi.cz/~devik/qos/htb/
The 3.10_3.12_2 patch is in CHANGES then 20.6.2003. The killdbg is the 5.7.2003 entry imediately above that.

Edit this line in the 3.10_3.12_2 patch to remove the final "devik " ORIGINAL:
- * $Id: sch_htb.c,v 1.17 2003/01/29 09:22:18 devik Exp devik $ FIXED:
- * $Id: sch_htb.c,v 1.17 2003/01/29 09:22:18 devik Exp $

Apply the htb_3.10_3.12_2.diff patch:

	cd /usr/src/linux/net/sched
	patch -p1 </wherever/htb_3.10_3.12_2.diff
        (The "-p1" might have been "-p0"???)

Apply the htb_killdbg_2421.diff patch the same way. And, of course, compile and install a new kernel (and modules if appropriate).

gypsy
_______________________________________________
LARTC mailing list / [email protected]
http://mailman.ds9a.nl/mailman/listinfo/lartc HOWTO: http://lartc.org/