From 219a6dab8995aad9ac4860cc1a84d6f3509a03a4 Mon Sep 17 00:00:00 2001 From: wbx Date: Sun, 17 May 2009 14:41:34 +0200 Subject: Initial import --- package/iproute2/Config.in | 18 +++++++++++ package/iproute2/Makefile | 48 ++++++++++++++++++++++++++++ package/iproute2/ipkg/ip.control | 4 +++ package/iproute2/ipkg/tc.control | 5 +++ package/iproute2/patches/patch-Makefile | 19 +++++++++++ package/iproute2/patches/patch-ip_Makefile | 10 ++++++ package/iproute2/patches/patch-ip_iptunnel_c | 17 ++++++++++ 7 files changed, 121 insertions(+) create mode 100644 package/iproute2/Config.in create mode 100644 package/iproute2/Makefile create mode 100644 package/iproute2/ipkg/ip.control create mode 100644 package/iproute2/ipkg/tc.control create mode 100644 package/iproute2/patches/patch-Makefile create mode 100644 package/iproute2/patches/patch-ip_Makefile create mode 100644 package/iproute2/patches/patch-ip_iptunnel_c (limited to 'package/iproute2') diff --git a/package/iproute2/Config.in b/package/iproute2/Config.in new file mode 100644 index 000000000..a2f60f226 --- /dev/null +++ b/package/iproute2/Config.in @@ -0,0 +1,18 @@ +config ADK_COMPILE_IPROUTE2 + tristate + default n + +config ADK_PACKAGE_IP + prompt "ip................................ iproute2 routing control utility" + tristate + default n + select ADK_COMPILE_IPROUTE2 + +config ADK_PACKAGE_TC + prompt "tc................................ iproute2 traffic control utility" + tristate + default n + select ADK_COMPILE_IPROUTE2 + help + Traffic shaping control utility. Please choose the kmod-sched-* modules + you need. diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile new file mode 100644 index 000000000..f688ccbee --- /dev/null +++ b/package/iproute2/Makefile @@ -0,0 +1,48 @@ +# $Id$ +#- +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include ${TOPDIR}/rules.mk + +PKG_NAME:= iproute2 +PKG_VERSION:= 2.6.29-1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= c1bc258a6c345905e79935ac7a3cc582 +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 +MASTER_SITES:= http://developer.osdl.org/dev/iproute2/download/ + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,IP,ip,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,TC,tc,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) + +do-configure: + ${SED} "s:-O2:${TARGET_CFLAGS}:g" ${WRKBUILD}/Makefile + ${SED} "s,-I/usr/include/db3,," ${WRKBUILD}/Makefile + ${SED} "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=${LINUX_DIR}/include," \ + ${WRKBUILD}/Makefile + ${SED} "s,^LIBC_INCLUDE.*,LIBC_INCLUDE=${STAGING_DIR}/include," \ + ${WRKBUILD}/Makefile + # For now disable compiling of the misc directory because it seems to fail + rm -rf ${WRKBUILD}/misc + ${SED} "s, misc,," ${WRKBUILD}/Makefile + # netem is 2.6 only stuff + ${SED} "s, netem,," ${WRKBUILD}/Makefile + +do-build: + ${MAKE} -j1 -C ${WRKBUILD}/netem \ + HOSTCC=${HOSTCC} \ + CCOPTS="-I${LINUX_DIR}" \ + ${MAKE} -j1 -C ${WRKBUILD} ${TARGET_CONFIGURE_OPTS} \ + CFLAGS="-D_GNU_SOURCE ${TARGET_CFLAGS} -I ../include -DRESOLVE_HOSTNAMES" \ + KERNEL_INCLUDE=${LINUX_DIR}/include all tc/tc ip/ip \ + CCOPTS="-I${LINUX_DIR}" + +do-install: + ${INSTALL_DIR} ${IDIR_IP}/usr/sbin + ${CP} ${WRKBUILD}/ip/ip ${IDIR_IP}/usr/sbin/ + ${INSTALL_DIR} ${IDIR_TC}/usr/sbin + ${CP} ${WRKBUILD}/tc/tc ${IDIR_TC}/usr/sbin/ + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/iproute2/ipkg/ip.control b/package/iproute2/ipkg/ip.control new file mode 100644 index 000000000..8206dd37a --- /dev/null +++ b/package/iproute2/ipkg/ip.control @@ -0,0 +1,4 @@ +Package: ip +Section: net +Priority: optional +Description: iproute2 routing control utility diff --git a/package/iproute2/ipkg/tc.control b/package/iproute2/ipkg/tc.control new file mode 100644 index 000000000..8950da394 --- /dev/null +++ b/package/iproute2/ipkg/tc.control @@ -0,0 +1,5 @@ +Package: tc +Section: net +Priority: optional +Description: iproute2 traffic control utility +Depends: kmod-sched diff --git a/package/iproute2/patches/patch-Makefile b/package/iproute2/patches/patch-Makefile new file mode 100644 index 000000000..bb7ba6a10 --- /dev/null +++ b/package/iproute2/patches/patch-Makefile @@ -0,0 +1,19 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iproute2-2.6.26.orig/Makefile 2008-07-25 22:46:07.000000000 +0200 ++++ iproute2-2.6.26/Makefile 2008-10-09 17:08:16.000000000 +0200 +@@ -21,13 +21,13 @@ ADDLIB+=ipx_ntop.o ipx_pton.o + + CC = gcc + HOSTCC = gcc +-CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall ++CCOPTS = -D_GNU_SOURCE -fwrapv -fno-ident -fwrapv -fno-ident -O2 -pipe -march=i586 -funit-at-a-time -pipe -march=i586 -funit-at-a-time -Wstrict-prototypes -Wall + CFLAGS = $(CCOPTS) -I../include $(DEFINES) + YACCFLAGS = -d -t -v + + LDLIBS += -L../lib -lnetlink -lutil + +-SUBDIRS=lib ip tc misc netem genl ++SUBDIRS=lib ip tc genl + + LIBNETLINK=../lib/libnetlink.a ../lib/libutil.a + diff --git a/package/iproute2/patches/patch-ip_Makefile b/package/iproute2/patches/patch-ip_Makefile new file mode 100644 index 000000000..d1f2cceec --- /dev/null +++ b/package/iproute2/patches/patch-ip_Makefile @@ -0,0 +1,10 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iproute2-2.6.26.orig/ip/Makefile 2008-07-25 22:46:07.000000000 +0200 ++++ iproute2-2.6.26/ip/Makefile 2008-10-09 17:07:10.000000000 +0200 +@@ -1,5 +1,5 @@ + IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o \ +- rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ ++ rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ + ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o \ + ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o \ + iplink_vlan.o link_veth.o diff --git a/package/iproute2/patches/patch-ip_iptunnel_c b/package/iproute2/patches/patch-ip_iptunnel_c new file mode 100644 index 000000000..c9e6098fb --- /dev/null +++ b/package/iproute2/patches/patch-ip_iptunnel_c @@ -0,0 +1,17 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- iproute2-2.6.26.orig/ip/iptunnel.c 2008-07-25 22:46:07.000000000 +0200 ++++ iproute2-2.6.26/ip/iptunnel.c 2008-10-09 17:08:43.000000000 +0200 +@@ -478,13 +478,6 @@ int do_iptunnel(int argc, char **argv) + break; + case AF_INET: + break; +- /* +- * This is silly enough but we have no easy way to make it +- * protocol-independent because of unarranged structure between +- * IPv4 and IPv6. +- */ +- case AF_INET6: +- return do_ip6tunnel(argc, argv); + default: + fprintf(stderr, "Unsupported family:%d\n", preferred_family); + exit(-1); -- cgit v1.2.3