projects
/
openwrt
/
staging
/
stintel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iproute2: bump to 4.13
[openwrt/staging/stintel.git]
/
package
/
network
/
utils
/
iproute2
/
patches
/
300-ip_tiny.patch
diff --git
a/package/network/utils/iproute2/patches/300-ip_tiny.patch
b/package/network/utils/iproute2/patches/300-ip_tiny.patch
index 290adbe5f58055c93a04caf03f36443f748a1d17..d48ea8581c78b5df111f1b2bac9805e5617b4d9b 100644
(file)
--- a/
package/network/utils/iproute2/patches/300-ip_tiny.patch
+++ b/
package/network/utils/iproute2/patches/300-ip_tiny.patch
@@
-1,7
+1,7
@@
--- a/ip/Makefile
+++ b/ip/Makefile
--- a/ip/Makefile
+++ b/ip/Makefile
-@@ -
17,6 +17,13 @@ ifeq ($(IP_CONFIG_SETNS
),y)
- CFLAGS += -DHAVE_SETNS
+@@ -
28,6 +28,13 @@ ifeq ($(HAVE_MNL
),y)
+ LDLIBS += $(shell $(PKG_CONFIG) libmnl --libs)
endif
+STATIC_SYM_FILTER:=
endif
+STATIC_SYM_FILTER:=
@@
-14,7
+14,7
@@
ALLOBJ=$(IPOBJ) $(RTMONOBJ)
SCRIPTS=ifcfg rtpr routel routef
TARGETS=ip rtmon
ALLOBJ=$(IPOBJ) $(RTMONOBJ)
SCRIPTS=ifcfg rtpr routel routef
TARGETS=ip rtmon
-@@ -
44,7 +51
,7 @@ else
+@@ -
57,7 +64
,7 @@ else
ip: static-syms.o
static-syms.o: static-syms.h
ip: static-syms.o
static-syms.o: static-syms.h
@@
-25,7
+25,7
@@
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
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
-@@ -7
3,30 +73,42
@@ static const struct cmd {
+@@ -7
4,32 +74,44
@@ static const struct cmd {
int (*func)(int argc, char **argv);
} cmds[] = {
{ "address", do_ipaddr },
int (*func)(int argc, char **argv);
} cmds[] = {
{ "address", do_ipaddr },
@@
-46,6
+46,8
@@
{ "l2tp", do_ipl2tp },
{ "fou", do_ipfou },
+#endif
{ "l2tp", do_ipl2tp },
{ "fou", do_ipfou },
+#endif
+ { "ila", do_ipila },
+ { "macsec", do_ipmacsec },
{ "tunnel", do_iptunnel },
{ "tunl", do_iptunnel },
+#ifndef IPROUTE2_TINY
{ "tunnel", do_iptunnel },
{ "tunl", do_iptunnel },
+#ifndef IPROUTE2_TINY
@@
-65,12
+67,12
@@
+#ifndef IPROUTE2_TINY
{ "netconf", do_ipnetconf },
+#endif
+#ifndef IPROUTE2_TINY
{ "netconf", do_ipnetconf },
+#endif
+ { "vrf", do_ipvrf},
+ { "sr", do_seg6 },
{ "help", do_help },
{ "help", do_help },
- { 0 }
- };
--- a/lib/utils.c
+++ b/lib/utils.c
--- a/lib/utils.c
+++ b/lib/utils.c
-@@ -7
10,6 +710,7 @@ const char *rt_addr_n2a(int af, int len,
+@@ -7
87,6 +787,7 @@ const char *rt_addr_n2a_r(int af, int le
return inet_ntop(af, addr, buf, buflen);
case AF_MPLS:
return mpls_ntop(af, addr, buf, buflen);
return inet_ntop(af, addr, buf, buflen);
case AF_MPLS:
return mpls_ntop(af, addr, buf, buflen);
@@
-78,7
+80,7
@@
case AF_IPX:
return ipx_ntop(af, addr, buf, buflen);
case AF_DECnet:
case AF_IPX:
return ipx_ntop(af, addr, buf, buflen);
case AF_DECnet:
-@@ -7
18,6 +719,7 @@ const char *rt_addr_n2a(int af, int len,
+@@ -7
96,6 +797,7 @@ const char *rt_addr_n2a_r(int af, int le
memcpy(dna.a_addr, addr, 2);
return dnet_ntop(af, &dna, buf, buflen);
}
memcpy(dna.a_addr, addr, 2);
return dnet_ntop(af, &dna, buf, buflen);
}
@@
-88,8
+90,8
@@
default:
--- a/lib/Makefile
+++ b/lib/Makefile
default:
--- a/lib/Makefile
+++ b/lib/Makefile
-@@ -
4,6 +4,10 @@ ifeq ($(IP_CONFIG_SETNS
),y)
- CFLAGS += -DHAVE_
SETNS
+@@ -
12,6 +12,10 @@ ifeq ($(HAVE_MNL
),y)
+ CFLAGS += -DHAVE_
LIBMNL $(shell $(PKG_CONFIG) libmnl --cflags)
endif
+ifeq ($(IP_CONFIG_TINY),y)
endif
+ifeq ($(IP_CONFIG_TINY),y)