diff options
| author |   David Reyna <David.Reyna@windriver.com> | 2017-08-20 18:01:48 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-22 19:49:31 +0100 |
| commit | bcd68fd7231f166baff875fb88e4f9ce0d9bf91d (patch) | |
| tree | 441c05133d617aff0376fa0723b9065da29efc0b /lib/toaster/orm/models.py | |
| parent | bbcce58e824b2793abf50efa52db158ae16e23e4 (diff) | |
| download | bitbake-contrib-bcd68fd7231f166baff875fb88e4f9ce0d9bf91d.tar.gz | |
toaster: custom image updates and original creation
When Toaster removes a package from a custom image, it must
also always remove the advised reverse-dependent recipes.
Similarly, when adding a package it must always add its advised
the packages it depends on. This code must be un-indented so
that it applies to all respective added or removed packages.
Toaster normally waits until a new custom image is built before
creating the custom layer and the recipe. However, an intermediate
different build can fail because the recipe has already been added
to the project, so the image's default recipe must be created
when the image is created.
[YOCTO #11915]
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/toaster/orm/models.py')
| -rw-r--r-- | lib/toaster/orm/models.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py index 7aaebedc2..3a7dff8ca 100644 --- a/lib/toaster/orm/models.py +++ b/lib/toaster/orm/models.py @@ -1658,7 +1658,7 @@ class CustomImageRecipe(Recipe): def get_base_recipe_file(self): """Get the base recipe file path if it exists on the file system""" - path_schema_one = "%s/%s" % (self.base_recipe.layer_version.dirpath, + path_schema_one = "%s/%s" % (self.base_recipe.layer_version.local_path, self.base_recipe.file_path) path_schema_two = self.base_recipe.file_path |