iproute2: update to 5.14

[openwrt/staging/stintel.git] / package / network / utils / iproute2 / patches / 170-ip_tiny.patch

diff --git a/package/network/utils/iproute2/patches/170-ip_tiny.patch b/package/network/utils/iproute2/patches/170-ip_tiny.patch
index fb5a6466e42634081d971f594c67a679f8eeb694..2c1ec1dcb36055025b8f9b28178a620019ca0741 100644 (file)
--- a/package/network/utils/iproute2/patches/170-ip_tiny.patch
+++ b/package/network/utils/iproute2/patches/170-ip_tiny.patch
@@ -1,6 +1,6 @@
 --- a/ip/Makefile
 +++ b/ip/Makefile
-@@ -16,6 +16,13 @@ RTMONOBJ=rtmon.o
+@@ -17,6 +17,13 @@ RTMONOBJ=rtmon.o
  
  include ../config.mk
  
@@ -14,7 +14,7 @@
  ALLOBJ=$(IPOBJ) $(RTMONOBJ)
  SCRIPTS=ifcfg rtpr routel routef
  TARGETS=ip rtmon
-@@ -45,7 +52,7 @@ else
+@@ -46,7 +53,7 @@ else
  
  ip: static-syms.o
  static-syms.o: static-syms.h
@@ -25,24 +25,25 @@
                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
-@@ -47,10 +47,16 @@ static void usage(void)
+@@ -64,11 +64,17 @@ static void usage(void)
        fprintf(stderr,
- "Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
- "       ip [ -force ] -batch filename\n"
+               "Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
+               "       ip [ -force ] -batch filename\n"
 +#ifndef IPROUTE2_TINY
- "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 }\n"
+               "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"
 +#else
-+"where  OBJECT := { link | address | route | rule | neigh | tunnel | maddress |\n"
-+"                   mroute | mrule | monitor | netns | macsec | token | ila |\n"
-+"                   vrf | sr }\n"
++              "where  OBJECT := { address | ila | link | macsec | maddress | monitor |\n"
++              "                   mroute | mrule | neighbor | neighbour | netns | route |\n"
++              "                   rule | sr | token | tunnel | vrf }\n"
 +#endif
- "       OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
- "                    -h[uman-readable] | -iec | -j[son] | -p[retty] |\n"
- "                    -f[amily] { inet | inet6 | mpls | bridge | link } |\n"
-@@ -72,32 +78,44 @@ static const struct cmd {
+               "       OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
+               "                    -h[uman-readable] | -iec | -j[son] | -p[retty] |\n"
+               "                    -f[amily] { inet | inet6 | mpls | bridge | link } |\n"
+@@ -91,36 +97,50 @@ static const struct cmd {
        int (*func)(int argc, char **argv);
  } cmds[] = {
        { "address",    do_ipaddr },
@@ -86,7 +87,13 @@
 +#endif
        { "vrf",        do_ipvrf},
        { "sr",         do_seg6 },
++#ifndef IPROUTE2_TINY
+       { "nexthop",    do_ipnh },
+       { "mptcp",      do_mptcp },
++#endif
        { "help",       do_help },
+       { 0 }
+ };
 --- a/lib/Makefile
 +++ b/lib/Makefile
 @@ -3,6 +3,10 @@ include ../config.mk
@@ -97,6 +104,6 @@
 +  CFLAGS += -DIPROUTE2_TINY
 +endif
 +
- UTILOBJ = utils.o rt_names.o ll_map.o ll_types.o ll_proto.o ll_addr.o \
-       inet_proto.o namespace.o json_writer.o json_print.o \
-       names.o color.o bpf.o exec.o fs.o
+ UTILOBJ = utils.o utils_math.o rt_names.o ll_map.o ll_types.o ll_proto.o ll_addr.o \
+       inet_proto.o namespace.o json_writer.o json_print.o json_print_math.o \
+       names.o color.o bpf_legacy.o bpf_glue.o exec.o fs.o cg_map.o