summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliot Smith <elliot.smith@intel.com>2016-01-20 13:06:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-10 13:29:20 +0000
commita757d397dbc39ca479321263bafcc129451f21f1 (patch)
treed7fd5b03e671e1fa1475fdb10950d8f7097c986d
parentbaac4589ae20b425f9afce1488cbd0d54bb36421 (diff)
downloadpoky-a757d397dbc39ca479321263bafcc129451f21f1.tar.gz
bitbake: toaster: include locale and packagegroup packages in custom image
The custom image editing page doesn't show locale and packagegroup packages: they are filtered out of the queryset used to populate the ToasterTable. Rather than filtering these packages out, include them in the list of packages which are shown. (Bitbake rev: 38a753e7b2e9ede326856b830b25e13bdd6d0d9b) Signed-off-by: Elliot Smith <elliot.smith@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/toastergui/tables.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py
index 2903a81696..b73f459b2c 100644
--- a/bitbake/lib/toaster/toastergui/tables.py
+++ b/bitbake/lib/toaster/toastergui/tables.py
@@ -738,15 +738,10 @@ class SelectPackagesTable(PackagesTable):
738 738
739 current_recipes = prj.get_available_recipes() 739 current_recipes = prj.get_available_recipes()
740 740
741 # Exclude ghost packages and ones which have locale in the name 741 # only show packages where recipes->layers are in the project
742 # This is a work around locale packages being dynamically created
743 # and therefore not recognised as packages by bitbake.
744 # We also only show packages which recipes->layers are in the project
745 self.queryset = CustomImagePackage.objects.filter( 742 self.queryset = CustomImagePackage.objects.filter(
746 ~Q(recipe=None) & 743 ~Q(recipe=None) &
747 Q(recipe__in=current_recipes) & 744 Q(recipe__in=current_recipes))
748 ~Q(name__icontains="locale") &
749 ~Q(name__icontains="packagegroup"))
750 745
751 self.queryset = self.queryset.order_by('name') 746 self.queryset = self.queryset.order_by('name')
752 747