docker-ce: Simplified config layout for menuconfig
cgroupfs-mount: Replaced dependency with cgroup config option Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
This commit is contained in:
Gerard Ryan
parent
453c5a9b36
commit
07b042c53e
2 changed files with 91 additions and 78 deletions
|
|
@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=cgroupfs-mount
|
PKG_NAME:=cgroupfs-mount
|
||||||
PKG_VERSION:=1.4
|
PKG_VERSION:=1.4
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://codeload.github.com/tianon/cgroupfs-mount/tar.gz/${PKG_VERSION}?
|
PKG_SOURCE_URL:=https://codeload.github.com/tianon/cgroupfs-mount/tar.gz/${PKG_VERSION}?
|
||||||
|
|
@ -12,11 +12,19 @@ PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
define Package/cgroupfs-mount/config
|
||||||
|
config CGROUPFS_MOUNT_KERNEL_CGROUPS
|
||||||
|
bool "Enable kernel cgroups support"
|
||||||
|
depends on PACKAGE_cgroupfs-mount
|
||||||
|
default y if ( DOCKER_KERNEL_OPTIONS || LXC_KERNEL_OPTIONS )
|
||||||
|
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:=@KERNEL_CGROUPS +mount-utils
|
DEPENDS:=+mount-utils
|
||||||
MENU:=1
|
MENU:=1
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,85 +1,90 @@
|
||||||
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"
|
depends on PACKAGE_docker-ce
|
||||||
|
default n
|
||||||
|
select KERNEL_CGROUPS
|
||||||
|
select KERNEL_CGROUP_CPUACCT
|
||||||
|
select KERNEL_CGROUP_SCHED
|
||||||
|
select KERNEL_NAMESPACES
|
||||||
|
select KERNEL_CPUSETS
|
||||||
|
select KERNEL_MEMCG
|
||||||
|
select KERNEL_KEYS
|
||||||
|
select KERNEL_DEVPTS_MULTIPLE_INSTANCES
|
||||||
|
select KERNEL_POSIX_MQUEUE
|
||||||
|
help
|
||||||
|
Select needed kernel options for Docker. Options include
|
||||||
|
cgroups, namespaces and other miscellaneous options.
|
||||||
|
see also https://github.com/docker/engine/blob/master/contrib/check-config.sh
|
||||||
|
|
||||||
|
config DOCKER_SECCOMP
|
||||||
|
bool "Enable support for seccomp in Docker"
|
||||||
|
depends on PACKAGE_docker-ce
|
||||||
|
default n
|
||||||
|
select KERNEL_SECCOMP
|
||||||
|
select PACKAGE_libseccomp
|
||||||
|
help
|
||||||
|
Build Docker with support for seccomp filters.
|
||||||
|
Select libseccomp which also pulls-in the needed kernel features.
|
||||||
|
|
||||||
|
config DOCKER_RES_SHAPE
|
||||||
|
bool "Enables support for resource shaping"
|
||||||
|
depends on PACKAGE_docker-ce
|
||||||
|
default n
|
||||||
|
select KERNEL_MEMCG_SWAP
|
||||||
|
select KERNEL_MEMCG_SWAP_ENABLED
|
||||||
|
select KERNEL_BLK_DEV_THROTTLING
|
||||||
|
select KERNEL_CFQ_GROUP_IOSCHED
|
||||||
|
select KERNEL_CGROUP_PERF
|
||||||
|
select KERNEL_FAIR_GROUP_SCHED
|
||||||
|
select KERNEL_CFS_BANDWIDTH
|
||||||
|
select KERNEL_RT_GROUP_SCHED
|
||||||
|
|
||||||
|
menu "Network"
|
||||||
|
depends on PACKAGE_docker-ce
|
||||||
|
|
||||||
|
config DOCKER_NET_OVERLAY
|
||||||
|
bool "Enables the Overlay network feature"
|
||||||
default n
|
default n
|
||||||
select KERNEL_CGROUPS
|
select PACKAGE_kmod-udptunnel4
|
||||||
select KERNEL_CGROUP_CPUACCT
|
|
||||||
select KERNEL_CGROUP_SCHED
|
|
||||||
select KERNEL_NAMESPACES
|
|
||||||
select KERNEL_CPUSETS
|
|
||||||
select KERNEL_MEMCG
|
|
||||||
select KERNEL_KEYS
|
|
||||||
select KERNEL_DEVPTS_MULTIPLE_INSTANCES
|
|
||||||
select KERNEL_POSIX_MQUEUE
|
|
||||||
help
|
help
|
||||||
Select needed kernel options for Docker. Options include
|
Selects kernel options for the Overlay network feature.
|
||||||
cgroups, namespaces and other miscellaneous options.
|
Includes udptunnel4
|
||||||
see also https://github.com/docker/engine/blob/master/contrib/check-config.sh
|
|
||||||
|
|
||||||
config DOCKER_SECCOMP
|
config DOCKER_NET_ENCRYPT
|
||||||
bool "Enable support for seccomp in Docker"
|
bool "Enable encrypted networking kernel support"
|
||||||
|
depends on DOCKER_NET_OVERLAY
|
||||||
default n
|
default n
|
||||||
select KERNEL_SECCOMP
|
select PACKAGE_kmod-ipsec
|
||||||
select PACKAGE_libseccomp
|
select PACKAGE_kmod-ipsec4
|
||||||
|
select PACKAGE_kmod-crypto-gcm
|
||||||
|
select PACKAGE_kmod-crypto-ghash
|
||||||
help
|
help
|
||||||
Build Docker with support for seccomp filters.
|
Select needed kernel options for encrypted networking support.
|
||||||
Select libseccomp which also pulls-in the needed kernel features.
|
|
||||||
|
|
||||||
config DOCKER_RES_SHAPE
|
config DOCKER_NET_MACVLAN
|
||||||
bool "Enables support for resource shaping"
|
bool "Enables macvlan kernel support"
|
||||||
default n
|
default n
|
||||||
select KERNEL_MEMCG_SWAP
|
select PACKAGE_kmod-macvlan
|
||||||
select KERNEL_MEMCG_SWAP_ENABLED
|
select PACKAGE_kmod-dummy
|
||||||
select KERNEL_BLK_DEV_THROTTLING
|
|
||||||
select KERNEL_CFQ_GROUP_IOSCHED
|
|
||||||
select KERNEL_CGROUP_PERF
|
|
||||||
select KERNEL_FAIR_GROUP_SCHED
|
|
||||||
select KERNEL_CFS_BANDWIDTH
|
|
||||||
select KERNEL_RT_GROUP_SCHED
|
|
||||||
|
|
||||||
menu "Network"
|
config DOCKER_NET_TFTP
|
||||||
config DOCKER_NET_OVERLAY
|
bool "Enable ftp/tftp client kernel support"
|
||||||
bool "Enables the Overlay network feature"
|
default n
|
||||||
default n
|
select PACKAGE_kmod-nf-nathelper
|
||||||
select PACKAGE_kmod-udptunnel4
|
select PACKAGE_kmod-nf-nathelper-extra
|
||||||
help
|
endmenu
|
||||||
Selects kernel options for the Overlay network feature.
|
|
||||||
Includes udptunnel4
|
menu "Storage"
|
||||||
|
depends on PACKAGE_docker-ce
|
||||||
config DOCKER_NET_ENCRYPT
|
|
||||||
bool "Enable encrypted networking kernel support"
|
config DOCKER_STO_EXT4
|
||||||
depends on DOCKER_NET_OVERLAY
|
bool "Enables support for ext3 or ext4 as the backing filesystem"
|
||||||
default n
|
default n
|
||||||
select PACKAGE_kmod-ipsec
|
select KERNEL_EXT4_FS_POSIX_ACL
|
||||||
select PACKAGE_kmod-ipsec4
|
|
||||||
select PACKAGE_kmod-crypto-gcm
|
config DOCKER_STO_BTRFS
|
||||||
select PACKAGE_kmod-crypto-ghash
|
bool "Enables support for btrfs as the backing filesystem"
|
||||||
help
|
default n
|
||||||
Select needed kernel options for encrypted networking support.
|
select PACKAGE_kmod-fs-btrfs
|
||||||
|
select KERNEL_BTRFS_FS_POSIX_ACL
|
||||||
config DOCKER_NET_MACVLAN
|
|
||||||
bool "Enables macvlan kernel support"
|
|
||||||
default n
|
|
||||||
select PACKAGE_kmod-macvlan
|
|
||||||
select PACKAGE_kmod-dummy
|
|
||||||
|
|
||||||
config DOCKER_NET_TFTP
|
|
||||||
bool "Enable ftp/tftp client kernel support"
|
|
||||||
default n
|
|
||||||
select PACKAGE_kmod-nf-nathelper
|
|
||||||
select PACKAGE_kmod-nf-nathelper-extra
|
|
||||||
endmenu
|
|
||||||
|
|
||||||
menu "Storage"
|
|
||||||
config DOCKER_STO_EXT4
|
|
||||||
bool "Enables support for ext3 or ext4 as the backing filesystem"
|
|
||||||
default n
|
|
||||||
select KERNEL_EXT4_FS_POSIX_ACL
|
|
||||||
|
|
||||||
config DOCKER_STO_BTRFS
|
|
||||||
bool "Enables support for btrfs as the backing filesystem"
|
|
||||||
default n
|
|
||||||
select PACKAGE_kmod-fs-btrfs
|
|
||||||
select KERNEL_BTRFS_FS_POSIX_ACL
|
|
||||||
endmenu
|
|
||||||
endmenu
|
endmenu
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue