From 158575c73860c293dae49a5c38d3211c567a83d1 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Fri, 1 Apr 2016 12:57:58 +0100 Subject: bitbake: toaster: orm better detect requires during CustomImageRecipe generation We were doing a string search for the literal string "require" and assuming that a match meant the recipe uses the require keyword to include the contents of another recipe. This test isn't very smart (it should at least have matched on "require ") and triggers on the word require anywhere in the recipe, i.e. the word "required" in the DESCRIPTION of core-image-lsb.bb, and then breaks as the much smarter regex fails to match anything. Instead always run the regex search and only try to update the require entry when the regex matches. (Bitbake rev: a6add0e95d3d1e9a6a9fcabd73543bc5c278915f) Signed-off-by: Joshua Lock Signed-off-by: Elliot Smith Signed-off-by: Richard Purdie --- bitbake/lib/toaster/orm/models.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/toaster/orm') diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index 08b1a7ca0d..d3277efb1f 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py @@ -1548,11 +1548,10 @@ class CustomImageRecipe(Recipe): # "require core-image-minimal.bb" is changed to: # "require recipes-core/images/core-image-minimal.bb" - if "require" in base_recipe: - req_search = re.search(r'(require\s+)(.+\.bb\s*$)', + req_search = re.search(r'(require\s+)(.+\.bb\s*$)', base_recipe, re.MULTILINE) - + if req_search: require_filename = req_search.group(2).strip() corrected_location = Recipe.objects.filter( -- cgit v1.2.3-54-g00ecf