diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 8427623b37..9c2dd167cb 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py @@ -68,6 +68,8 @@ class Configuration: self.selected_recipes = [] self.selected_packages = [] + self.user_selected_packages = [] + # proxy settings self.all_proxy = params["all_proxy"] self.http_proxy = params["http_proxy"] @@ -157,7 +159,7 @@ class Configuration: self.selected_image = filename template.setVar("__SELECTED_IMAGE__", self.selected_image) template.setVar("DEPENDS", self.selected_recipes) - template.setVar("IMAGE_INSTALL", self.selected_packages) + template.setVar("IMAGE_INSTALL", self.user_selected_packages) # proxy template.setVar("all_proxy", self.all_proxy) template.setVar("http_proxy", self.http_proxy) diff --git a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py index d4cae43892..52abf00eb0 100644 --- a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py +++ b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py @@ -342,6 +342,23 @@ class PackageListModel(gtk.TreeStore): self.selection_change_notification() return left + def get_user_selected_packages(self): + packagelist = [] + + it = self.get_iter_first() + while it: + child_it = self.iter_children(it) + while child_it: + if self.get_value(child_it, self.COL_INC): + binb = self.get_value(child_it, self.COL_BINB) + if not binb or binb == "User Selected": + name = self.get_value(child_it, self.COL_NAME) + packagelist.append(name) + child_it = self.iter_next(child_it) + it = self.iter_next(it) + + return packagelist + def get_selected_packages(self): packagelist = [] diff --git a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py index d855e58aea..9a847c0f83 100755 --- a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py +++ b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py @@ -160,6 +160,7 @@ class PackageSelectionPage (HobPage): self._expand_all() self.builder.configuration.selected_packages = self.package_model.get_selected_packages() + self.builder.configuration.user_selected_packages = self.package_model.get_user_selected_packages() selected_packages_num = len(self.builder.configuration.selected_packages) selected_packages_size = float(self.package_model.get_packages_size()) selected_packages_size_str = self._size_to_string(selected_packages_size)