summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2016-02-05 12:37:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-10 13:29:22 +0000
commit749f5a6f1fd0ad934d9812d7e73e00cb4748eef3 (patch)
tree676118e8e2c32ae32d45904ab62be53524f0cc95
parent626941104fd31d4d9d7755d78a8f96989b43d298 (diff)
downloadpoky-749f5a6f1fd0ad934d9812d7e73e00cb4748eef3.tar.gz
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>
-rw-r--r--bitbake/lib/toaster/orm/models.py11
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):
1518 else: 1518 else:
1519 packages_conf = "IMAGE_FEATURES =\"\"\nIMAGE_INSTALL = \"" 1519 packages_conf = "IMAGE_FEATURES =\"\"\nIMAGE_INSTALL = \""
1520 # We add all the known packages to be built by this recipe apart 1520 # We add all the known packages to be built by this recipe apart
1521 # from the packagegroups, which would bring the excluded package 1521 # from locale packages which are are controlled with IMAGE_LINGUAS.
1522 # back in and locale packages which are dynamic packages which 1522 for pkg in self.get_all_packages().exclude(
1523 # bitbake will not know about. 1523 name__icontains="locale"):
1524 for pkg in \
1525 self.includes_set.exclude(
1526 Q(pk__in=self.excludes_set.values_list('pk', flat=True)) |
1527 Q(name__icontains="packagegroup") |
1528 Q(name__icontains="locale")):
1529 packages_conf += pkg.name+' ' 1524 packages_conf += pkg.name+' '
1530 1525
1531 packages_conf += "\"" 1526 packages_conf += "\""