From 17d86c3c14302577d971713fd998b9c1c795aaf9 Mon Sep 17 00:00:00 2001 From: Archana Shinde Date: Mon, 10 Feb 2020 12:09:51 -0800 Subject: [PATCH 1/2] kernel: Always apply whitelist The whitelist contains options that we dont really care. Always apply it, irrespective of if we are using an experimental kernel. Signed-off-by: Archana Shinde --- kernel/build-kernel.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/build-kernel.sh b/kernel/build-kernel.sh index 4f36dc96..6718d620 100755 --- a/kernel/build-kernel.sh +++ b/kernel/build-kernel.sh @@ -201,10 +201,8 @@ get_kernel_frag_path() { results=$( ${cmdpath} -r -n ${all_configs} ) # Only consider results highlighting "not in final" results=$(grep "${not_in_string}" <<< "$results") - # Do not care about options that are in whitelist if using experimental kernel - if [[ ${experimental_kernel} == "true" ]]; then - results=$(grep -v -f ${default_config_whitelist} <<< "$results") - fi + # Do not care about options that are in whitelist + results=$(grep -v -f ${default_config_whitelist} <<< "$results") # Did we request any entries that did not make it? local missing=$(echo $results | grep -v -q "${not_in_string}"; echo $?) From b66fb4389f8f85cb977bc310a0f57ad9bd950df9 Mon Sep 17 00:00:00 2001 From: Archana Shinde Date: Mon, 10 Feb 2020 12:11:27 -0800 Subject: [PATCH 2/2] kernel: Remove CONFIG_INET6 options from fragments Dont think these are options are required at all. Remove them from fragments and whitelist. Fixes #924 Signed-off-by: Archana Shinde --- kernel/configs/fragments/common/network.conf | 5 ----- kernel/configs/fragments/whitelist.conf | 3 --- kernel/kata_config_version | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/kernel/configs/fragments/common/network.conf b/kernel/configs/fragments/common/network.conf index dd1c119b..b8d49ae7 100644 --- a/kernel/configs/fragments/common/network.conf +++ b/kernel/configs/fragments/common/network.conf @@ -36,11 +36,6 @@ CONFIG_DEFAULT_BBR=y CONFIG_TCP_MD5SIG=y CONFIG_IPV6=y CONFIG_IPV6_MULTIPLE_TABLES=y -# Once we move to 5.4, INET6_XFRM_MODE_* are not needed. I don't think these are actually needed, but -# for now we just place them in whitelist.conf: -CONFIG_INET6_XFRM_MODE_TRANSPORT=y -CONFIG_INET6_XFRM_MODE_TUNNEL=y -CONFIG_INET6_XFRM_MODE_BEET=y CONFIG_STP=y CONFIG_BRIDGE=y diff --git a/kernel/configs/fragments/whitelist.conf b/kernel/configs/fragments/whitelist.conf index 0c0e706b..ea8845eb 100644 --- a/kernel/configs/fragments/whitelist.conf +++ b/kernel/configs/fragments/whitelist.conf @@ -1,8 +1,5 @@ # configuration options which may dropped in newer kernels # without generating an error in fragment merging -CONFIG_INET6_XFRM_MODE_BEET -CONFIG_INET6_XFRM_MODE_TRANSPORT -CONFIG_INET6_XFRM_MODE_TUNNEL CONFIG_NF_NAT_IPV4 CONFIG_NF_NAT_NEEDED CONFIG_NF_NAT_PROTO_DCCP diff --git a/kernel/kata_config_version b/kernel/kata_config_version index 900731ff..1479e19b 100644 --- a/kernel/kata_config_version +++ b/kernel/kata_config_version @@ -1 +1 @@ -64 +65