diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2012-03-16 16:48:13 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-20 15:21:37 +0000 |
commit | 5b09f2c25ce65f18ae175eb98bfb1379754b47e9 (patch) | |
tree | 3778cf79f0852661b6f5d9e3421ca87d0462b803 /bitbake/lib/bb/ui/crumbs/builder.py | |
parent | d03856c61150f95d9f479fcee2c7e91bd22eeaa4 (diff) | |
download | poky-5b09f2c25ce65f18ae175eb98bfb1379754b47e9.tar.gz |
Hob: save CONF_VERSION and LCONF_VERSION into template
To pass the sanity check, we need to define CONF_VERSION and
LCONF_VERSION in local.conf and bblayers.conf.
[YOCTO #2119]
(Bitbake rev: d595960fea0988df9004d927bc2ec3439540dd9c)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/builder.py')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 318bcbf9ae..b1aad54eed 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py | |||
@@ -55,6 +55,8 @@ class Configuration: | |||
55 | self.image_overhead_factor = params['image_overhead_factor'] | 55 | self.image_overhead_factor = params['image_overhead_factor'] |
56 | self.incompat_license = params["incompat_license"] | 56 | self.incompat_license = params["incompat_license"] |
57 | self.curr_sdk_machine = params["sdk_machine"] | 57 | self.curr_sdk_machine = params["sdk_machine"] |
58 | self.conf_version = params["conf_version"] | ||
59 | self.lconf_version = params["lconf_version"] | ||
58 | self.extra_setting = {} | 60 | self.extra_setting = {} |
59 | self.toolchain_build = False | 61 | self.toolchain_build = False |
60 | self.image_fstypes = params["image_fstypes"].split() | 62 | self.image_fstypes = params["image_fstypes"].split() |
@@ -79,6 +81,8 @@ class Configuration: | |||
79 | # image_overhead_factor is read-only. | 81 | # image_overhead_factor is read-only. |
80 | self.incompat_license = template.getVar("INCOMPATIBLE_LICENSE") | 82 | self.incompat_license = template.getVar("INCOMPATIBLE_LICENSE") |
81 | self.curr_sdk_machine = template.getVar("SDKMACHINE") | 83 | self.curr_sdk_machine = template.getVar("SDKMACHINE") |
84 | self.conf_version = template.getVar("CONF_VERSION") | ||
85 | self.lconf_version = template.getVar("LCONF_VERSION") | ||
82 | self.extra_setting = eval(template.getVar("EXTRA_SETTING")) | 86 | self.extra_setting = eval(template.getVar("EXTRA_SETTING")) |
83 | self.toolchain_build = eval(template.getVar("TOOLCHAIN_BUILD")) | 87 | self.toolchain_build = eval(template.getVar("TOOLCHAIN_BUILD")) |
84 | self.image_fstypes = template.getVar("IMAGE_FSTYPES").split() | 88 | self.image_fstypes = template.getVar("IMAGE_FSTYPES").split() |
@@ -105,6 +109,8 @@ class Configuration: | |||
105 | template.setVar("IMAGE_EXTRA_SPACE", self.image_extra_size) | 109 | template.setVar("IMAGE_EXTRA_SPACE", self.image_extra_size) |
106 | template.setVar("INCOMPATIBLE_LICENSE", self.incompat_license) | 110 | template.setVar("INCOMPATIBLE_LICENSE", self.incompat_license) |
107 | template.setVar("SDKMACHINE", self.curr_sdk_machine) | 111 | template.setVar("SDKMACHINE", self.curr_sdk_machine) |
112 | template.setVar("CONF_VERSION", self.conf_version) | ||
113 | template.setVar("LCONF_VERSION", self.lconf_version) | ||
108 | template.setVar("EXTRA_SETTING", self.extra_setting) | 114 | template.setVar("EXTRA_SETTING", self.extra_setting) |
109 | template.setVar("TOOLCHAIN_BUILD", self.toolchain_build) | 115 | template.setVar("TOOLCHAIN_BUILD", self.toolchain_build) |
110 | template.setVar("IMAGE_FSTYPES", " ".join(self.image_fstypes).lstrip(" ")) | 116 | template.setVar("IMAGE_FSTYPES", " ".join(self.image_fstypes).lstrip(" ")) |