diff options
author | Valentin Popa <valentin.popa@intel.com> | 2013-09-27 17:10:41 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-07 09:37:33 +0100 |
commit | 45392cc67a89afe468b179789c7fbeeb3aa67769 (patch) | |
tree | eb567c68f5d7da623d48cacbdab6575b79e87a5d /bitbake/lib/bb/ui/crumbs | |
parent | 95915910dfaa71d6d5b77b8b53468f77207ddc76 (diff) | |
download | poky-45392cc67a89afe468b179789c7fbeeb3aa67769.tar.gz |
bitbake: HOB: MACHINE should be saved in conf files using ?=
MACHINE var is saved using early assignment operator.
Calling MACHINE=x bitbake core-image-... works properly.
Comment "#added by bitbake" is replaced with "#added by hob".
[YOCTO #5070]
(Bitbake rev: 2d0ec8ff083b636a6cf98de3278900eb95c3def6)
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hobeventhandler.py | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 829281357d..46023cc585 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py | |||
@@ -198,7 +198,7 @@ class Configuration: | |||
198 | handler.set_var_in_file("BBLAYERS", self.layers, "bblayers.conf") | 198 | handler.set_var_in_file("BBLAYERS", self.layers, "bblayers.conf") |
199 | # local.conf | 199 | # local.conf |
200 | if not defaults: | 200 | if not defaults: |
201 | handler.set_var_in_file("MACHINE", self.curr_mach, "local.conf") | 201 | handler.early_assign_var_in_file("MACHINE", self.curr_mach, "local.conf") |
202 | handler.set_var_in_file("DISTRO", self.curr_distro, "local.conf") | 202 | handler.set_var_in_file("DISTRO", self.curr_distro, "local.conf") |
203 | handler.set_var_in_file("DL_DIR", self.dldir, "local.conf") | 203 | handler.set_var_in_file("DL_DIR", self.dldir, "local.conf") |
204 | handler.set_var_in_file("SSTATE_DIR", self.sstatedir, "local.conf") | 204 | handler.set_var_in_file("SSTATE_DIR", self.sstatedir, "local.conf") |
diff --git a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py index ef74e563f9..3f5bebaca3 100644 --- a/bitbake/lib/bb/ui/crumbs/hobeventhandler.py +++ b/bitbake/lib/bb/ui/crumbs/hobeventhandler.py | |||
@@ -315,7 +315,7 @@ class HobHandler(gobject.GObject): | |||
315 | 315 | ||
316 | def set_machine(self, machine): | 316 | def set_machine(self, machine): |
317 | if machine: | 317 | if machine: |
318 | self.set_var_in_file("MACHINE", machine, "local.conf") | 318 | self.early_assign_var_in_file("MACHINE", machine, "local.conf") |
319 | 319 | ||
320 | def set_sdk_machine(self, sdk_machine): | 320 | def set_sdk_machine(self, sdk_machine): |
321 | self.set_var_in_file("SDKMACHINE", sdk_machine, "local.conf") | 321 | self.set_var_in_file("SDKMACHINE", sdk_machine, "local.conf") |
@@ -472,6 +472,11 @@ class HobHandler(gobject.GObject): | |||
472 | self.server.runCommand(["setVarFile", var, val, default_file, "set"]) | 472 | self.server.runCommand(["setVarFile", var, val, default_file, "set"]) |
473 | self.runCommand(["disableDataTracking"]) | 473 | self.runCommand(["disableDataTracking"]) |
474 | 474 | ||
475 | def early_assign_var_in_file(self, var, val, default_file=None): | ||
476 | self.runCommand(["enableDataTracking"]) | ||
477 | self.server.runCommand(["setVarFile", var, val, default_file, "earlyAssign"]) | ||
478 | self.runCommand(["disableDataTracking"]) | ||
479 | |||
475 | def append_var_in_file(self, var, val, default_file=None): | 480 | def append_var_in_file(self, var, val, default_file=None): |
476 | self.server.runCommand(["setVarFile", var, val, default_file, "append"]) | 481 | self.server.runCommand(["setVarFile", var, val, default_file, "append"]) |
477 | 482 | ||