From 87f854dd0975cbfac6d046273bd470fec5996d12 Mon Sep 17 00:00:00 2001 From: Adam Johnston Date: Tue, 20 Feb 2024 11:44:44 +0000 Subject: [PATCH] bsp: Replace CONFIG_AUTOFS4_FS to fix config warning on Corstone-1000 CONFIG_AUTOFS4_FS is deprecated and should be replaced by CONFIG_AUTOFS_FS. In theory, this is only required for K3s, and K3s is not supported on Corstone-1000. However, in their current form, the kernel settings are not split split between K3s and docker. Update the setting to resolve the warning in the short term. In the long term this should be refactored so docker and K3s settings can be specified separately - but that is not a priority now. Changelog: other Signed-off-by: Adam Johnston --- .../recipes-kernel/linux/linux-yocto/corstone1000/extfs.cfg | 2 +- qa-checks/cassini-bsp-dictionary | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto/corstone1000/extfs.cfg b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto/corstone1000/extfs.cfg index 9dade58..288a485 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto/corstone1000/extfs.cfg +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto/corstone1000/extfs.cfg @@ -5,4 +5,4 @@ CONFIG_EXT4_FS=y # CONFIG_EXT4_FS_POSIX_ACL is not set # CONFIG_EXT4_FS_SECURITY is not set # CONFIG_EXT4_DEBUG is not set -CONFIG_AUTOFS4_FS=y +CONFIG_AUTOFS_FS=y diff --git a/qa-checks/cassini-bsp-dictionary b/qa-checks/cassini-bsp-dictionary index a2264dd..ddc5690 100644 --- a/qa-checks/cassini-bsp-dictionary +++ b/qa-checks/cassini-bsp-dictionary @@ -3,6 +3,8 @@ # # SPDX-License-Identifier: MIT alsa +AUTOFS +AUTOFS4 backend bmap bmaptool @@ -13,6 +15,8 @@ BUILDIN cassini cgroups config +CONFIG_AUTOFS_FS +CONFIG_AUTOFS4_FS configfile corstone cpio -- GitLab