summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2013-01-23 14:13:44 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-25 12:42:08 +0000
commit03fee6c3b1342e6ac03e51a8a3c73b46fb067211 (patch)
treebb0b7f463ba4e64283cf39f4ace96666f2e5fc0a
parent1db3531cd5ecded0ccf6a6fdc03b8ff4755c0c73 (diff)
downloadpoky-03fee6c3b1342e6ac03e51a8a3c73b46fb067211.tar.gz
bitbake: hob: hob do not use .hob dir for variables from local.conf and bblayers.conf
If .hob exists, hob takes the variable from there. Change to not override anymore the variables which comes from bblayers.conf and local.conf [YOCTO #2934] (Bitbake rev: 00533e83038e3d5e3cd5d1be73c45afece92ec0c) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py27
-rw-r--r--bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py11
2 files changed, 10 insertions, 28 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index d57cf4c322..9da926dd14 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -190,20 +190,6 @@ class Configuration:
190 self.split_proxy("cvs", params["cvs_proxy_host"] + ":" + params["cvs_proxy_port"]) 190 self.split_proxy("cvs", params["cvs_proxy_host"] + ":" + params["cvs_proxy_port"])
191 191
192 def load(self, template): 192 def load(self, template):
193 self.curr_mach = template.getVar("MACHINE")
194 self.curr_package_format = " ".join(template.getVar("PACKAGE_CLASSES").split("package_")).strip()
195 self.curr_distro = template.getVar("DISTRO")
196 self.dldir = template.getVar("DL_DIR")
197 self.sstatedir = template.getVar("SSTATE_DIR")
198 self.sstatemirror = template.getVar("SSTATE_MIRRORS")
199 try:
200 self.pmake = int(template.getVar("PARALLEL_MAKE").split()[1])
201 except:
202 pass
203 try:
204 self.bbthread = int(template.getVar("BB_NUMBER_THREADS"))
205 except:
206 pass
207 try: 193 try:
208 self.image_rootfs_size = int(template.getVar("IMAGE_ROOTFS_SIZE")) 194 self.image_rootfs_size = int(template.getVar("IMAGE_ROOTFS_SIZE"))
209 except: 195 except:
@@ -215,13 +201,9 @@ class Configuration:
215 # image_overhead_factor is read-only. 201 # image_overhead_factor is read-only.
216 self.incompat_license = template.getVar("INCOMPATIBLE_LICENSE") 202 self.incompat_license = template.getVar("INCOMPATIBLE_LICENSE")
217 self.curr_sdk_machine = template.getVar("SDKMACHINE") 203 self.curr_sdk_machine = template.getVar("SDKMACHINE")
218 self.conf_version = template.getVar("CONF_VERSION")
219 self.lconf_version = template.getVar("LCONF_VERSION")
220 self.extra_setting = eval(template.getVar("EXTRA_SETTING")) 204 self.extra_setting = eval(template.getVar("EXTRA_SETTING"))
221 self.toolchain_build = eval(template.getVar("TOOLCHAIN_BUILD")) 205 self.toolchain_build = eval(template.getVar("TOOLCHAIN_BUILD"))
222 self.image_fstypes = template.getVar("IMAGE_FSTYPES") 206 self.image_fstypes = template.getVar("IMAGE_FSTYPES")
223 # bblayers.conf
224 self.layers = template.getVar("BBLAYERS").split()
225 # image/recipes/packages 207 # image/recipes/packages
226 self.selected_image = template.getVar("__SELECTED_IMAGE__") 208 self.selected_image = template.getVar("__SELECTED_IMAGE__")
227 self.selected_recipes = template.getVar("DEPENDS").split() 209 self.selected_recipes = template.getVar("DEPENDS").split()
@@ -561,11 +543,10 @@ class Builder(gtk.Window):
561 543
562 def initiate_new_build_async(self): 544 def initiate_new_build_async(self):
563 self.switch_page(self.MACHINE_SELECTION) 545 self.switch_page(self.MACHINE_SELECTION)
564 if self.load_template(TemplateMgr.convert_to_template_pathfilename("default", ".hob/")) == False: 546 self.show_sanity_check_page()
565 self.show_sanity_check_page() 547 self.handler.init_cooker()
566 self.handler.init_cooker() 548 self.handler.set_extra_inherit("image_types")
567 self.handler.set_extra_inherit("image_types") 549 self.generate_configuration()
568 self.generate_configuration()
569 550
570 def update_config_async(self): 551 def update_config_async(self):
571 self.switch_page(self.MACHINE_SELECTION) 552 self.switch_page(self.MACHINE_SELECTION)
diff --git a/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py b/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py
index 3642e9bc5c..50c7510ff3 100644
--- a/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py
+++ b/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py
@@ -323,11 +323,12 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper):
323 sstatemirrors = sstatemirrors[1:] 323 sstatemirrors = sstatemirrors[1:]
324 324
325 sstatemirror_fields = [x for x in sstatemirror.split(' ') if x.strip()] 325 sstatemirror_fields = [x for x in sstatemirror.split(' ') if x.strip()]
326 if sstatemirror_fields[0] == "file://(.*)": 326 if len(sstatemirror_fields):
327 sm_list = [ 0, sstatemirror_fields[1], "file://(.*)"] 327 if sstatemirror_fields[0] == "file://(.*)":
328 else: 328 sm_list = [ 0, sstatemirror_fields[1], "file://(.*)"]
329 sm_list = [ 1, sstatemirror_fields[1], sstatemirror_fields[0]] 329 else:
330 self.sstatemirrors_list.append(sm_list) 330 sm_list = [ 1, sstatemirror_fields[1], sstatemirror_fields[0]]
331 self.sstatemirrors_list.append(sm_list)
331 332
332 index = 0 333 index = 0
333 for mirror in self.sstatemirrors_list: 334 for mirror in self.sstatemirrors_list: