From de51ac927dd626f4b9cf50a97ac69cb4f2adedcf Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 20 Dec 2021 18:52:05 +0100 Subject: [PATCH 1/2] sys-kernel/kernel-modules: Add some configs `net-libs/libnetfilter_cthelper` needs CONFIG_NF_CT_NETLINK_HELPER. CONFIG_NET_VRF was requested by a user. CONFIG_KEY_DH_OPERATIONS is useful for `sys-apps/keyutils`. Rest of the added configs are dependencies. --- .../sys-kernel/coreos-modules/files/commonconfig-5.15 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15 index 24ef5ab99e..1d19f0713c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-5.15 @@ -407,6 +407,8 @@ CONFIG_JOLIET=y CONFIG_JUMP_LABEL=y CONFIG_KALLSYMS_ALL=y CONFIG_KEXEC=y +CONFIG_KEYS=y +CONFIG_KEY_DH_OPERATIONS=y CONFIG_KPROBES=y CONFIG_KPROBE_EVENTS=y CONFIG_KRETPROBES=y @@ -476,6 +478,8 @@ CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETDEVICES=y CONFIG_NETFILTER=y CONFIG_NETFILTER_ADVANCED=y +CONFIG_NETFILTER_NETLINK_GLUE_CT=y +CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_XTABLES=y CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m CONFIG_NETFILTER_XT_MATCH_BPF=m @@ -629,6 +633,7 @@ CONFIG_NET_VENDOR_NATSEMI=y # CONFIG_NET_VENDOR_TI is not set CONFIG_NET_VENDOR_VIA=y # CONFIG_NET_VENDOR_WIZNET is not set +CONFIG_NET_VRF=y CONFIG_NEW_LEDS=y CONFIG_NFSD=m CONFIG_NFSD_V3_ACL=y @@ -681,6 +686,7 @@ CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y CONFIG_NF_CONNTRACK_ZONES=y CONFIG_NF_CT_NETLINK=m +CONFIG_NF_CT_NETLINK_HELPER=m CONFIG_NF_CT_NETLINK_TIMEOUT=m CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_LOG_ARP=m From 8e14045ef609839ff4da7842a30517e87c9a9a25 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 22 Dec 2021 17:31:29 +0100 Subject: [PATCH 2/2] changelog: Add changes entry --- .../changelog/changes/2021-12-22-kernel-config-update.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/changes/2021-12-22-kernel-config-update.md diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/changes/2021-12-22-kernel-config-update.md b/sdk_container/src/third_party/coreos-overlay/changelog/changes/2021-12-22-kernel-config-update.md new file mode 100644 index 0000000000..21bc895753 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/changes/2021-12-22-kernel-config-update.md @@ -0,0 +1 @@ +- Added CONFIG_NF_CT_NETLINK_HELPER (for libnetfilter_cthelper), CONFIG_NET_VRF (for virtual routing and forwarding) and CONFIG_KEY_DH_OPERATIONS (for keyutils) to the kernel config ([PR#1524](https://github.com/flatcar-linux/coreos-overlay/pull/1524))