From 9054345fb8d20bd7859a936ef96fd16c17bf1caa Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Fri, 20 Dec 2024 13:41:44 -0700 Subject: [PATCH] lib/configfragments: Restrict fragment file checking The current implementation of the config fragments is too aggressive in checking files; any file in the fragment directory is checked, including hidden files or files with weird extensions. In particular, if an editor is creating temporary backup files when editing, these will be checked and will almost assuredly fail, which prevents the tool from running. Add a filter so that only non-hidden files that end with .conf are checked. (From OE-Core rev: 93edab0e2bccacb808421f0766d587c576c1a12b) Signed-off-by: Joshua Watt Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/lib/bbconfigbuild/configfragments.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/lib/bbconfigbuild/configfragments.py b/meta/lib/bbconfigbuild/configfragments.py index 30cc5ece07..a0c3883399 100644 --- a/meta/lib/bbconfigbuild/configfragments.py +++ b/meta/lib/bbconfigbuild/configfragments.py @@ -43,6 +43,8 @@ class ConfigFragmentsPlugin(LayerPlugin): for topdir, dirs, files in os.walk(os.path.join(layerdir, fragments_path_prefix)): fragmentdir = os.path.relpath(topdir, os.path.join(layerdir, fragments_path_prefix)) for fragmentfile in sorted(files): + if fragmentfile.startswith(".") or not fragmentfile.endswith(".conf"): + continue fragmentname = os.path.normpath("/".join((layername, fragmentdir, fragmentfile.split('.')[0]))) fragmentpath = os.path.join(topdir, fragmentfile) fragmentsummary, fragmentdesc = self.get_fragment_info(fragmentpath, fragmentname)