[PATCH] Budowanie iproute2 na kernelu 2.6.x

[Michal Kochanowicz]

Hej!

Indagowany przeze mnie pan Kevin P. Fleming wyjaśnił przyczynę
niebudowania się iproute2 na kernelu 2.6.0-test5. W test6 znajdzie się
załączony patch linux-2.6.0-test5-netdevice-1.patch.

Dodatkowo potrzebne są pewne modyfikacje w patchach, bezwstydnie
ukradzone z Rawhide - załączony patch-for-SOURCES.patch.

Pakiet budowałem tak:
rpmbuild -bb iproute2.spec --without tetex --without tc_esfq

- esfq się nie buduje.
- na tetexa nie mam nastroju.

Może się to komuś przyda.
-- 
--= Michal Kochanowicz =--==--==BOFH==--==--= michal w michal.waw.pl =--
--= finger me for PGP public key or visit http://michal.waw.pl/PGP =--
--==--==--==--==--==-- Vodka. Connecting people.--==--==--==--==--==--
A chodzenie po górach SSIE!!!
-------------- następna część ---------
Submitted by: Kevin P. Fleming (kpfleming at cox dot net)
Date: 2003-09-12
Initial Package Version: 2.6.0-test5
Origin: Kevin P. Fleming (kpfleming at cox dot net)
Description: linux/netdevice.h includes two kernel-only headers, even when
             __KERNEL__ is not defined. This causes compile errors.

--- linux-2.6/include/linux/netdevice.h~	Thu Sep 11 17:44:09 2003
+++ linux-2.6/include/linux/netdevice.h	Fri Sep 12 16:31:16 2003
@@ -28,14 +28,14 @@
 #include <linux/if.h>
 #include <linux/if_ether.h>
 #include <linux/if_packet.h>
-#include <linux/device.h>
-#include <linux/percpu.h>
 
 #include <asm/atomic.h>
 #include <asm/cache.h>
 #include <asm/byteorder.h>
 
 #ifdef __KERNEL__
+#include <linux/device.h>
+#include <linux/percpu.h>
 #include <linux/config.h>
 
 struct divert_blk;
-------------- następna część ---------
Index: iproute2-make.patch
===================================================================
RCS file: /cvsroot/SOURCES/iproute2-make.patch,v
retrieving revision 1.5
diff -u -r1.5 iproute2-make.patch
--- iproute2-make.patch	17 Apr 2003 11:28:12 -0000	1.5
+++ iproute2-make.patch	27 Sep 2003 21:09:42 -0000
@@ -9,3 +9,29 @@
  CFLAGS = $(CCOPTS) $(GLIBCFIX) -I$(KERNEL_INCLUDE) -I../include $(DEFINES)
  
  LDLIBS += -L../lib -lnetlink -lutil
+diff -urN iproute2.orig/Makefile iproute2/Makefile
+--- iproute2.orig/Makefile	2003-09-27 22:35:00.000000000 +0200
++++ iproute2/Makefile	2003-09-27 22:40:11.473072400 +0200
+@@ -25,11 +25,11 @@
+ 
+ ifeq ($(LIBC_INCLUDE)/socketbits.h,$(wildcard $(LIBC_INCLUDE)/socketbits.h))
+   ifeq ($(LIBC_INCLUDE)/net/if_packet.h,$(wildcard $(LIBC_INCLUDE)/net/if_packet.h))
+-    GLIBCFIX=-I../include-glibc -include ../include-glibc/glibc-bugs.h
++    GLIBCFIX=-I -include ../include-glibc/glibc-bugs.h
+   endif
+ endif
+ ifeq ($(LIBC_INCLUDE)/bits/socket.h,$(wildcard $(LIBC_INCLUDE)/bits/socket.h))
+-  GLIBCFIX=-I../include-glibc -I/usr/include/db3 -include ../include-glibc/glibc-bugs.h
++  GLIBCFIX= -include ../include-glibc/glibc-bugs.h
+ endif
+ 
+ 
+@@ -39,7 +39,7 @@
+ 
+ LDLIBS += -L../lib -lnetlink -lutil
+ 
+-SUBDIRS=lib ip tc misc
++SUBDIRS=lib ip tc
+ 
+ LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a
+