summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/command.py3
-rw-r--r--bitbake/lib/bb/cooker.py5
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py4
-rw-r--r--bitbake/lib/bb/ui/crumbs/hig/saveimagedialog.py4
-rw-r--r--bitbake/lib/bb/ui/crumbs/hobeventhandler.py6
5 files changed, 14 insertions, 8 deletions
diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py
index 1893cce71e..5eb34aff3d 100644
--- a/bitbake/lib/bb/command.py
+++ b/bitbake/lib/bb/command.py
@@ -215,8 +215,9 @@ class CommandsSync:
215 base_image = params[1] 215 base_image = params[1]
216 package_queue = params[2] 216 package_queue = params[2]
217 timestamp = params[3] 217 timestamp = params[3]
218 description = params[4]
218 return command.cooker.generateNewImage(image, base_image, 219 return command.cooker.generateNewImage(image, base_image,
219 package_queue, timestamp) 220 package_queue, timestamp, description)
220 221
221 def ensureDir(self, command, params): 222 def ensureDir(self, command, params):
222 directory = params[0] 223 directory = params[0]
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 4a5638fb60..7ca9947df8 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1100,7 +1100,7 @@ class BBCooker:
1100 1100
1101 self.configuration.server_register_idlecallback(buildTargetsIdle, rq) 1101 self.configuration.server_register_idlecallback(buildTargetsIdle, rq)
1102 1102
1103 def generateNewImage(self, image, base_image, package_queue, timestamp): 1103 def generateNewImage(self, image, base_image, package_queue, timestamp, description):
1104 ''' 1104 '''
1105 Create a new image with a "require"/"inherit" base_image statement 1105 Create a new image with a "require"/"inherit" base_image statement
1106 ''' 1106 '''
@@ -1125,6 +1125,9 @@ class BBCooker:
1125 package_install += "\"\n" 1125 package_install += "\"\n"
1126 imagefile.write(package_install) 1126 imagefile.write(package_install)
1127 1127
1128 description_var = "DESCRIPTION = \"" + description + "\"\n"
1129 imagefile.write(description_var)
1130
1128 self.state = state.initial 1131 self.state = state.initial
1129 if timestamp: 1132 if timestamp:
1130 return timestr 1133 return timestr
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index 0a04c90bc6..6bf402405d 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -593,12 +593,12 @@ class Builder(gtk.Window):
593 toolchain_packages, 593 toolchain_packages,
594 self.configuration.default_task) 594 self.configuration.default_task)
595 595
596 def generate_new_image(self, image): 596 def generate_new_image(self, image, description):
597 base_image = self.configuration.initial_selected_image 597 base_image = self.configuration.initial_selected_image
598 if base_image == self.recipe_model.__custom_image__: 598 if base_image == self.recipe_model.__custom_image__:
599 base_image = None 599 base_image = None
600 packages = self.package_model.get_selected_packages() 600 packages = self.package_model.get_selected_packages()
601 self.handler.generate_new_image(image, base_image, packages) 601 self.handler.generate_new_image(image, base_image, packages, description)
602 602
603 def ensure_dir(self, directory): 603 def ensure_dir(self, directory):
604 self.handler.ensure_dir(directory) 604 self.handler.ensure_dir(directory)
diff --git a/bitbake/lib/bb/ui/crumbs/hig/saveimagedialog.py b/bitbake/lib/bb/ui/crumbs/hig/saveimagedialog.py
index b2fa3bd5a9..b94e69f61c 100644
--- a/bitbake/lib/bb/ui/crumbs/hig/saveimagedialog.py
+++ b/bitbake/lib/bb/ui/crumbs/hig/saveimagedialog.py
@@ -116,8 +116,10 @@ class SaveImageDialog (CrumbsDialog):
116 def save_button_cb(self, button): 116 def save_button_cb(self, button):
117 text = self.name_entry.get_text() 117 text = self.name_entry.get_text()
118 new_text = text.replace("-","") 118 new_text = text.replace("-","")
119 description_buffer = self.description_entry.get_buffer()
120 description = description_buffer.get_text(description_buffer.get_start_iter(),description_buffer.get_end_iter())
119 if new_text.islower() and new_text.isalnum(): 121 if new_text.islower() and new_text.isalnum():
120 self.builder.generate_new_image(self.directory+text) 122 self.builder.generate_new_image(self.directory+text, description)
121 self.destroy() 123 self.destroy()
122 else: 124 else:
123 self.show_invalid_input_error_dialog() 125 self.show_invalid_input_error_dialog()
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index 34cd3478ed..42fd0b972b 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
@@ -176,7 +176,7 @@ class HobHandler(gobject.GObject):
176 hobImage = self.runCommand(["matchFile", "hob-image.bb"]) 176 hobImage = self.runCommand(["matchFile", "hob-image.bb"])
177 if self.base_image != "Start with an empty image recipe": 177 if self.base_image != "Start with an empty image recipe":
178 baseImage = self.runCommand(["matchFile", self.base_image + ".bb"]) 178 baseImage = self.runCommand(["matchFile", self.base_image + ".bb"])
179 version = self.runCommand(["generateNewImage", hobImage, baseImage, self.package_queue, True]) 179 version = self.runCommand(["generateNewImage", hobImage, baseImage, self.package_queue, True, ""])
180 targets[0] += version 180 targets[0] += version
181 self.recipe_model.set_custom_image_version(version) 181 self.recipe_model.set_custom_image_version(version)
182 182
@@ -426,9 +426,9 @@ class HobHandler(gobject.GObject):
426 self.commands_async.append(self.SUB_BUILD_IMAGE) 426 self.commands_async.append(self.SUB_BUILD_IMAGE)
427 self.run_next_command(self.GENERATE_IMAGE) 427 self.run_next_command(self.GENERATE_IMAGE)
428 428
429 def generate_new_image(self, image, base_image, package_queue): 429 def generate_new_image(self, image, base_image, package_queue, description):
430 base_image = self.runCommand(["matchFile", self.base_image + ".bb"]) 430 base_image = self.runCommand(["matchFile", self.base_image + ".bb"])
431 self.runCommand(["generateNewImage", image, base_image, package_queue, False]) 431 self.runCommand(["generateNewImage", image, base_image, package_queue, False, description])
432 432
433 def ensure_dir(self, directory): 433 def ensure_dir(self, directory):
434 self.runCommand(["ensureDir", directory]) 434 self.runCommand(["ensureDir", directory])