From 1ee30e3c419824f45dc52d67516274548548b574 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 13 Jan 2011 17:26:47 +0100
Subject: update to Linux Kernel 2.6.37

---
 package/iproute2/Makefile                  |  9 ++++++---
 package/iproute2/files/Config              |  2 ++
 package/iproute2/patches/patch-tc_Makefile | 18 ------------------
 3 files changed, 8 insertions(+), 21 deletions(-)
 create mode 100644 package/iproute2/files/Config
 delete mode 100644 package/iproute2/patches/patch-tc_Makefile

(limited to 'package/iproute2')

diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 90b27a057..f0c815e59 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -41,18 +41,21 @@ $(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_SS},${PK
 TCFLAGS+=		-D_GNU_SOURCE
 XAKE_FLAGS+=		CCOPTS="${TCFLAGS}" MFLAGS="CC=${TARGET_CC}" \
 			HOSTCFLAGS="-I${LINUX_HEADER_DIR}/include"
-
 CONFIGURE_FLAGS+=	KERNEL_INCLUDE="${LINUX_DIR}/include"
 
+post-configure:
+	$(CP) ./files/Config $(WRKBUILD)/
+
 ip-install:
 	${INSTALL_DIR} ${IDIR_IP}/{etc/iproute2,usr/sbin}
 	${INSTALL_DATA} ${WRKINST}/etc/iproute2/* ${IDIR_IP}/etc/iproute2/
 	${INSTALL_BIN} ${WRKINST}/sbin/ip ${IDIR_IP}/usr/sbin/ip
 
 tc-install:
-	${INSTALL_DIR} ${IDIR_TC}/{lib/tc,usr/sbin}
+	${INSTALL_DIR} ${IDIR_TC}/{lib/tc,usr/sbin,usr/lib/tc}
 	# use ${CP} here, since m_ipt.so is a symlink to m_xt.so
-	${CP} ${WRKINST}/lib/tc/{m_*.so,*.dist} ${IDIR_TC}/lib/tc/
+	${CP} ${WRKINST}/lib/tc/m_*.so ${IDIR_TC}/lib/tc/
+	${CP} ${WRKINST}/usr/lib/tc/*.dist ${IDIR_TC}/usr/lib/tc/
 	${INSTALL_BIN} ${WRKINST}/sbin/tc ${IDIR_TC}/usr/sbin/
 
 tc-atm-install:
diff --git a/package/iproute2/files/Config b/package/iproute2/files/Config
new file mode 100644
index 000000000..0ba7d387d
--- /dev/null
+++ b/package/iproute2/files/Config
@@ -0,0 +1,2 @@
+TC_CONFIG_ATM:=y
+TC_CONFIG_XT:=y
diff --git a/package/iproute2/patches/patch-tc_Makefile b/package/iproute2/patches/patch-tc_Makefile
deleted file mode 100644
index 29a11b40b..000000000
--- a/package/iproute2/patches/patch-tc_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-	yeah, right. Disabling everything with echo-statements is really useful.
---- iproute2-2.6.34.orig/tc/Makefile	2010-05-19 17:32:43.000000000 +0200
-+++ iproute2-2.6.34/tc/Makefile	2011-01-03 18:28:02.980563959 +0100
-@@ -99,10 +99,11 @@ libtc.a: $(TCLIB)
- 	$(AR) rcs $@ $(TCLIB)
- 
- install: all
--	echo mkdir -p $(MODDESTDIR)
--	echo install -m 0755 tc $(DESTDIR)$(SBINDIR)
-+	mkdir -p $(MODDESTDIR)
-+	mkdir -p $(DESTDIR)$(SBINDIR)
-+	install -m 0755 tc $(DESTDIR)$(SBINDIR)
- 	for i in $(TCSO); \
--	do echo install -m 755 $$i $(MODDESTDIR); \
-+	do install -m 755 $$i $(MODDESTDIR); \
- 	done
- 	if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
- 	if [ -f $(MODDESTDIR)/m_xt.so ]; \
-- 
cgit v1.2.3