aio-3399b/ImmortalWrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge Official Source

Browse Source
This commit is contained in:
CN_SZTL 2020-03-13 21:14:37 +08:00
commit 6a5d74048f
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/kernel/linux/modules/netdevices.mk
View File

@ -958,6 +958,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

2
package/system/procd/Makefile
View File

@ -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

1
package/system/procd/files/procd.sh
View File

@ -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"

4
tools/cmake/Makefile
View File

@ -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