diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-07-17 10:09:38 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2012-07-17 10:09:38 +0200 |
| commit | 31d92207207c5418ca5014b39880bc01aa50fe08 (patch) | |
| tree | 45b20b50885105c4b7a59d0d601bd1528ab5f819 /package/iproute2 | |
| parent | fa913e6dcd649989622c2cc350e3403959741910 (diff) | |
update to latest upstream version
Diffstat (limited to 'package/iproute2')
| -rw-r--r-- | package/iproute2/Makefile | 16 | ||||
| -rw-r--r-- | package/iproute2/patches/patch-Makefile | 17 |
2 files changed, 8 insertions, 25 deletions
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 5d1273d6d..4202c26f8 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iproute2 -PKG_VERSION:= 3.3.0 +PKG_VERSION:= 3.4.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= 39a7ff2c5149475c710365954e2ce49b +PKG_MD5SUM:= 879d3fac4e90809598b2864ec4a0cbf8 PKG_DESCR:= iproute2 routing control utility PKG_SECTION:= route PKG_BUILDDEP:= iptables libnl linux-atm @@ -55,19 +55,19 @@ ip-install: ${INSTALL_BIN} ${WRKINST}/sbin/ip ${IDIR_IP}/usr/sbin/ip tc-install: - ${INSTALL_DIR} ${IDIR_TC}/{lib/tc,usr/sbin,usr/lib/tc} + ${INSTALL_DIR} ${IDIR_TC}/{usr/sbin,usr/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: - ${INSTALL_DIR} ${IDIR_TC_ATM}/lib/tc - ${INSTALL_DATA} ${WRKINST}/lib/tc/q_atm.so \ - ${IDIR_TC_ATM}/lib/tc/ + ${INSTALL_DIR} ${IDIR_TC_ATM}/usr/lib/tc + ${INSTALL_DATA} ${WRKINST}/usr/lib/tc/q_atm.so \ + ${IDIR_TC_ATM}/usr/lib/tc/ tc-iptables-install: - ${INSTALL_DIR} ${IDIR_TC_IPT}/lib/tc + ${INSTALL_DIR} ${IDIR_TC_IPT}/usr/lib/tc # use ${CP} here, since m_ipt.so is a symlink to m_xt.so - ${CP} ${WRKINST}/lib/tc/m_*.so ${IDIR_TC}/lib/tc/ + ${CP} ${WRKINST}/usr/lib/tc/m_*.so ${IDIR_TC}/usr/lib/tc/ ifstat-install: ${INSTALL_DIR} ${IDIR_IFSTAT}/usr/sbin diff --git a/package/iproute2/patches/patch-Makefile b/package/iproute2/patches/patch-Makefile deleted file mode 100644 index b9e8a23f1..000000000 --- a/package/iproute2/patches/patch-Makefile +++ /dev/null @@ -1,17 +0,0 @@ ---- iproute2-3.2.0.orig/Makefile 2012-01-05 17:34:31.000000000 +0100 -+++ iproute2-3.2.0/Makefile 2012-01-12 10:13:14.000000000 +0100 -@@ -27,10 +27,10 @@ ADDLIB+=dnet_ntop.o dnet_pton.o - #options for ipx - ADDLIB+=ipx_ntop.o ipx_pton.o - --CC = gcc --HOSTCC = gcc --CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall --CFLAGS = $(CCOPTS) -I../include $(DEFINES) -+CC := gcc -+HOSTCC := gcc -+CCOPTS ?= -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -+CFLAGS = $(CCOPTS) -I../include $(DEFINES) ${TARGET_CFLAGS} - YACCFLAGS = -d -t -v - - SUBDIRS=lib ip tc misc netem genl |