diff options
Diffstat (limited to 'package/iproute2')
| -rw-r--r-- | package/iproute2/Makefile | 17 | ||||
| -rw-r--r-- | package/iproute2/patches/patch-bridge_mst_c | 10 | ||||
| -rw-r--r-- | package/iproute2/patches/patch-tc_tc_core_h | 11 |
3 files changed, 4 insertions, 34 deletions
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index d1f583742..1c7b61d64 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -4,23 +4,20 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= iproute2 -PKG_VERSION:= 6.11.0 +PKG_VERSION:= 6.14.0 PKG_RELEASE:= 1 -PKG_HASH:= 1f795398a04aeaacd06a8f6ace2cfd913c33fa5953ca99daae83bb5c534611c3 +PKG_HASH:= a6d23588150096591c3d00fc27a324a82ee71d7a1a9eea78df5df17ad9b8461f PKG_DESCR:= routing control utility PKG_SECTION:= net/route -PKG_BUILDDEP:= iptables libnl linux-atm +PKG_BUILDDEP:= iptables libnl PKG_DEPENDS:= libnl PKG_URL:= http://www.linuxfoundation.org/en/Net:Iproute2 PKG_SITES:= http://www.kernel.org/pub/linux/utils/net/iproute2/ -PKG_SUBPKGS:= IP TC TC_ATM TC_IPT IFSTAT LNSTAT ROUTEL RTMON SS +PKG_SUBPKGS:= IP TC TC_IPT IFSTAT LNSTAT ROUTEL RTMON SS PKGSS_IP:= libmnl PKGSD_TC:= traffic control utility PKGSB_TC:= iptables -PKGSD_TC_ATM:= traffic control atm support library -PKGSS_TC_ATM:= tc libatm -PKGSB_TC_ATM:= linux-atm PKGSD_TC_IPT:= traffic control iptables support library PKGSS_TC_IPT:= tc iptables PKGSB_TC_IPT:= iptables @@ -34,7 +31,6 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,IP,ip,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,TC,tc,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_TC},${PKGSD_TC},${PKG_SECTION})) -$(eval $(call PKG_template,TC_ATM,tc-atm,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_TC_ATM},${PKGSD_TC_ATM},${PKG_SECTION})) $(eval $(call PKG_template,TC_IPT,tc-iptables,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_TC_IPT},${PKGSD_TC_IPT},${PKG_SECTION})) $(eval $(call PKG_template,IFSTAT,ifstat,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_IFSTAT},${PKG_SECTION})) $(eval $(call PKG_template,LNSTAT,lnstat,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_LNSTAT},${PKG_SECTION})) @@ -56,11 +52,6 @@ tc-install: ${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}/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}/usr/lib/tc # use ${CP} here, since m_ipt.so is a symlink to m_xt.so diff --git a/package/iproute2/patches/patch-bridge_mst_c b/package/iproute2/patches/patch-bridge_mst_c deleted file mode 100644 index ed62eb842..000000000 --- a/package/iproute2/patches/patch-bridge_mst_c +++ /dev/null @@ -1,10 +0,0 @@ ---- iproute2-6.11.0.orig/bridge/mst.c 2024-09-15 21:42:26.000000000 +0200 -+++ iproute2-6.11.0/bridge/mst.c 2024-09-24 09:58:39.165522637 +0200 -@@ -4,6 +4,7 @@ - */ - - #include <stdio.h> -+#include <netinet/in.h> - #include <linux/if_bridge.h> - #include <net/if.h> - diff --git a/package/iproute2/patches/patch-tc_tc_core_h b/package/iproute2/patches/patch-tc_tc_core_h deleted file mode 100644 index 25c259cee..000000000 --- a/package/iproute2/patches/patch-tc_tc_core_h +++ /dev/null @@ -1,11 +0,0 @@ ---- iproute2-6.11.0.orig/tc/tc_core.h 2024-09-15 21:42:26.000000000 +0200 -+++ iproute2-6.11.0/tc/tc_core.h 2024-09-24 09:43:33.562449121 +0200 -@@ -2,7 +2,7 @@ - #ifndef _TC_CORE_H_ - #define _TC_CORE_H_ 1 - --#include <asm/types.h> -+#include <sys/types.h> - #include <linux/pkt_sched.h> - - enum link_layer { |