From: Joshua Watt Date: Fri, 20 Dec 2024 20:41:44 +0000 (-0700) Subject: lib/configfragments: Restrict fragment file checking X-Git-Tag: yocto-5.2~837 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93edab0e2bccacb808421f0766d587c576c1a12b;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Joshua Watt Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- diff --git a/meta/lib/bbconfigbuild/configfragments.py b/meta/lib/bbconfigbuild/configfragments.py index 30cc5ece079..a0c38833990 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)