summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2012-03-29 20:01:18 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-29 21:25:54 +0100
commitf5fd769f5aa72089b3d10bddc6f38141e6b431c5 (patch)
tree11736cd9e8af19bf028fe6d3ca0dd92745780f60
parenta8c03230341644b1a2589f89ff40fdfb382534e8 (diff)
downloadpoky-f5fd769f5aa72089b3d10bddc6f38141e6b431c5.tar.gz
Hob: Change the format to store image_fstype variable
Use string format to store image_fstype instead of a list. (Bitbake rev: c91fe7f9d21939fd437dbd79a923499f90fc95c6) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py6
-rw-r--r--bitbake/lib/bb/ui/crumbs/hig.py7
-rw-r--r--bitbake/lib/bb/ui/crumbs/hobeventhandler.py2
3 files changed, 8 insertions, 7 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index f278b584b6..5f8e01a9b0 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -93,7 +93,7 @@ class Configuration:
93 self.curr_sdk_machine = params["sdk_machine"] 93 self.curr_sdk_machine = params["sdk_machine"]
94 self.conf_version = params["conf_version"] 94 self.conf_version = params["conf_version"]
95 self.lconf_version = params["lconf_version"] 95 self.lconf_version = params["lconf_version"]
96 self.image_fstypes = params["image_fstypes"].split() 96 self.image_fstypes = params["image_fstypes"]
97 # bblayers.conf 97 # bblayers.conf
98 self.layers = params["layer"].split() 98 self.layers = params["layer"].split()
99 99
@@ -115,7 +115,7 @@ class Configuration:
115 self.lconf_version = template.getVar("LCONF_VERSION") 115 self.lconf_version = template.getVar("LCONF_VERSION")
116 self.extra_setting = eval(template.getVar("EXTRA_SETTING")) 116 self.extra_setting = eval(template.getVar("EXTRA_SETTING"))
117 self.toolchain_build = eval(template.getVar("TOOLCHAIN_BUILD")) 117 self.toolchain_build = eval(template.getVar("TOOLCHAIN_BUILD"))
118 self.image_fstypes = template.getVar("IMAGE_FSTYPES").split() 118 self.image_fstypes = template.getVar("IMAGE_FSTYPES")
119 # bblayers.conf 119 # bblayers.conf
120 self.layers = template.getVar("BBLAYERS").split() 120 self.layers = template.getVar("BBLAYERS").split()
121 # image/recipes/packages 121 # image/recipes/packages
@@ -152,7 +152,7 @@ class Configuration:
152 template.setVar("LCONF_VERSION", self.lconf_version) 152 template.setVar("LCONF_VERSION", self.lconf_version)
153 template.setVar("EXTRA_SETTING", self.extra_setting) 153 template.setVar("EXTRA_SETTING", self.extra_setting)
154 template.setVar("TOOLCHAIN_BUILD", self.toolchain_build) 154 template.setVar("TOOLCHAIN_BUILD", self.toolchain_build)
155 template.setVar("IMAGE_FSTYPES", " ".join(self.image_fstypes).lstrip(" ")) 155 template.setVar("IMAGE_FSTYPES", self.image_fstypes)
156 # image/recipes/packages 156 # image/recipes/packages
157 self.selected_image = filename 157 self.selected_image = filename
158 template.setVar("__SELECTED_IMAGE__", self.selected_image) 158 template.setVar("__SELECTED_IMAGE__", self.selected_image)
diff --git a/bitbake/lib/bb/ui/crumbs/hig.py b/bitbake/lib/bb/ui/crumbs/hig.py
index c47751c0fa..a21c6106a4 100644
--- a/bitbake/lib/bb/ui/crumbs/hig.py
+++ b/bitbake/lib/bb/ui/crumbs/hig.py
@@ -384,7 +384,7 @@ class AdvancedSettingDialog (CrumbsDialog):
384 self.image_types_checkbuttons[image_type] = gtk.CheckButton(image_type) 384 self.image_types_checkbuttons[image_type] = gtk.CheckButton(image_type)
385 self.image_types_checkbuttons[image_type].set_tooltip_text("Build an %s image" % image_type) 385 self.image_types_checkbuttons[image_type].set_tooltip_text("Build an %s image" % image_type)
386 table.attach(self.image_types_checkbuttons[image_type], j, j + 4, i, i + 1) 386 table.attach(self.image_types_checkbuttons[image_type], j, j + 4, i, i + 1)
387 if image_type in self.configuration.image_fstypes: 387 if image_type in self.configuration.image_fstypes.split():
388 self.image_types_checkbuttons[image_type].set_active(True) 388 self.image_types_checkbuttons[image_type].set_active(True)
389 i += 1 389 i += 1
390 if i > rows: 390 if i > rows:
@@ -608,10 +608,11 @@ class AdvancedSettingDialog (CrumbsDialog):
608 self.configuration.image_rootfs_size = self.rootfs_size_spinner.get_value_as_int() * 1024 608 self.configuration.image_rootfs_size = self.rootfs_size_spinner.get_value_as_int() * 1024
609 self.configuration.image_extra_size = self.extra_size_spinner.get_value_as_int() * 1024 609 self.configuration.image_extra_size = self.extra_size_spinner.get_value_as_int() * 1024
610 610
611 self.configuration.image_fstypes = [] 611 self.configuration.image_fstypes = ""
612 for image_type in self.image_types: 612 for image_type in self.image_types:
613 if self.image_types_checkbuttons[image_type].get_active(): 613 if self.image_types_checkbuttons[image_type].get_active():
614 self.configuration.image_fstypes.append(image_type) 614 self.configuration.image_fstypes += (" " + image_type)
615 self.configuration.image_fstypes.strip()
615 self.variables["IMAGE_FSTYPES"] = self.configuration.image_fstypes 616 self.variables["IMAGE_FSTYPES"] = self.configuration.image_fstypes
616 617
617 if self.gplv3_checkbox.get_active(): 618 if self.gplv3_checkbox.get_active():
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
index 11444ad459..7d53e305dd 100644
--- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
+++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py
@@ -262,7 +262,7 @@ class HobHandler(gobject.GObject):
262 self.server.runCommand(["setVariable", "SDKMACHINE", sdk_machine]) 262 self.server.runCommand(["setVariable", "SDKMACHINE", sdk_machine])
263 263
264 def set_image_fstypes(self, image_fstypes): 264 def set_image_fstypes(self, image_fstypes):
265 self.server.runCommand(["setVariable", "IMAGE_FSTYPES", " ".join(image_fstypes).lstrip(" ")]) 265 self.server.runCommand(["setVariable", "IMAGE_FSTYPES", image_fstypes])
266 266
267 def set_distro(self, distro): 267 def set_distro(self, distro):
268 if distro != "defaultsetup": 268 if distro != "defaultsetup":