* [PATCH 0/3][PULL] Hob: Bug fix
@ 2012-03-16 8:48 Dongxiao Xu
2012-03-16 8:48 ` [PATCH 1/3] Hob: reset the selection if switch to a new base image Dongxiao Xu
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Dongxiao Xu @ 2012-03-16 8:48 UTC (permalink / raw)
To: bitbake-devel
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(-)
--
1.7.4.1
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/3] Hob: reset the selection if switch to a new base image 2012-03-16 8:48 [PATCH 0/3][PULL] Hob: Bug fix Dongxiao Xu @ 2012-03-16 8:48 ` Dongxiao Xu 2012-03-19 20:18 ` Joshua Lock 2012-03-16 8:48 ` [PATCH 2/3] Hob: Fix advanced setting reparse mechanism Dongxiao Xu ` (2 subsequent siblings) 3 siblings, 1 reply; 8+ messages in thread From: Dongxiao Xu @ 2012-03-16 8:48 UTC (permalink / raw) To: bitbake-devel Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> --- lib/bb/ui/crumbs/hoblistmodel.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lib/bb/ui/crumbs/hoblistmodel.py b/lib/bb/ui/crumbs/hoblistmodel.py index caf31bc..6e6983c 100644 --- a/lib/bb/ui/crumbs/hoblistmodel.py +++ b/lib/bb/ui/crumbs/hoblistmodel.py @@ -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", -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] Hob: reset the selection if switch to a new base image 2012-03-16 8:48 ` [PATCH 1/3] Hob: reset the selection if switch to a new base image Dongxiao Xu @ 2012-03-19 20:18 ` Joshua Lock 0 siblings, 0 replies; 8+ messages in thread From: Joshua Lock @ 2012-03-19 20:18 UTC (permalink / raw) To: bitbake-devel On 16/03/12 01:48, Dongxiao Xu wrote: > Signed-off-by: Dongxiao Xu<dongxiao.xu@intel.com> Signed-off-by: Joshua Lock <josh@linux.intel.com> > --- > lib/bb/ui/crumbs/hoblistmodel.py | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/lib/bb/ui/crumbs/hoblistmodel.py b/lib/bb/ui/crumbs/hoblistmodel.py > index caf31bc..6e6983c 100644 > --- a/lib/bb/ui/crumbs/hoblistmodel.py > +++ b/lib/bb/ui/crumbs/hoblistmodel.py > @@ -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", -- Joshua '贾詡' Lock Yocto Project "Johannes factotum" Intel Open Source Technology Centre ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/3] Hob: Fix advanced setting reparse mechanism 2012-03-16 8:48 [PATCH 0/3][PULL] Hob: Bug fix Dongxiao Xu 2012-03-16 8:48 ` [PATCH 1/3] Hob: reset the selection if switch to a new base image Dongxiao Xu @ 2012-03-16 8:48 ` Dongxiao Xu 2012-03-19 20:18 ` Joshua Lock 2012-03-16 8:48 ` [PATCH 3/3] Hob: save CONF_VERSION and LCONF_VERSION into template Dongxiao Xu 2012-03-20 14:40 ` [PATCH 0/3][PULL] Hob: Bug fix Richard Purdie 3 siblings, 1 reply; 8+ messages in thread From: Dongxiao Xu @ 2012-03-16 8:48 UTC (permalink / raw) To: bitbake-devel 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 <dongxiao.xu@intel.com> --- lib/bb/ui/crumbs/hig.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/lib/bb/ui/crumbs/hig.py b/lib/bb/ui/crumbs/hig.py index 67cc94e..8d73d5f 100644 --- a/lib/bb/ui/crumbs/hig.py +++ b/lib/bb/ui/crumbs/hig.py @@ -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 -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/3] Hob: Fix advanced setting reparse mechanism 2012-03-16 8:48 ` [PATCH 2/3] Hob: Fix advanced setting reparse mechanism Dongxiao Xu @ 2012-03-19 20:18 ` Joshua Lock 0 siblings, 0 replies; 8+ messages in thread From: Joshua Lock @ 2012-03-19 20:18 UTC (permalink / raw) To: bitbake-devel On 16/03/12 01:48, Dongxiao Xu wrote: > 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<dongxiao.xu@intel.com> Signed-off-by: Joshua Lock <josh@linux.intel.com> > --- > lib/bb/ui/crumbs/hig.py | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/lib/bb/ui/crumbs/hig.py b/lib/bb/ui/crumbs/hig.py > index 67cc94e..8d73d5f 100644 > --- a/lib/bb/ui/crumbs/hig.py > +++ b/lib/bb/ui/crumbs/hig.py > @@ -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 > -- Joshua '贾詡' Lock Yocto Project "Johannes factotum" Intel Open Source Technology Centre ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/3] Hob: save CONF_VERSION and LCONF_VERSION into template 2012-03-16 8:48 [PATCH 0/3][PULL] Hob: Bug fix Dongxiao Xu 2012-03-16 8:48 ` [PATCH 1/3] Hob: reset the selection if switch to a new base image Dongxiao Xu 2012-03-16 8:48 ` [PATCH 2/3] Hob: Fix advanced setting reparse mechanism Dongxiao Xu @ 2012-03-16 8:48 ` Dongxiao Xu 2012-03-19 20:18 ` Joshua Lock 2012-03-20 14:40 ` [PATCH 0/3][PULL] Hob: Bug fix Richard Purdie 3 siblings, 1 reply; 8+ messages in thread From: Dongxiao Xu @ 2012-03-16 8:48 UTC (permalink / raw) To: bitbake-devel To pass the sanity check, we need to define CONF_VERSION and LCONF_VERSION in local.conf and bblayers.conf. [YOCTO #2119] Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> --- 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(-) diff --git a/lib/bb/ui/crumbs/builder.py b/lib/bb/ui/crumbs/builder.py index 1d255ac..d1b0b52 100755 --- a/lib/bb/ui/crumbs/builder.py +++ b/lib/bb/ui/crumbs/builder.py @@ -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(" ")) diff --git a/lib/bb/ui/crumbs/hobeventhandler.py b/lib/bb/ui/crumbs/hobeventhandler.py index 790e2ef..e24c340 100644 --- a/lib/bb/ui/crumbs/hobeventhandler.py +++ b/lib/bb/ui/crumbs/hobeventhandler.py @@ -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 diff --git a/lib/bb/ui/crumbs/template.py b/lib/bb/ui/crumbs/template.py index d028354..a03063c 100644 --- a/lib/bb/ui/crumbs/template.py +++ b/lib/bb/ui/crumbs/template.py @@ -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): -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 3/3] Hob: save CONF_VERSION and LCONF_VERSION into template 2012-03-16 8:48 ` [PATCH 3/3] Hob: save CONF_VERSION and LCONF_VERSION into template Dongxiao Xu @ 2012-03-19 20:18 ` Joshua Lock 0 siblings, 0 replies; 8+ messages in thread From: Joshua Lock @ 2012-03-19 20:18 UTC (permalink / raw) To: bitbake-devel On 16/03/12 01:48, Dongxiao Xu wrote: > To pass the sanity check, we need to define CONF_VERSION and > LCONF_VERSION in local.conf and bblayers.conf. > > [YOCTO #2119] > > Signed-off-by: Dongxiao Xu<dongxiao.xu@intel.com> Signed-off-by: Joshua Lock <josh@linux.intel.com> > --- > 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(-) > > diff --git a/lib/bb/ui/crumbs/builder.py b/lib/bb/ui/crumbs/builder.py > index 1d255ac..d1b0b52 100755 > --- a/lib/bb/ui/crumbs/builder.py > +++ b/lib/bb/ui/crumbs/builder.py > @@ -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(" ")) > diff --git a/lib/bb/ui/crumbs/hobeventhandler.py b/lib/bb/ui/crumbs/hobeventhandler.py > index 790e2ef..e24c340 100644 > --- a/lib/bb/ui/crumbs/hobeventhandler.py > +++ b/lib/bb/ui/crumbs/hobeventhandler.py > @@ -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 > diff --git a/lib/bb/ui/crumbs/template.py b/lib/bb/ui/crumbs/template.py > index d028354..a03063c 100644 > --- a/lib/bb/ui/crumbs/template.py > +++ b/lib/bb/ui/crumbs/template.py > @@ -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): -- Joshua '贾詡' Lock Yocto Project "Johannes factotum" Intel Open Source Technology Centre ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/3][PULL] Hob: Bug fix 2012-03-16 8:48 [PATCH 0/3][PULL] Hob: Bug fix Dongxiao Xu ` (2 preceding siblings ...) 2012-03-16 8:48 ` [PATCH 3/3] Hob: save CONF_VERSION and LCONF_VERSION into template Dongxiao Xu @ 2012-03-20 14:40 ` Richard Purdie 3 siblings, 0 replies; 8+ messages in thread From: Richard Purdie @ 2012-03-20 14:40 UTC (permalink / raw) To: Dongxiao Xu; +Cc: bitbake-devel On Fri, 2012-03-16 at 16:48 +0800, Dongxiao Xu wrote: > 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 Merged to master, thanks. Richard ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-03-20 14:52 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-03-16 8:48 [PATCH 0/3][PULL] Hob: Bug fix Dongxiao Xu 2012-03-16 8:48 ` [PATCH 1/3] Hob: reset the selection if switch to a new base image Dongxiao Xu 2012-03-19 20:18 ` Joshua Lock 2012-03-16 8:48 ` [PATCH 2/3] Hob: Fix advanced setting reparse mechanism Dongxiao Xu 2012-03-19 20:18 ` Joshua Lock 2012-03-16 8:48 ` [PATCH 3/3] Hob: save CONF_VERSION and LCONF_VERSION into template Dongxiao Xu 2012-03-19 20:18 ` Joshua Lock 2012-03-20 14:40 ` [PATCH 0/3][PULL] Hob: Bug fix Richard Purdie
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.