diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-10 13:36:14 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-11 06:56:01 +0000 |
commit | 2c545a19ce971c359ba7bbe28b675f4c9797a623 (patch) | |
tree | fd9a37cd6bd491deb128eed340806fa62be8f82e /bitbake/lib/toaster/orm | |
parent | 9a179022016de3bb02a176bf502fa26b0b08a900 (diff) | |
download | poky-2c545a19ce971c359ba7bbe28b675f4c9797a623.tar.gz |
bitbake: toaster: Fix IMAGE_INSTALL issues with _append vs :append
After the override syntax change, toaster isn't working correctly. This
is because it uses IMAGE_INSTALL_append instead of IMAGE_INSTALL:append.
This tweaks the code accordingly to fix this.
I have a suspicion that exiting toaster databases may struggle with
the change and there are some migration steps missing for the whole
overrides syntax change step.
(Bitbake rev: befc93c3e03a9b1a2b630cd5badcda756fe6cd28)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/orm')
-rw-r--r-- | bitbake/lib/toaster/orm/fixtures/settings.xml | 2 | ||||
-rw-r--r-- | bitbake/lib/toaster/orm/models.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/orm/fixtures/settings.xml b/bitbake/lib/toaster/orm/fixtures/settings.xml index 78c0fdca7f..ab3ea021f5 100644 --- a/bitbake/lib/toaster/orm/fixtures/settings.xml +++ b/bitbake/lib/toaster/orm/fixtures/settings.xml | |||
@@ -19,7 +19,7 @@ | |||
19 | <field type="CharField" name="value">${TOPDIR}/../sstate-cache</field> | 19 | <field type="CharField" name="value">${TOPDIR}/../sstate-cache</field> |
20 | </object> | 20 | </object> |
21 | <object model="orm.toastersetting" pk="6"> | 21 | <object model="orm.toastersetting" pk="6"> |
22 | <field type="CharField" name="name">DEFCONF_IMAGE_INSTALL_append</field> | 22 | <field type="CharField" name="name">DEFCONF_IMAGE_INSTALL:append</field> |
23 | <field type="CharField" name="value"></field> | 23 | <field type="CharField" name="value"></field> |
24 | </object> | 24 | </object> |
25 | <object model="orm.toastersetting" pk="7"> | 25 | <object model="orm.toastersetting" pk="7"> |
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index 4c94b407d7..6d772367d8 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py | |||
@@ -1717,7 +1717,7 @@ class CustomImageRecipe(Recipe): | |||
1717 | 1717 | ||
1718 | def generate_recipe_file_contents(self): | 1718 | def generate_recipe_file_contents(self): |
1719 | """Generate the contents for the recipe file.""" | 1719 | """Generate the contents for the recipe file.""" |
1720 | # If we have no excluded packages we only need to _append | 1720 | # If we have no excluded packages we only need to :append |
1721 | if self.excludes_set.count() == 0: | 1721 | if self.excludes_set.count() == 0: |
1722 | packages_conf = "IMAGE_INSTALL:append = \" " | 1722 | packages_conf = "IMAGE_INSTALL:append = \" " |
1723 | 1723 | ||