sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Dongxiao Xu 2012-03-29 20:01:18 +08:00 committed by Richard Purdie
parent a8c0323034
commit f5fd769f5a
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bitbake/lib/bb/ui/crumbs/builder.py
View File

@ -93,7 +93,7 @@ class Configuration:
self.curr_sdk_machine = params["sdk_machine"] self.curr_sdk_machine = params["sdk_machine"]
self.conf_version = params["conf_version"] self.conf_version = params["conf_version"]
self.lconf_version = params["lconf_version"] self.lconf_version = params["lconf_version"]
self.image_fstypes = params["image_fstypes"].split() self.image_fstypes = params["image_fstypes"]
# bblayers.conf # bblayers.conf
self.layers = params["layer"].split() self.layers = params["layer"].split()
@ -115,7 +115,7 @@ class Configuration:
self.lconf_version = template.getVar("LCONF_VERSION") self.lconf_version = template.getVar("LCONF_VERSION")
self.extra_setting = eval(template.getVar("EXTRA_SETTING")) self.extra_setting = eval(template.getVar("EXTRA_SETTING"))
self.toolchain_build = eval(template.getVar("TOOLCHAIN_BUILD")) self.toolchain_build = eval(template.getVar("TOOLCHAIN_BUILD"))
self.image_fstypes = template.getVar("IMAGE_FSTYPES").split() self.image_fstypes = template.getVar("IMAGE_FSTYPES")
# bblayers.conf # bblayers.conf
self.layers = template.getVar("BBLAYERS").split() self.layers = template.getVar("BBLAYERS").split()
# image/recipes/packages # image/recipes/packages
@ -152,7 +152,7 @@ class Configuration:
template.setVar("LCONF_VERSION", self.lconf_version) template.setVar("LCONF_VERSION", self.lconf_version)
template.setVar("EXTRA_SETTING", self.extra_setting) template.setVar("EXTRA_SETTING", self.extra_setting)
template.setVar("TOOLCHAIN_BUILD", self.toolchain_build) template.setVar("TOOLCHAIN_BUILD", self.toolchain_build)
template.setVar("IMAGE_FSTYPES", " ".join(self.image_fstypes).lstrip(" ")) template.setVar("IMAGE_FSTYPES", self.image_fstypes)
# image/recipes/packages # image/recipes/packages
self.selected_image = filename self.selected_image = filename
template.setVar("__SELECTED_IMAGE__", self.selected_image) template.setVar("__SELECTED_IMAGE__", self.selected_image)

7
bitbake/lib/bb/ui/crumbs/hig.py
View File

@ -384,7 +384,7 @@ class AdvancedSettingDialog (CrumbsDialog):
self.image_types_checkbuttons[image_type] = gtk.CheckButton(image_type) self.image_types_checkbuttons[image_type] = gtk.CheckButton(image_type)
self.image_types_checkbuttons[image_type].set_tooltip_text("Build an %s image" % image_type) self.image_types_checkbuttons[image_type].set_tooltip_text("Build an %s image" % image_type)
table.attach(self.image_types_checkbuttons[image_type], j, j + 4, i, i + 1) table.attach(self.image_types_checkbuttons[image_type], j, j + 4, i, i + 1)
if image_type in self.configuration.image_fstypes: if image_type in self.configuration.image_fstypes.split():
self.image_types_checkbuttons[image_type].set_active(True) self.image_types_checkbuttons[image_type].set_active(True)
i += 1 i += 1
if i > rows: if i > rows:
@ -608,10 +608,11 @@ class AdvancedSettingDialog (CrumbsDialog):
self.configuration.image_rootfs_size = self.rootfs_size_spinner.get_value_as_int() * 1024 self.configuration.image_rootfs_size = self.rootfs_size_spinner.get_value_as_int() * 1024
self.configuration.image_extra_size = self.extra_size_spinner.get_value_as_int() * 1024 self.configuration.image_extra_size = self.extra_size_spinner.get_value_as_int() * 1024
self.configuration.image_fstypes = [] self.configuration.image_fstypes = ""
for image_type in self.image_types: for image_type in self.image_types:
if self.image_types_checkbuttons[image_type].get_active(): if self.image_types_checkbuttons[image_type].get_active():
self.configuration.image_fstypes.append(image_type) self.configuration.image_fstypes += (" " + image_type)
self.configuration.image_fstypes.strip()
self.variables["IMAGE_FSTYPES"] = self.configuration.image_fstypes self.variables["IMAGE_FSTYPES"] = self.configuration.image_fstypes
if self.gplv3_checkbox.get_active(): if self.gplv3_checkbox.get_active():

2
bitbake/lib/bb/ui/crumbs/hobeventhandler.py
View File

@ -262,7 +262,7 @@ class HobHandler(gobject.GObject):
self.server.runCommand(["setVariable", "SDKMACHINE", sdk_machine]) self.server.runCommand(["setVariable", "SDKMACHINE", sdk_machine])
def set_image_fstypes(self, image_fstypes): def set_image_fstypes(self, image_fstypes):
self.server.runCommand(["setVariable", "IMAGE_FSTYPES", " ".join(image_fstypes).lstrip(" ")]) self.server.runCommand(["setVariable", "IMAGE_FSTYPES", image_fstypes])
def set_distro(self, distro): def set_distro(self, distro):
if distro != "defaultsetup": if distro != "defaultsetup":