From c25486a365370dd32e26fbf01cced7ec5f3106cc Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 10 Feb 2026 15:23:53 +0000 Subject: kernel: consolidate kernel configuration options Move from the meta-virt hosted fragments to common fragments that are in the kernel-cache. Signed-off-by: Bruce Ashfield --- recipes-kernel/linux/files/9p.cfg | 5 ----- recipes-kernel/linux/files/squashfs.cfg | 5 ----- recipes-kernel/linux/linux-yocto/extra-configs.cfg | 9 --------- recipes-kernel/linux/linux-yocto_%.bbappend | 13 ------------- recipes-kernel/linux/linux-yocto_virtualization.inc | 3 +++ recipes-kernel/linux/yocto-cfg-fragments-6.18.bb | 2 +- 6 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 recipes-kernel/linux/files/9p.cfg delete mode 100644 recipes-kernel/linux/files/squashfs.cfg delete mode 100644 recipes-kernel/linux/linux-yocto_%.bbappend (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux/files/9p.cfg b/recipes-kernel/linux/files/9p.cfg deleted file mode 100644 index bd5a74f1..00000000 --- a/recipes-kernel/linux/files/9p.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# 9P filesystem support for virtio-9p file sharing -CONFIG_NET_9P=y -CONFIG_NET_9P_VIRTIO=y -CONFIG_9P_FS=y -CONFIG_9P_FS_POSIX_ACL=y diff --git a/recipes-kernel/linux/files/squashfs.cfg b/recipes-kernel/linux/files/squashfs.cfg deleted file mode 100644 index f67fadcd..00000000 --- a/recipes-kernel/linux/files/squashfs.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# Squashfs and overlayfs support for vdkr/vpdmn rootfs images -CONFIG_SQUASHFS=y -CONFIG_SQUASHFS_XZ=y -CONFIG_SQUASHFS_ZSTD=y -CONFIG_OVERLAY_FS=y diff --git a/recipes-kernel/linux/linux-yocto/extra-configs.cfg b/recipes-kernel/linux/linux-yocto/extra-configs.cfg index 26f8b0c6..222b1e1b 100644 --- a/recipes-kernel/linux/linux-yocto/extra-configs.cfg +++ b/recipes-kernel/linux/linux-yocto/extra-configs.cfg @@ -1,10 +1 @@ # placeholder config fragment for local enable and debug - -# Kernel 6.18+ split iptables into legacy/nftables backends -# Docker uses legacy iptables, so we need the full dependency chain: -# NETFILTER_XTABLES_LEGACY -> IP_NF_IPTABLES_LEGACY -> IP_NF_FILTER/NAT -CONFIG_NETFILTER_XTABLES_LEGACY=y -CONFIG_IP_NF_IPTABLES_LEGACY=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_NAT=m -CONFIG_IP_NF_TARGET_MASQUERADE=m \ No newline at end of file diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend deleted file mode 100644 index b6af23a7..00000000 --- a/recipes-kernel/linux/linux-yocto_%.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) 2025 Bruce Ashfield -# -# SPDX-License-Identifier: MIT -# -# Kernel config fragments for vdkr/vpdmn: -# - 9P filesystem for virtio-9p file sharing (volume mounts) -# - Squashfs and overlayfs for rootfs images -# -# Only applied when "vcontainer" is in DISTRO_FEATURES. - -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'vcontainer', 'file://9p.cfg file://squashfs.cfg', '', d)}" diff --git a/recipes-kernel/linux/linux-yocto_virtualization.inc b/recipes-kernel/linux/linux-yocto_virtualization.inc index bc2f4040..d67210c4 100644 --- a/recipes-kernel/linux/linux-yocto_virtualization.inc +++ b/recipes-kernel/linux/linux-yocto_virtualization.inc @@ -79,3 +79,6 @@ KERNEL_FEATURES:append = "${@distro_cond_feature('cfg/kubernetes.scc', 'k3s', d # selinux KERNEL_FEATURES:append = "${@distro_cond_feature('cgl/features/selinux/selinux.cfg', 'selinux', d )}" + +# vcontainer +KERNEL_FEATURES:append = "${@distro_cond_feature('cfg/container.scc', 'vcontainer', d)}" diff --git a/recipes-kernel/linux/yocto-cfg-fragments-6.18.bb b/recipes-kernel/linux/yocto-cfg-fragments-6.18.bb index fbe2f11a..e54c1139 100644 --- a/recipes-kernel/linux/yocto-cfg-fragments-6.18.bb +++ b/recipes-kernel/linux/yocto-cfg-fragments-6.18.bb @@ -15,7 +15,7 @@ INHIBIT_DEFAULT_DEPS = "1" LINUX_VERSION ?= "6.18" PV = "v${LINUX_VERSION}+git${SRCREV}" -SRCREV = "ebcec46ecca9c422a95635aab45ebeef36a4dbae" +SRCREV = "6ab6280418f524cda3e9f30ca0ac4367c58abdcf" SRC_URI = "\ git://git.yoctoproject.org/yocto-kernel-cache;branch=yocto-${LINUX_VERSION} \ " -- cgit v1.2.3-54-g00ecf