diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-30 13:47:00 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | 2d7cf6c056691b6de81bdbb029225d7e0e16f37b (patch) | |
tree | 3c3c0abaa8c1e40946b445de659d4fd339d335de /bitbake/lib/toaster | |
parent | 2abf8a699edd513405befbd1a0eafc8f55d6b514 (diff) | |
download | poky-2d7cf6c056691b6de81bdbb029225d7e0e16f37b.tar.gz |
bitbake: doc/lib: Update to use new override syntax containing colons
This runs the overrides conversion script in OE-Core over the bitbake code
base including the docs. A handful of things were excluded in toaster
and for the Changelog file.
(Bitbake rev: 47f8d3b24fd52381bf3b41e2f55a53e57841344c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster')
-rw-r--r-- | bitbake/lib/toaster/orm/models.py | 2 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/views.py | 6 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastermain/management/commands/buildimport.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index 7f7e922ade..4c94b407d7 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py | |||
@@ -1719,7 +1719,7 @@ class CustomImageRecipe(Recipe): | |||
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 | ||
1724 | for pkg in self.appends_set.all(): | 1724 | for pkg in self.appends_set.all(): |
1725 | packages_conf += pkg.name+' ' | 1725 | packages_conf += pkg.name+' ' |
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 9a5e48e3bb..04ab8bcb04 100644 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -1708,7 +1708,7 @@ if True: | |||
1708 | except ProjectVariable.DoesNotExist: | 1708 | except ProjectVariable.DoesNotExist: |
1709 | pass | 1709 | pass |
1710 | try: | 1710 | try: |
1711 | return_data['image_install_append'] = ProjectVariable.objects.get(project = prj, name = "IMAGE_INSTALL_append").value, | 1711 | return_data['image_install:append'] = ProjectVariable.objects.get(project = prj, name = "IMAGE_INSTALL:append").value, |
1712 | except ProjectVariable.DoesNotExist: | 1712 | except ProjectVariable.DoesNotExist: |
1713 | pass | 1713 | pass |
1714 | try: | 1714 | try: |
@@ -1839,8 +1839,8 @@ if True: | |||
1839 | except ProjectVariable.DoesNotExist: | 1839 | except ProjectVariable.DoesNotExist: |
1840 | pass | 1840 | pass |
1841 | try: | 1841 | try: |
1842 | context['image_install_append'] = ProjectVariable.objects.get(project = prj, name = "IMAGE_INSTALL_append").value | 1842 | context['image_install:append'] = ProjectVariable.objects.get(project = prj, name = "IMAGE_INSTALL:append").value |
1843 | context['image_install_append_defined'] = "1" | 1843 | context['image_install:append_defined'] = "1" |
1844 | except ProjectVariable.DoesNotExist: | 1844 | except ProjectVariable.DoesNotExist: |
1845 | pass | 1845 | pass |
1846 | try: | 1846 | try: |
diff --git a/bitbake/lib/toaster/toastermain/management/commands/buildimport.py b/bitbake/lib/toaster/toastermain/management/commands/buildimport.py index 59da6ff7ac..e25b55e5ab 100644 --- a/bitbake/lib/toaster/toastermain/management/commands/buildimport.py +++ b/bitbake/lib/toaster/toastermain/management/commands/buildimport.py | |||
@@ -451,7 +451,7 @@ class Command(BaseCommand): | |||
451 | # Catch vars relevant to Toaster (in case no Toaster section) | 451 | # Catch vars relevant to Toaster (in case no Toaster section) |
452 | self.update_project_vars(project,'DISTRO') | 452 | self.update_project_vars(project,'DISTRO') |
453 | self.update_project_vars(project,'MACHINE') | 453 | self.update_project_vars(project,'MACHINE') |
454 | self.update_project_vars(project,'IMAGE_INSTALL_append') | 454 | self.update_project_vars(project,'IMAGE_INSTALL:append') |
455 | self.update_project_vars(project,'IMAGE_FSTYPES') | 455 | self.update_project_vars(project,'IMAGE_FSTYPES') |
456 | self.update_project_vars(project,'PACKAGE_CLASSES') | 456 | self.update_project_vars(project,'PACKAGE_CLASSES') |
457 | # These vars are typically only assigned by Toaster | 457 | # These vars are typically only assigned by Toaster |