[bitbake-devel] [PatchV3] hob/bitbake: custom image is now using the base image
Cristiana Voicu
cristiana.voicu at intel.com
Wed Dec 12 11:51:51 UTC 2012
Till now, a custom image made in Hob was using only the packages from
the base image. Now it is using everything declared in the base image.
Also next to hob-image.bb, it creates another .bb file which is used
in building process. Those images are ignored by git.
[YOCTO #2601]
Signed-off-by: Cristiana Voicu <cristiana.voicu at intel.com>
---
.gitignore | 1 +
bitbake/lib/bb/command.py | 10 ++++++++++
bitbake/lib/bb/cooker.py | 19 +++++++++++++++++++
bitbake/lib/bb/ui/crumbs/builder.py | 6 +++++-
bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 10 +++++++++-
bitbake/lib/bb/ui/crumbs/hoblistmodel.py | 6 ++++++
6 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index 88c91f6..003f09a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ meta-*
*~
!meta-yocto
!meta-yocto-bsp
+hob-image-*.bb
diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py
index 3f28bca..28b4c5d 100644
--- a/bitbake/lib/bb/command.py
+++ b/bitbake/lib/bb/command.py
@@ -197,6 +197,16 @@ class CommandsSync:
filterfunc = params[0]
bb.parse.parse_py.ConfHandler.confFilters.append(filterfunc)
+ def matchFile(self, command, params):
+ fMatch = params[0]
+ return command.cooker.matchFile(fMatch)
+
+ def generateNewImage(self, command, params):
+ image = params[0]
+ base_image = params[1]
+ package_queue = params[2]
+ return command.cooker.generateNewImage(image, base_image, package_queue)
+
class CommandsAsync:
"""
A class of asynchronous commands
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 6b58f91..1d38164 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1188,6 +1188,25 @@ class BBCooker:
self.server_registration_cb(buildTargetsIdle, rq)
+ def generateNewImage(self, image, base_image, package_queue):
+ '''
+ Create a new image with a "require" base_image statement
+ '''
+ image_name = os.path.splitext(image)[0]
+ timestr = time.strftime("-%Y%m%d-%H%M%S")
+ dest = image_name + str(timestr) + ".bb"
+
+ with open(dest, "w") as imagefile:
+ imagefile.write("require " + base_image + "\n")
+ package_install = "PACKAGE_INSTALL_forcevariable = \""
+ for package in package_queue:
+ package_install += str(package) + " "
+ package_install += "\"\n"
+ imagefile.write(package_install)
+
+ self.state = state.initial
+ return timestr
+
def updateCache(self):
if self.state == state.running:
return
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index 2f3d6d0..023ac93 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -611,15 +611,18 @@ class Builder(gtk.Window):
# Build image
self.set_user_config()
toolchain_packages = []
+ base_image = None
if self.configuration.toolchain_build:
toolchain_packages = self.package_model.get_selected_packages_toolchain()
if self.configuration.selected_image == self.recipe_model.__custom_image__:
packages = self.package_model.get_selected_packages()
image = self.hob_image
+ base_image = self.configuration.initial_selected_image
else:
packages = []
image = self.configuration.selected_image
self.handler.generate_image(image,
+ base_image,
self.hob_toolchain,
packages,
toolchain_packages,
@@ -1017,7 +1020,8 @@ class Builder(gtk.Window):
self.parameters.image_names = []
selected_image = self.recipe_model.get_selected_image()
if selected_image == self.recipe_model.__custom_image__:
- linkname = 'hob-image-' + self.configuration.curr_mach
+ version = self.recipe_model.get_custom_image_version()
+ linkname = 'hob-image' + version+ "-" + self.configuration.curr_mach
else:
linkname = selected_image + '-' + self.configuration.curr_mach
image_extension = self.get_image_extension()
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index 8a2ac5f..ae853ee 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
@@ -166,6 +166,13 @@ class HobHandler(gobject.GObject):
if self.toolchain_packages:
self.runCommand(["setVariable", "TOOLCHAIN_TARGET_TASK", " ".join(self.toolchain_packages)])
targets.append(self.toolchain)
+ if targets[0] == "hob-image":
+ hobImage = self.runCommand(["matchFile", "hob-image.bb"])
+ baseImage = self.runCommand(["matchFile", self.base_image + ".bb"])
+ version = self.runCommand(["generateNewImage", hobImage, baseImage, self.package_queue])
+ targets[0] += version
+ self.recipe_model.set_custom_image_version(version)
+
self.runCommand(["buildTargets", targets, self.default_task])
def display_error(self):
@@ -386,8 +393,9 @@ class HobHandler(gobject.GObject):
self.commands_async.append(self.SUB_BUILD_RECIPES)
self.run_next_command(self.GENERATE_PACKAGES)
- def generate_image(self, image, toolchain, image_packages=[], toolchain_packages=[], default_task="build"):
+ def generate_image(self, image, base_image, toolchain, image_packages=[], toolchain_packages=[], default_task="build"):
self.image = image
+ self.base_image = base_image
self.toolchain = toolchain
self.package_queue = image_packages
self.toolchain_packages = toolchain_packages
diff --git a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
index f4ccbc3..85c4f51 100644
--- a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
+++ b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
@@ -766,3 +766,9 @@ class RecipeListModel(gtk.ListStore):
binb="User Selected",
image_contents=True)
self.selection_change_notification()
+
+ def set_custom_image_version(self, version):
+ self.custom_image_version = version
+
+ def get_custom_image_version(self):
+ return self.custom_image_version
--
1.7.9.5
More information about the bitbake-devel
mailing list