From 6ca172247d9e133b3473d919f5cbdda61b46d6f0 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sun, 1 Aug 2021 23:07:29 +0800 Subject: [PATCH] Revert "iproute2: bump to 5.13 (#7545)" This reverts commit b772877d87db7497a038f601ee2f114e7598bc80. --- package/network/utils/iproute2/Makefile | 6 +-- ....patch => 130-no_netem_tipc_dcb_man.patch} | 2 +- .../utils/iproute2/patches/170-ip_tiny.patch | 17 ++++--- .../patches/185-libbpf-add-limits-h.patch | 45 +++++++++++++++++++ 4 files changed, 57 insertions(+), 13 deletions(-) rename package/network/utils/iproute2/patches/{130-no_netem_tipc_dcb_man_vdpa.patch => 130-no_netem_tipc_dcb_man.patch} (97%) create mode 100644 package/network/utils/iproute2/patches/185-libbpf-add-limits-h.patch diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index d8eff2f06..6fddf4e15 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=5.13.0 -PKG_RELEASE:=4 +PKG_VERSION:=5.11.0 +PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2 -PKG_HASH:=72a2e53774cac9e65f7b617deebb2059f87e8960d6e9713e4d788cea966f1b36 +PKG_HASH:=c5e2ea108212b3445051b35953ec267f9f3469e1d5c67ac034ab559849505c54 PKG_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=iptables PKG_LICENSE:=GPL-2.0 diff --git a/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch b/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man.patch similarity index 97% rename from package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch rename to package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man.patch index 8ddb31674..e3faee0d8 100644 --- a/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch +++ b/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man.patch @@ -4,7 +4,7 @@ CFLAGS := $(WFLAGS) $(CCOPTS) -I../include -I../include/uapi $(DEFINES) $(CFLAGS) YACCFLAGS = -d -t -v --SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma dcb man vdpa +-SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma dcb man +SUBDIRS=lib ip tc bridge misc genl devlink rdma LIBNETLINK=../lib/libutil.a ../lib/libnetlink.a diff --git a/package/network/utils/iproute2/patches/170-ip_tiny.patch b/package/network/utils/iproute2/patches/170-ip_tiny.patch index b8804d6b6..d5e5b3693 100644 --- a/package/network/utils/iproute2/patches/170-ip_tiny.patch +++ b/package/network/utils/iproute2/patches/170-ip_tiny.patch @@ -25,20 +25,19 @@ sed -n '/'$$s'[^ ]* =/{s:.* \([^ ]*'$$s'[^ ]*\) .*:extern char \1[] __attribute__((weak)); if (!strcmp(sym, "\1")) return \1;:;p}' $$files ; \ --- a/ip/ip.c +++ b/ip/ip.c -@@ -64,11 +64,17 @@ static void usage(void) +@@ -64,10 +64,16 @@ static void usage(void) fprintf(stderr, "Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n" " ip [ -force ] -batch filename\n" +#ifndef IPROUTE2_TINY - "where OBJECT := { address | addrlabel | fou | help | ila | l2tp | link |\n" - " macsec | maddress | monitor | mptcp | mroute | mrule |\n" - " neighbor | neighbour | netconf | netns | nexthop | ntable |\n" - " ntbl | route | rule | sr | tap | tcpmetrics |\n" - " token | tunnel | tuntap | vrf | xfrm }\n" + "where OBJECT := { link | address | addrlabel | route | rule | neigh | ntable |\n" + " tunnel | tuntap | maddress | mroute | mrule | monitor | xfrm |\n" + " netns | l2tp | fou | macsec | tcp_metrics | token | netconf | ila |\n" + " vrf | sr | nexthop | mptcp }\n" +#else -+ "where OBJECT := { address | ila | route | rule | link | neigh | tunnel |\n" -+ " mroute| maddress | mrule | monitor | netns | macsec |\n" -+ " neighbor | neighbour | token | vrf | sr }\n" ++ "where OBJECT := { link | address | route | rule | neigh | tunnel | maddress |\n" ++ " mroute | mrule | monitor | netns | macsec | token | ila |\n" ++ " vrf | sr }\n" +#endif " OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n" " -h[uman-readable] | -iec | -j[son] | -p[retty] |\n" diff --git a/package/network/utils/iproute2/patches/185-libbpf-add-limits-h.patch b/package/network/utils/iproute2/patches/185-libbpf-add-limits-h.patch new file mode 100644 index 000000000..07dbbc65b --- /dev/null +++ b/package/network/utils/iproute2/patches/185-libbpf-add-limits-h.patch @@ -0,0 +1,45 @@ +From c77310119f9a5f99221dd967c5eb0c7a26094b41 Mon Sep 17 00:00:00 2001 +From: Tony Ambardar +Date: Wed, 3 Mar 2021 10:29:24 -0800 +Subject: [PATCH] lib/bpf: add missing limits.h includes + +Several functions in bpf_glue.c and bpf_libbpf.c rely on PATH_MAX, which is +normally included from in other iproute2 source files. + +It fixes errors seen using gcc 10.2.0, binutils 2.35.1 and musl 1.1.24: + +bpf_glue.c: In function 'get_libbpf_version': +bpf_glue.c:46:11: error: 'PATH_MAX' undeclared (first use in this function); +did you mean 'AF_MAX'? + 46 | char buf[PATH_MAX], *s; + | ^~~~~~~~ + | AF_MAX + +Reported-by: Rui Salvaterra +Signed-off-by: Tony Ambardar +--- + lib/bpf_glue.c | 2 ++ + lib/bpf_libbpf.c | 1 + + 2 files changed, 3 insertions(+) + +--- a/lib/bpf_glue.c ++++ b/lib/bpf_glue.c +@@ -4,6 +4,8 @@ + * Authors: Hangbin Liu + * + */ ++#include ++ + #include "bpf_util.h" + #ifdef HAVE_LIBBPF + #include +--- a/lib/bpf_libbpf.c ++++ b/lib/bpf_libbpf.c +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + + #include + #include