bitbake: toaster: orm generate_recipe_content only exclude locale packages

Allow package groups in our custom image recipe. Excluding them creates
more undefined behaviour than including them at this stage. Also update
to use convenience method for returning all packages.

(Bitbake rev: 8c2e8a13badacb816c4b1178b6661600008b38af)

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 3 insertions, 8 deletions

diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 5e715e302f..183cc3218c 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -1518,14 +1518,9 @@ class CustomImageRecipe(Recipe):
         else:
             packages_conf = "IMAGE_FEATURES =\"\"\nIMAGE_INSTALL = \""
             # We add all the known packages to be built by this recipe apart
-            # from the packagegroups, which would bring the excluded package
-            # back in and locale packages which are dynamic packages which
-            # bitbake will not know about.
-            for pkg in \
-                    self.includes_set.exclude(
-                    Q(pk__in=self.excludes_set.values_list('pk', flat=True)) |
-                    Q(name__icontains="packagegroup") |
-                    Q(name__icontains="locale")):
+            # from locale packages which are are controlled with IMAGE_LINGUAS.
+            for pkg in self.get_all_packages().exclude(
+                name__icontains="locale"):
                 packages_conf += pkg.name+' '
 
         packages_conf += "\""