summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2013-09-03 10:28:01 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-04 14:18:49 +0100
commitf41b7a7d4d0463a0dfafe6621d01680b81798019 (patch)
tree8adf9abfca736386418564322ed2837abc4bec17 /bitbake
parente63c5775732055a32b417c01fb68711f33ff4ac3 (diff)
downloadpoky-f41b7a7d4d0463a0dfafe6621d01680b81798019.tar.gz
bitbake: hob: remove PACKAGE_INSTALL variable setting from hob
Before saving the packages for a custom images in a .bb file, the packages were saved in bitbake memory. Now all the variables are saved in conf file, so saving PACKAGE_INSTALL is not needed anymore. Moved were LINGUAS_INSTALL is set, because both conditions are for testing if a custom image is saved. [YOCTO #5101] (Bitbake rev: 8757f962b92e7668f40d2d8bd9e762b152f91f7b) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/ui/crumbs/hobeventhandler.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index 7854742d4a..d0ac6bd677 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
@@ -166,13 +166,11 @@ class HobHandler(gobject.GObject):
166 self.clear_busy() 166 self.clear_busy()
167 self.building = True 167 self.building = True
168 targets = [self.image] 168 targets = [self.image]
169 if self.package_queue:
170 self.set_var_in_file("LINGUAS_INSTALL", "", "local.conf")
171 self.set_var_in_file("PACKAGE_INSTALL", " ".join(self.package_queue), "local.conf")
172 if self.toolchain_packages: 169 if self.toolchain_packages:
173 self.set_var_in_file("TOOLCHAIN_TARGET_TASK", " ".join(self.toolchain_packages), "local.conf") 170 self.set_var_in_file("TOOLCHAIN_TARGET_TASK", " ".join(self.toolchain_packages), "local.conf")
174 targets.append(self.toolchain) 171 targets.append(self.toolchain)
175 if targets[0] == "hob-image": 172 if targets[0] == "hob-image":
173 self.set_var_in_file("LINGUAS_INSTALL", "", "local.conf")
176 hobImage = self.runCommand(["matchFile", "hob-image.bb"]) 174 hobImage = self.runCommand(["matchFile", "hob-image.bb"])
177 if self.base_image != "Start with an empty image recipe": 175 if self.base_image != "Start with an empty image recipe":
178 baseImage = self.runCommand(["matchFile", self.base_image + ".bb"]) 176 baseImage = self.runCommand(["matchFile", self.base_image + ".bb"])