forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request coolsnowwolf#9938 from breakings/iproute2
- Loading branch information
Showing
14 changed files
with
110 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
...ork/utils/iproute2/patches/105-ipstats-Define-MIN-function-to-fix-undefined-referen.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
From c69e8e474936795a2cd7638b11ce3e99ff4d5ae7 Mon Sep 17 00:00:00 2001 | ||
From: Nick Hainke <vincent@systemli.org> | ||
Date: Sat, 6 Aug 2022 10:00:20 +0200 | ||
Subject: [PATCH] ipstats: Define MIN function to fix undefined references | ||
|
||
Fixes errors in the form of: | ||
in function `ipstats_show_64': | ||
<artificial>:(.text+0x4e30): undefined reference to `MIN' | ||
|
||
Signed-off-by: Nick Hainke <vincent@systemli.org> | ||
--- | ||
ip/ipstats.c | 4 ++++ | ||
1 file changed, 4 insertions(+) | ||
|
||
--- a/ip/ipstats.c | ||
+++ b/ip/ipstats.c | ||
@@ -6,6 +6,10 @@ | ||
#include "utils.h" | ||
#include "ip_common.h" | ||
|
||
+#ifndef MIN | ||
+#define MIN(a, b) ((a) < (b) ? (a) : (b)) | ||
+#endif | ||
+ | ||
struct ipstats_stat_dump_filters { | ||
/* mask[0] filters outer attributes. Then individual nests have their | ||
* filtering mask at the index of the nested attribute. |
11 changes: 7 additions & 4 deletions
11
package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,14 @@ | ||
--- a/Makefile | ||
+++ b/Makefile | ||
@@ -55,7 +55,7 @@ WFLAGS += -Wmissing-declarations -Wold-s | ||
@@ -65,9 +65,9 @@ WFLAGS += -Wmissing-declarations -Wold-s | ||
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 genl devlink rdma | ||
-SUBDIRS=lib ip tc bridge misc netem genl man | ||
+SUBDIRS=lib ip tc bridge misc genl | ||
ifeq ($(HAVE_MNL),y) | ||
-SUBDIRS += tipc devlink rdma dcb vdpa | ||
+SUBDIRS += devlink rdma | ||
endif | ||
|
||
LIBNETLINK=../lib/libutil.a ../lib/libnetlink.a | ||
LDLIBS += $(LIBNETLINK) |
2 changes: 1 addition & 1 deletion
2
package/network/utils/iproute2/patches/140-keep_libmnl_optional.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
package/network/utils/iproute2/patches/145-keep_libelf_optional.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
--- a/configure | ||
+++ b/configure | ||
@@ -255,7 +255,7 @@ EOF | ||
@@ -266,7 +266,7 @@ EOF | ||
|
||
check_elf() | ||
{ | ||
|
2 changes: 1 addition & 1 deletion
2
package/network/utils/iproute2/patches/150-keep_libcap_optional.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
--- a/configure | ||
+++ b/configure | ||
@@ -445,7 +445,7 @@ EOF | ||
@@ -469,7 +469,7 @@ EOF | ||
|
||
check_cap() | ||
{ | ||
|
11 changes: 11 additions & 0 deletions
11
package/network/utils/iproute2/patches/155-keep_tirpc_optional.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- a/configure | ||
+++ b/configure | ||
@@ -398,7 +398,7 @@ check_selinux() | ||
|
||
check_tirpc() | ||
{ | ||
- if ${PKG_CONFIG} libtirpc --exists; then | ||
+ if [ "${HAVE_TIRPC}" = "y" ] && ${PKG_CONFIG} libtirpc --exists; then | ||
echo "HAVE_RPC:=y" >>$CONFIG | ||
echo "yes" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
package/network/utils/iproute2/patches/195-build_variant_ip_tc.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
package/network/utils/iproute2/patches/200-drop_libbsd_dependency.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
package/network/utils/iproute2/patches/300-selinux-configurable.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters