From 3e7c32a48de6f50f6308053a6c88fe8898246033 Mon Sep 17 00:00:00 2001 From: kongfl888 K Date: Thu, 20 Aug 2020 03:00:27 -0500 Subject: [PATCH 1/3] Coremark: use the general way to detect 64bit or not. (#5330) Signed-off-by: kongfl888 K --- package/lean/coremark/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/lean/coremark/Makefile b/package/lean/coremark/Makefile index c4badfb7e87629..714c0806084d59 100644 --- a/package/lean/coremark/Makefile +++ b/package/lean/coremark/Makefile @@ -37,10 +37,9 @@ endef DIR_ARCH:=linux -ifeq ($(ARCH),x86_64) +ifeq ($(CONFIG_ARCH_64BIT),y) DIR_ARCH:=linux64 -endif -ifeq ($(ARCH),aarch64) +else ifeq ($(CONFIG_64BIT),y) DIR_ARCH:=linux64 endif From 3283cc4324ff8158171d41d392d5eaabd2c0b608 Mon Sep 17 00:00:00 2001 From: Her0R0cket <33145975+Her0R0cket@users.noreply.github.com> Date: Thu, 20 Aug 2020 16:01:01 +0800 Subject: [PATCH 2/3] iproute2: disable SELinux for now (#5328) follow openwrt:iproute2: disable SELinux for now --- package/network/utils/iproute2/Makefile | 2 +- .../002-configure-support-ipset-v7.patch | 32 +++++++++++++++++++ .../patches/175-reduce-dynamic-syms.patch | 2 +- .../patches/300-selinux-configurable.patch | 11 +++++++ 4 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 package/network/utils/iproute2/patches/002-configure-support-ipset-v7.patch create mode 100644 package/network/utils/iproute2/patches/300-selinux-configurable.patch diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index a29b26f8172b70..56294430be396a 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 PKG_VERSION:=5.7.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2 diff --git a/package/network/utils/iproute2/patches/002-configure-support-ipset-v7.patch b/package/network/utils/iproute2/patches/002-configure-support-ipset-v7.patch new file mode 100644 index 00000000000000..cd0c52954419f0 --- /dev/null +++ b/package/network/utils/iproute2/patches/002-configure-support-ipset-v7.patch @@ -0,0 +1,32 @@ +From 650591a7a70cd79d826fcdc579a20c168c987cf2 Mon Sep 17 00:00:00 2001 +From: Tony Ambardar +Date: Tue, 7 Jul 2020 00:58:33 -0700 +Subject: [PATCH] configure: support ipset version 7 with kernel version 5 + +The configure script checks for ipset v6 availability but doesn't test +for v7, which is backward compatible and used on kernel v5.x systems. +Update the script to test for both ipset versions. Without this change, +the tc ematch function em_ipset will be disabled. + +Signed-off-by: Tony Ambardar +Signed-off-by: Stephen Hemminger +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index f415bf49..307912aa 100755 +--- a/configure ++++ b/configure +@@ -208,7 +208,7 @@ typedef unsigned short ip_set_id_t; + #include + + struct xt_set_info info; +-#if IPSET_PROTOCOL == 6 ++#if IPSET_PROTOCOL == 6 || IPSET_PROTOCOL == 7 + int main(void) + { + return IPSET_MAXNAMELEN; +-- +2.17.1 + diff --git a/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch b/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch index f4e33c4511b0ac..dbb516f02ebbca 100644 --- a/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch +++ b/package/network/utils/iproute2/patches/175-reduce-dynamic-syms.patch @@ -39,6 +39,6 @@ + for s in `grep -B 3 '\> $@ ; \ -+ echo "show_stats; print_tm; parse_rtattr; get_u32; matches; addattr_l; addattr_nest; addattr_nest_end; };" >> $@ ++ echo "show_stats; print_nl; print_tm; parse_rtattr; parse_rtattr_flags; get_u32; matches; addattr_l; addattr_nest; addattr_nest_end; };" >> $@ + endif diff --git a/package/network/utils/iproute2/patches/300-selinux-configurable.patch b/package/network/utils/iproute2/patches/300-selinux-configurable.patch new file mode 100644 index 00000000000000..4cda30f97827a6 --- /dev/null +++ b/package/network/utils/iproute2/patches/300-selinux-configurable.patch @@ -0,0 +1,11 @@ +--- a/configure ++++ b/configure +@@ -244,7 +244,7 @@ check_elf() + check_selinux() + # SELinux is a compile time option in the ss utility + { +- if ${PKG_CONFIG} libselinux --exists; then ++ if [ "${HAVE_SELINUX}" = "y" ] && ${PKG_CONFIG} libselinux --exists; then + echo "HAVE_SELINUX:=y" >>$CONFIG + echo "yes" + From d003d3d9001c4b45e124255d2574ea65dd95f2ef Mon Sep 17 00:00:00 2001 From: hyird <31695447+hyird@users.noreply.github.com> Date: Thu, 20 Aug 2020 16:01:20 +0800 Subject: [PATCH 3/3] keep truboacc at bottom (#5326) --- .../lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua | 2 +- package/lean/luci-app-sfe/luasrc/controller/sfe.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua b/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua index a02807264ceb3e..e837d96d4c1a61 100644 --- a/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua +++ b/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua @@ -5,7 +5,7 @@ function index() return end local page - page = entry({"admin", "network", "flowoffload"}, cbi("flowoffload"), _("Turbo ACC Center"), 101) + page = entry({"admin", "network", "flowoffload"}, cbi("flowoffload"), _("Turbo ACC Center"), 1001) page.i18n = "flowoffload" page.dependent = true diff --git a/package/lean/luci-app-sfe/luasrc/controller/sfe.lua b/package/lean/luci-app-sfe/luasrc/controller/sfe.lua index 10e9dd82b0bbd8..ab389583df4b8a 100644 --- a/package/lean/luci-app-sfe/luasrc/controller/sfe.lua +++ b/package/lean/luci-app-sfe/luasrc/controller/sfe.lua @@ -5,7 +5,7 @@ function index() return end local page - page = entry({"admin", "network", "sfe"}, cbi("sfe"), _("Turbo ACC Center"), 100) + page = entry({"admin", "network", "sfe"}, cbi("sfe"), _("Turbo ACC Center"), 1000) page.i18n = "sfe" page.dependent = true