From e35f2c7b2deed6a1846bf58d76921ea96edc2fcf Mon Sep 17 00:00:00 2001 From: He Zhe Date: Thu, 24 Oct 2019 15:49:49 +0800 Subject: cgl: Remove non-existing kernel options Thess options have been remove from mainline kernel. CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION removed by 4c145dce2601 ("xfrm: make xfrm modes builtin") CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE removed by be6ec88f41ba ("selinux: Remove SECURITY_SELINUX_BOOTPARAM_VALUE") Signed-off-by: He Zhe Signed-off-by: Bruce Ashfield --- cgl/features/mip6/mip6.cfg | 1 - cgl/features/selinux/selinux-dev.cfg | 1 - 2 files changed, 2 deletions(-) diff --git a/cgl/features/mip6/mip6.cfg b/cgl/features/mip6/mip6.cfg index 8987803..4492b23 100644 --- a/cgl/features/mip6/mip6.cfg +++ b/cgl/features/mip6/mip6.cfg @@ -3,6 +3,5 @@ CONFIG_XFRM_MIGRATE=y CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y diff --git a/cgl/features/selinux/selinux-dev.cfg b/cgl/features/selinux/selinux-dev.cfg index de975d3..b9ba28f 100644 --- a/cgl/features/selinux/selinux-dev.cfg +++ b/cgl/features/selinux/selinux-dev.cfg @@ -1,3 +1,2 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM=y -CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1 CONFIG_SECURITY_SELINUX_DEVELOP=y -- cgit v1.2.3