Hob: Bug fix
Hi Richard,
This pull request fixes some bugs related with new Hob, please help to review and pull.
Thanks,
Dongxiao
The following changes since commit a17473d51f54a9dfb4eeaa5ad516c4851d5ac142:
bitbake/fetch: Fix uri_replace (2012-03-15 22:51:20 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib dxu4/hob-bugfix-bitbake
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/hob-bugfix-bitbake
Dongxiao Xu (3):
Hob: reset the selection if switch to a new base image
Hob: Fix advanced setting reparse mechanism
Hob: save CONF_VERSION and LCONF_VERSION into template
lib/bb/ui/crumbs/builder.py | 6 ++++++ lib/bb/ui/crumbs/hig.py | 2 ++ lib/bb/ui/crumbs/hobeventhandler.py | 3 +++ lib/bb/ui/crumbs/hoblistmodel.py | 1 + lib/bb/ui/crumbs/template.py | 10 +++++----- 5 files changed, 17 insertions(+), 5 deletions(-)
Signature · 1 line
1.7.4.1
PATCH 1/3 Hob: reset the selection if switch to a new base image
--- lib/bb/ui/crumbs/hoblistmodel.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
lib/bb/ui/crumbs/hoblistmodel.py +1 -0
@@ -715,6 +715,7 @@ class RecipeListModel(gtk.ListStore): def set_selected_image(self, img): if img == None: return + self.reset() path = self.find_path_for_item(img) self.include_item(item_path=path, binb="User Selected",
Signature · 1 line
1.7.4.1
PATCH 2/3 Hob: Fix advanced setting reparse mechanism
In reply to Dongxiao XuWhen judging if reparse is needed when change values in advanced setting, we need also include user's own defined variable pairs.
[YOCTO #2121]
--- lib/bb/ui/crumbs/hig.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
lib/bb/ui/crumbs/hig.py +2 -0
@@ -453,6 +453,8 @@ class AdvancedSettingDialog (CrumbsDialog): self.variables["PACKAGE_FORMAT"] = self.configuration.curr_package_format self.variables["INCOMPATIBLE_LICENSE"] = self.configuration.incompat_license self.variables["IMAGE_FSTYPES"] = self.configuration.image_fstypes + for key in self.configuration.extra_setting.keys(): + self.variables[key] = self.configuration.extra_setting[key] self.md5 = hashlib.md5(str(sorted(self.variables.items()))).hexdigest() self.settings_changed = False
Signature · 1 line
1.7.4.1
PATCH 3/3 Hob: save CONF_VERSION and LCONF_VERSION into template
In reply to Dongxiao XuTo pass the sanity check, we need to define CONF_VERSION and LCONF_VERSION in local.conf and bblayers.conf.
[YOCTO #2119]
--- lib/bb/ui/crumbs/builder.py | 6 ++++++ lib/bb/ui/crumbs/hobeventhandler.py | 3 +++ lib/bb/ui/crumbs/template.py | 10 +++++----- 3 files changed, 14 insertions(+), 5 deletions(-)
lib/bb/ui/crumbs/builder.py +6 -0
@@ -55,6 +55,8 @@ class Configuration: self.image_overhead_factor = params['image_overhead_factor'] self.incompat_license = params["incompat_license"] self.curr_sdk_machine = params["sdk_machine"] + self.conf_version = params["conf_version"] + self.lconf_version = params["lconf_version"] self.extra_setting = {} self.toolchain_build = False self.image_fstypes = params["image_fstypes"].split()
@@ -79,6 +81,8 @@ class Configuration: # image_overhead_factor is read-only. self.incompat_license = template.getVar("INCOMPATIBLE_LICENSE") self.curr_sdk_machine = template.getVar("SDKMACHINE") + self.conf_version = template.getVar("CONF_VERSION") + self.lconf_version = template.getVar("LCONF_VERSION") self.extra_setting = eval(template.getVar("EXTRA_SETTING")) self.toolchain_build = eval(template.getVar("TOOLCHAIN_BUILD")) self.image_fstypes = template.getVar("IMAGE_FSTYPES").split()
@@ -105,6 +109,8 @@ class Configuration: template.setVar("IMAGE_EXTRA_SPACE", self.image_extra_size) template.setVar("INCOMPATIBLE_LICENSE", self.incompat_license) template.setVar("SDKMACHINE", self.curr_sdk_machine) + template.setVar("CONF_VERSION", self.conf_version) + template.setVar("LCONF_VERSION", self.lconf_version) template.setVar("EXTRA_SETTING", self.extra_setting) template.setVar("TOOLCHAIN_BUILD", self.toolchain_build) template.setVar("IMAGE_FSTYPES", " ".join(self.image_fstypes).lstrip(" "))
lib/bb/ui/crumbs/hobeventhandler.py +3 -0
@@ -460,4 +460,7 @@ class HobHandler(gobject.GObject): # walkaround params["image_types"] = " ".join(hcc.SUPPORTED_IMAGE_TYPES.keys()).lstrip(" ") + + params["conf_version"] = self.server.runCommand(["getVariable", "CONF_VERSION"]) or "" + params["lconf_version"] = self.server.runCommand(["getVariable", "LCONF_VERSION"]) or "" return params
lib/bb/ui/crumbs/template.py +5 -5
@@ -65,7 +65,7 @@ class ConfigFile(File): if header: self.header = header else: - self.header = "# Config generated by the HOB\n\n" + self.header = "# Config generated by Hob\n\n" self.dictionary = {} def setVar(self, var, val):
@@ -94,7 +94,7 @@ class HobTemplateFile(ConfigFile): This object does save or load hob specific file. """ def __init__(self, pathfilename): - ConfigFile.__init__(self, pathfilename, ".hob", "# Hob Template generated by the HOB\n\n") + ConfigFile.__init__(self, pathfilename, ".hob", "# Hob Template generated by Hob\n\n") def getVar(self, var): if var in self.dictionary:
@@ -121,12 +121,12 @@ class RecipeFile(ConfigFile): This object is for image bb file. """ def __init__(self, pathfilename): - ConfigFile.__init__(self, pathfilename, ".bb", "# Recipe generated by the HOB\n\ninherit core-image\n") + ConfigFile.__init__(self, pathfilename, ".bb", "# Recipe generated by Hob\n\ninherit core-image\n") class TemplateMgr(gobject.GObject): - __gLocalVars__ = ["MACHINE", "PACKAGE_CLASSES", "DISTRO", "DL_DIR", "SSTATE_DIR", "SSTATE_MIRROR", "PARALLEL_MAKE", "BB_NUMBER_THREAD"] - __gBBLayersVars__ = ["BBLAYERS"] + __gLocalVars__ = ["MACHINE", "PACKAGE_CLASSES", "DISTRO", "DL_DIR", "SSTATE_DIR", "SSTATE_MIRROR", "PARALLEL_MAKE", "BB_NUMBER_THREAD", "CONF_VERSION"] + __gBBLayersVars__ = ["BBLAYERS", "LCONF_VERSION"] __gRecipeVars__ = ["DEPENDS", "IMAGE_INSTALL"] def __init__(self):
Signature · 1 line
1.7.4.1
Re: [PATCH 3/3] Hob: save CONF_VERSION and LCONF_VERSION into template
Quoted 6 lines · Dongxiao Xu
To pass the sanity check, we need to define
CONF_VERSIONandLCONF_VERSIONin local.conf and bblayers.conf.[YOCTO #2119]
Signed-off-by Dongxiao Xu<[email protected]>
Quoted 87 lines
--- lib/bb/ui/crumbs/builder.py | 6 ++++++ lib/bb/ui/crumbs/hobeventhandler.py | 3 +++ lib/bb/ui/crumbs/template.py | 10 +++++----- 3 files changed, 14 insertions(+), 5 deletions(-)lib/bb/ui/crumbs/builder.py +6
-0@@ -55,6 +55,8 @@ class Configuration: self.image_overhead_factor = params['image_overhead_factor'] self.incompat_license = params["incompat_license"] self.curr_sdk_machine = params["sdk_machine"] + self.conf_version = params["conf_version"] + self.lconf_version = params["lconf_version"] self.extra_setting = {} self.toolchain_build = False self.image_fstypes = params["image_fstypes"].split()@@ -79,6 +81,8 @@ class Configuration: # image_overhead_factor is read-only. self.incompat_license = template.getVar("INCOMPATIBLE_LICENSE") self.curr_sdk_machine = template.getVar("SDKMACHINE") + self.conf_version = template.getVar("CONF_VERSION") + self.lconf_version = template.getVar("LCONF_VERSION") self.extra_setting = eval(template.getVar("EXTRA_SETTING")) self.toolchain_build = eval(template.getVar("TOOLCHAIN_BUILD")) self.image_fstypes = template.getVar("IMAGE_FSTYPES").split()@@ -105,6 +109,8 @@ class Configuration: template.setVar("IMAGE_EXTRA_SPACE", self.image_extra_size) template.setVar("INCOMPATIBLE_LICENSE", self.incompat_license) template.setVar("SDKMACHINE", self.curr_sdk_machine) + template.setVar("CONF_VERSION", self.conf_version) + template.setVar("LCONF_VERSION", self.lconf_version) template.setVar("EXTRA_SETTING", self.extra_setting) template.setVar("TOOLCHAIN_BUILD", self.toolchain_build) template.setVar("IMAGE_FSTYPES", " ".join(self.image_fstypes).lstrip(" "))lib/bb/ui/crumbs/hobeventhandler.py +3
-0@@ -460,4 +460,7 @@ class HobHandler(gobject.GObject): # walkaround params["image_types"] = " ".join(hcc.SUPPORTED_IMAGE_TYPES.keys()).lstrip(" ") + + params["conf_version"] = self.server.runCommand(["getVariable", "CONF_VERSION"]) or "" + params["lconf_version"] = self.server.runCommand(["getVariable", "LCONF_VERSION"]) or "" return paramslib/bb/ui/crumbs/template.py +5
-5@@ -65,7 +65,7 @@ class ConfigFile(File): if header: self.header = header else: - self.header = "# Config generated by the HOB\n\n" + self.header = "# Config generated by Hob\n\n" self.dictionary = {} def setVar(self, var, val):@@ -94,7 +94,7 @@ class HobTemplateFile(ConfigFile): This object does save or load hob specific file. """ def __init__(self, pathfilename): - ConfigFile.__init__(self, pathfilename, ".hob", "# Hob Template generated by the HOB\n\n") + ConfigFile.__init__(self, pathfilename, ".hob", "# Hob Template generated by Hob\n\n") def getVar(self, var): if var in self.dictionary:@@ -121,12 +121,12 @@ class RecipeFile(ConfigFile): This object is for image bb file. """ def __init__(self, pathfilename): - ConfigFile.__init__(self, pathfilename, ".bb", "# Recipe generated by the HOB\n\ninherit core-image\n") + ConfigFile.__init__(self, pathfilename, ".bb", "# Recipe generated by Hob\n\ninherit core-image\n") class TemplateMgr(gobject.GObject): - __gLocalVars__ = ["MACHINE", "PACKAGE_CLASSES", "DISTRO", "DL_DIR", "SSTATE_DIR", "SSTATE_MIRROR", "PARALLEL_MAKE", "BB_NUMBER_THREAD"] - __gBBLayersVars__ = ["BBLAYERS"] + __gLocalVars__ = ["MACHINE", "PACKAGE_CLASSES", "DISTRO", "DL_DIR", "SSTATE_DIR", "SSTATE_MIRROR", "PARALLEL_MAKE", "BB_NUMBER_THREAD", "CONF_VERSION"] + __gBBLayersVars__ = ["BBLAYERS", "LCONF_VERSION"] __gRecipeVars__ = ["DEPENDS", "IMAGE_INSTALL"] def __init__(self):
Signature · 3 lines
Joshua '贾詡' Lock
Yocto Project "Johannes factotum"
Intel Open Source Technology CentreRe: [PATCH 2/3] Hob: Fix advanced setting reparse mechanism
In reply to Dongxiao XuQuoted 6 lines · Dongxiao Xu
When judging if reparse is needed when change values in advanced setting, we need also include user's own defined variable pairs.
[YOCTO #2121]
Signed-off-by Dongxiao Xu<[email protected]>
Quoted 17 lines
--- lib/bb/ui/crumbs/hig.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)lib/bb/ui/crumbs/hig.py +2
-0@@ -453,6 +453,8 @@ class AdvancedSettingDialog (CrumbsDialog): self.variables["PACKAGE_FORMAT"] = self.configuration.curr_package_format self.variables["INCOMPATIBLE_LICENSE"] = self.configuration.incompat_license self.variables["IMAGE_FSTYPES"] = self.configuration.image_fstypes + for key in self.configuration.extra_setting.keys(): + self.variables[key] = self.configuration.extra_setting[key] self.md5 = hashlib.md5(str(sorted(self.variables.items()))).hexdigest() self.settings_changed = False
Signature · 3 lines
Joshua '贾詡' Lock
Yocto Project "Johannes factotum"
Intel Open Source Technology CentreRe: [PATCH 1/3] Hob: reset the selection if switch to a new base image
In reply to Dongxiao XuQuoted 1 line · Dongxiao Xu
Signed-off-by Dongxiao Xu<[email protected]>
Quoted 16 lines
--- lib/bb/ui/crumbs/hoblistmodel.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)lib/bb/ui/crumbs/hoblistmodel.py +1
-0@@ -715,6 +715,7 @@ class RecipeListModel(gtk.ListStore): def set_selected_image(self, img): if img == None: return + self.reset() path = self.find_path_for_item(img) self.include_item(item_path=path, binb="User Selected",
Signature · 3 lines
Joshua '贾詡' Lock
Yocto Project "Johannes factotum"
Intel Open Source Technology CentreRichard Purdie
AppliedQuoted 11 lines · Dongxiao Xu
Hi Richard,
This pull request fixes some bugs related with new Hob, please help to review and pull.
Thanks,
DongxiaoThe following changes since commit
a17473d51f54a9dfb4eeaa5ad516c4851d5ac142:bitbake/fetch: Fix
uri_replace(2012-03-15 22:51:20 +0000)
Quoted 8 lines
are available in the git repository at:
git://git.pokylinux.org/poky-contribdxu4/hob-bugfix-bitbake
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/hob-bugfix-bitbakeDongxiao Xu (3):
Hob: reset the selection if switch to a new base image
Hob: Fix advanced setting reparse mechanism
Hob: saveCONF_VERSIONandLCONF_VERSIONinto template
Merged to master, thanks.
Richard