diff options
| author | Cristiana Voicu <cristiana.voicu@intel.com> | 2012-12-14 17:35:47 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-14 17:31:31 +0000 |
| commit | 958162e96b4a4f23bca94500b5f20975633dd5c6 (patch) | |
| tree | 9a8f280a3cf04362a975c8fbd4d28655b888a166 /bitbake | |
| parent | 5ce8c7fe9ebb8dca0a0b091bda9c58141da26216 (diff) | |
| download | poky-958162e96b4a4f23bca94500b5f20975633dd5c6.tar.gz | |
bitbake: hob: use base image only if it was set
As it is, when you create a new image from scratch, hob gives an error.
This is because of the patch for #2601.
(Bitbake rev: 42d9db0cc80ed45d769f843ccb51e0c194ec557b)
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.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index ae853ee3c7..e690d4c99c 100644 --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py | |||
| @@ -168,10 +168,11 @@ class HobHandler(gobject.GObject): | |||
| 168 | targets.append(self.toolchain) | 168 | targets.append(self.toolchain) |
| 169 | if targets[0] == "hob-image": | 169 | if targets[0] == "hob-image": |
| 170 | hobImage = self.runCommand(["matchFile", "hob-image.bb"]) | 170 | hobImage = self.runCommand(["matchFile", "hob-image.bb"]) |
| 171 | baseImage = self.runCommand(["matchFile", self.base_image + ".bb"]) | 171 | if self.base_image != "Create your own image": |
| 172 | version = self.runCommand(["generateNewImage", hobImage, baseImage, self.package_queue]) | 172 | baseImage = self.runCommand(["matchFile", self.base_image + ".bb"]) |
| 173 | targets[0] += version | 173 | version = self.runCommand(["generateNewImage", hobImage, baseImage, self.package_queue]) |
| 174 | self.recipe_model.set_custom_image_version(version) | 174 | targets[0] += version |
| 175 | self.recipe_model.set_custom_image_version(version) | ||
| 175 | 176 | ||
| 176 | self.runCommand(["buildTargets", targets, self.default_task]) | 177 | self.runCommand(["buildTargets", targets, self.default_task]) |
| 177 | 178 | ||