From 40e578992b6af6a08126374c6e9aa84d1012e552 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 12 Mar 2020 20:53:36 +0100 Subject: [PATCH 1/3] procd: actually wire-up netns support When support for network namespaces was added to procd, adding the corresponding jail flag in procd.sh was ommitted. Add it now. Fixes: 97a03a4760 ("procd: update to latest git HEAD") Signed-off-by: Daniel Golle --- package/system/procd/Makefile | 2 +- package/system/procd/files/procd.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 89e5aa96f9..faf06fc257 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=procd -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index e8b1b6ffb7..7031763844 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -195,6 +195,7 @@ _procd_add_jail() { sysfs) json_add_boolean "sysfs" "1";; ronly) json_add_boolean "ronly" "1";; requirejail) json_add_boolean "requirejail" "1";; + netns) json_add_boolean "netns" "1";; esac done json_add_object "mount" From 763de7bd51f38f0b9e155bd6160d552d9a0fd2ae Mon Sep 17 00:00:00 2001 From: Yufei Miao Date: Wed, 11 Mar 2020 13:38:53 +0800 Subject: [PATCH 2/3] tools/cmake: Update to 3.16.5 Update cmake to 3.16.5 Signed-off-by: Yufei Miao --- tools/cmake/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile index c8a36b0dba..336db5dd1f 100644 --- a/tools/cmake/Makefile +++ b/tools/cmake/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cmake -PKG_VERSION:=3.16.2 +PKG_VERSION:=3.16.5 PKG_CPE_ID:=cpe:/a:kitware:cmake PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ \ https://cmake.org/files/v3.16/ -PKG_HASH:=8c09786ec60ca2be354c29829072c38113de9184f29928eb9da8446a5f2ce6a9 +PKG_HASH:=5f760b50b8ecc9c0c37135fae5fbf00a2fef617059aa9d61c1bb91653e5a8bfc HOST_BUILD_PARALLEL:=1 HOST_CONFIGURE_PARALLEL:=1 From 5c2b130ec9b011691771cad2dab9994a66836a1a Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Wed, 22 Jan 2020 22:03:56 +0000 Subject: [PATCH 3/3] kernel: ifb: set default numifbs to 0 By default on module load, 2 ifb interfaces are created and typically remain unused, cluttering 'ip link' outputs and generally confusing things. sqm-scripts for example, creates its own ifb interface/s instead of using these 2 defaults ifbs. Tell the ifb module to not create any default ifbs on load via the numifbs parameter. Signed-off-by: Kevin Darbyshire-Bryant --- package/kernel/linux/modules/netdevices.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index 5fae027417..4b42123339 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -927,6 +927,7 @@ define KernelPackage/ifb CONFIG_NET_CLS=y FILES:=$(LINUX_DIR)/drivers/net/ifb.ko AUTOLOAD:=$(call AutoLoad,34,ifb) + MODPARAMS.ifb:=numifbs=0 endef define KernelPackage/ifb/description