OpenWRT
/
packages
mirror of https://github.com/openwrt/packages.git
1
0
Fork 0
Code Issues Releases Wiki Activity

cgroups-mount,docker-ce,lxc: rework kernel feature dependency 

Fix that KERNEL_CGROUPS is enabled (selected) automatically along with
cgroups-mount

Replace "if PACKAGE_docker-ce" with a menu to avoid circular denpendency
issue involving PACKAGE_docker-ce, PACKAGE_cgroups-mount and
KERNEL_CGRUOPS

docker-ce, lxc: replace KERNEL_LXC_MISC with more specific options

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
pull/9969/head
Yousong Zhou 2019-08-27 03:42:34 +00:00
parent 8d1aa54aba
commit b6a3145df5
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
utils/cgroupfs-mount/Makefile
View File

@ -10,23 +10,13 @@ PKG_HASH:=d6c8aff7af59c7d0082ee3018c97f73b0421e81a49bb28ad9f66a36da5cd6ec7
PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com> PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/cgroupfs-mount/config
config CGROUPFS_MOUNT_CGROUPS
depends on PACKAGE_cgroupfs-mount
bool "Enable support for cgroups in the kernel"
default y
select KERNEL_CGROUPS
endef
define Package/cgroupfs-mount define Package/cgroupfs-mount
SECTION:=utils SECTION:=utils
CATEGORY:=Utilities CATEGORY:=Utilities
TITLE:=cgroup mount scripts TITLE:=cgroup mount scripts
DEPENDS:=+mount-utils DEPENDS:=@KERNEL_CGROUPS +mount-utils
MENU:=1 MENU:=1
endef endef

6
utils/docker-ce/Config.in
View File

@ -1,4 +1,4 @@
if PACKAGE_docker-ce menu "Kernel features for Docker"
config DOCKER_KERNEL_OPTIONS config DOCKER_KERNEL_OPTIONS
bool "Enable Basic kernel support for Docker" bool "Enable Basic kernel support for Docker"
default n default n
@ -9,7 +9,7 @@ if PACKAGE_docker-ce
select KERNEL_CPUSETS select KERNEL_CPUSETS
select KERNEL_MEMCG select KERNEL_MEMCG
select KERNEL_KEYS select KERNEL_KEYS
select KERNEL_LXC_MISC select KERNEL_DEVPTS_MULTIPLE_INSTANCES
select KERNEL_POSIX_MQUEUE select KERNEL_POSIX_MQUEUE
help help
Select needed kernel options for Docker. Options include Select needed kernel options for Docker. Options include
@ -81,4 +81,4 @@ if PACKAGE_docker-ce
select PACKAGE_kmod-fs-btrfs select PACKAGE_kmod-fs-btrfs
select KERNEL_BTRFS_FS_POSIX_ACL select KERNEL_BTRFS_FS_POSIX_ACL
endmenu endmenu
endif endmenu

3
utils/lxc/Config.in
View File

@ -6,7 +6,8 @@ config LXC_KERNEL_OPTIONS
default n default n
select KERNEL_CGROUPS select KERNEL_CGROUPS
select KERNEL_NAMESPACES select KERNEL_NAMESPACES
select KERNEL_LXC_MISC select KERNEL_DEVPTS_MULTIPLE_INSTANCES
select KERNEL_POSIX_MQUEUE
select KERNEL_CGROUP_SCHED select KERNEL_CGROUP_SCHED
select KERNEL_FAIR_GROUP_SCHED select KERNEL_FAIR_GROUP_SCHED
select KERNEL_RT_GROUP_SCHED select KERNEL_RT_GROUP_SCHED