ipq40xx: only include ath10k-board-qca4019 for the generic subtarget

[openwrt/staging/chunkeey.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 c9b28dfe7727859fb4d4ce7d0b8f65761a1139d1..cd687e760104462be127ef9d3787751e0c5e1114 100644 (file)
--- a/package/network/utils/iproute2/patches/170-ip_tiny.patch
+++ b/package/network/utils/iproute2/patches/170-ip_tiny.patch
@@ -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
-@@ -48,10 +48,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"
 +#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 | nexthop | mptcp }\n"
+               "where  OBJECT := { address | addrlabel | fou | help | ila | ioam | 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"
-@@ -74,36 +80,50 @@ static const struct cmd {
+@@ -91,37 +97,51 @@ static const struct cmd {
        int (*func)(int argc, char **argv);
  } cmds[] = {
        { "address",    do_ipaddr },
@@ -89,6 +90,7 @@
 +#ifndef IPROUTE2_TINY
        { "nexthop",    do_ipnh },
        { "mptcp",      do_mptcp },
+       { "ioam",       do_ioam6 },
 +#endif
        { "help",       do_help },
        { 0 }
@@ -103,6 +105,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 cg_map.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