From b71fff21212356c32779b3a080653d76b377966e Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Sat, 20 Jan 2024 07:23:45 -0800 Subject: [PATCH] layerindex/recipeparse.py: extend bbclass regex Extend the bbclass regex to match classes-global and classes-recipe [YOCTO #15238] Signed-off-by: Tim Orling --- layerindex/recipeparse.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layerindex/recipeparse.py b/layerindex/recipeparse.py index 6202745..9be6c10 100644 --- a/layerindex/recipeparse.py +++ b/layerindex/recipeparse.py @@ -130,7 +130,7 @@ def setup_layer(config_data, fetchdir, layerdir, layer, layerbranch, logger): machine_conf_re = re.compile(r'conf/machine/([^/.]*).conf$') distro_conf_re = re.compile(r'conf/distro/([^/.]*).conf$') -bbclass_re = re.compile(r'classes/([^/.]*).bbclass$') +bbclass_re = re.compile(r'classes(?P-global|-recipe)?/(?P[^/.]*).bbclass$') def detect_file_type(path, subdir_start): typename = None if fnmatch.fnmatch(path, "*.bb"): @@ -149,7 +149,7 @@ def detect_file_type(path, subdir_start): res = bbclass_re.match(subpath) if res: typename = 'bbclass' - return (typename, None, res.group(1)) + return (typename, None, res.group('name')) res = distro_conf_re.match(subpath) if res: typename = 'distro'