From 566bfa417e0e210a47b5481fa2001de0b47a9914 Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Tue, 19 Feb 2019 15:12:53 +0100 Subject: [PATCH] Revert "iproute2: tc: enable and fix support for using .so plugins" This reverts commit fc80ef3613465e60257a5ddf0674debe45b09180 as it breaks the installation of the iproute2 utilities ip-bridge, ss, nstat, devlink and rdma for the ip-full variant Signed-off-by: Hans Dedecker --- package/network/utils/iproute2/Makefile | 7 +- .../patches/135-sync-iptables-header.patch | 101 ------------------ 2 files changed, 1 insertion(+), 107 deletions(-) delete mode 100644 package/network/utils/iproute2/patches/135-sync-iptables-header.patch diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 6e20e34dd8..a9bcfd40a0 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -106,7 +106,6 @@ endif ifeq ($(BUILD_VARIANT),tc) HAVE_ELF:=y - SHARED_LIBS:=y endif ifdef CONFIG_PACKAGE_devlink @@ -128,7 +127,7 @@ TARGET_CPPFLAGS += -I$(STAGING_DIR)/usr/include/libnl-tiny MAKE_FLAGS += \ KERNEL_INCLUDE="$(LINUX_DIR)/user_headers/include" \ - SHARED_LIBS=$(SHARED_LIBS) \ + SHARED_LIBS="" \ IP_CONFIG_TINY=$(IP_CONFIG_TINY) \ HAVE_ELF=$(HAVE_ELF) \ HAVE_MNL=$(HAVE_MNL) \ @@ -165,10 +164,6 @@ define Package/tc/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/tc/tc $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/hotplug.d/iface $(INSTALL_BIN) ./files/15-teql $(1)/etc/hotplug.d/iface/ -ifeq ($(SHARED_LIBS),y) - $(INSTALL_DIR) $(1)/usr/lib/tc - $(CP) $(PKG_BUILD_DIR)/tc/*.so $(1)/usr/lib/tc -endif endef # ensure other packages are only saved during 'tiny' builds. diff --git a/package/network/utils/iproute2/patches/135-sync-iptables-header.patch b/package/network/utils/iproute2/patches/135-sync-iptables-header.patch deleted file mode 100644 index a04d8ac742..0000000000 --- a/package/network/utils/iproute2/patches/135-sync-iptables-header.patch +++ /dev/null @@ -1,101 +0,0 @@ -Description: Sync header from iptables - The current versions in several suites have the same content: - - 1.6.1-2 (unstable) -Bug: https://bugs.debian.org/868059 -Forwarded: not-needed -Author: Cyril Brulebois -Last-Update: 2017-11-22 ---- a/include/xtables.h -+++ b/include/xtables.h -@@ -205,9 +205,24 @@ enum xtables_ext_flags { - XTABLES_EXT_ALIAS = 1 << 0, - }; - -+struct xt_xlate; -+ -+struct xt_xlate_mt_params { -+ const void *ip; -+ const struct xt_entry_match *match; -+ int numeric; -+ bool escape_quotes; -+}; -+ -+struct xt_xlate_tg_params { -+ const void *ip; -+ const struct xt_entry_target *target; -+ int numeric; -+ bool escape_quotes; -+}; -+ - /* Include file for additions: new matches and targets. */ --struct xtables_match --{ -+struct xtables_match { - /* - * ABI/API version this module requires. Must be first member, - * as the rest of this struct may be subject to ABI changes. -@@ -269,6 +284,10 @@ struct xtables_match - void (*x6_fcheck)(struct xt_fcheck_call *); - const struct xt_option_entry *x6_options; - -+ /* Translate iptables to nft */ -+ int (*xlate)(struct xt_xlate *xl, -+ const struct xt_xlate_mt_params *params); -+ - /* Size of per-extension instance extra "global" scratch space */ - size_t udata_size; - -@@ -280,8 +299,7 @@ struct xtables_match - unsigned int loaded; /* simulate loading so options are merged properly */ - }; - --struct xtables_target --{ -+struct xtables_target { - /* - * ABI/API version this module requires. Must be first member, - * as the rest of this struct may be subject to ABI changes. -@@ -346,6 +364,10 @@ struct xtables_target - void (*x6_fcheck)(struct xt_fcheck_call *); - const struct xt_option_entry *x6_options; - -+ /* Translate iptables to nft */ -+ int (*xlate)(struct xt_xlate *xl, -+ const struct xt_xlate_tg_params *params); -+ - size_t udata_size; - - /* Ignore these men behind the curtain: */ -@@ -406,6 +428,17 @@ struct xtables_globals - - #define XT_GETOPT_TABLEEND {.name = NULL, .has_arg = false} - -+/* -+ * enum op- -+ * -+ * For writing clean nftables translations code -+ */ -+enum xt_op { -+ XT_OP_EQ, -+ XT_OP_NEQ, -+ XT_OP_MAX, -+}; -+ - #ifdef __cplusplus - extern "C" { - #endif -@@ -548,6 +581,14 @@ extern void xtables_lmap_free(struct xta - extern int xtables_lmap_name2id(const struct xtables_lmap *, const char *); - extern const char *xtables_lmap_id2name(const struct xtables_lmap *, int); - -+/* xlate infrastructure */ -+struct xt_xlate *xt_xlate_alloc(int size); -+void xt_xlate_free(struct xt_xlate *xl); -+void xt_xlate_add(struct xt_xlate *xl, const char *fmt, ...); -+void xt_xlate_add_comment(struct xt_xlate *xl, const char *comment); -+const char *xt_xlate_get_comment(struct xt_xlate *xl); -+const char *xt_xlate_get(struct xt_xlate *xl); -+ - #ifdef XTABLES_INTERNAL - - /* Shipped modules rely on this... */ -- 2.30.2