summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2013-09-02 11:18:25 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-02 11:26:20 (GMT)
commit1b814498b60d5f354d8cc5bdf568b91baf0745dc (patch)
tree54fa45008f31e34eeb629078bc75fe9749fb2b5e /bitbake
parentc7994f83baa678a4670472e1f037bfc16cb1e3be (diff)
downloadpoky-1b814498b60d5f354d8cc5bdf568b91baf0745dc.tar.gz
bitbake: bitbake/cooker: fix some calls of cookerdata.findConfigFile method
Cookerdata.findconfigFile method has a new parameter. Changed some calls. (Bitbake rev: dce0f9d4afe0986e2dd0146944fc4ac9dde275e4) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/cooker.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 5a84804..f03f16b 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -170,7 +170,7 @@ class BBCooker:
170 170
171 def appendConfigurationVar(self, var, val, default_file): 171 def appendConfigurationVar(self, var, val, default_file):
172 #add append var operation to the end of default_file 172 #add append var operation to the end of default_file
173 default_file = bb.cookerdata.findConfigFile(default_file) 173 default_file = bb.cookerdata.findConfigFile(default_file, self.data)
174 174
175 with open(default_file, 'r') as f: 175 with open(default_file, 'r') as f:
176 contents = f.readlines() 176 contents = f.readlines()
@@ -252,7 +252,7 @@ class BBCooker:
252 self.data.varhistory.del_var_history(var) 252 self.data.varhistory.del_var_history(var)
253 253
254 #add var to the end of default_file 254 #add var to the end of default_file
255 default_file = bb.cookerdata.findConfigFile(default_file) 255 default_file = bb.cookerdata.findConfigFile(default_file, self.data)
256 256
257 with open(default_file, 'r') as f: 257 with open(default_file, 'r') as f:
258 contents = f.readlines() 258 contents = f.readlines()
@@ -697,7 +697,7 @@ class BBCooker:
697 Find the location on disk of configfile and if it exists and was parsed by BitBake 697 Find the location on disk of configfile and if it exists and was parsed by BitBake
698 emit the ConfigFilePathFound event with the path to the file. 698 emit the ConfigFilePathFound event with the path to the file.
699 """ 699 """
700 path = bb.cookerdata.findConfigFile(configfile) 700 path = bb.cookerdata.findConfigFile(configfile, self.data)
701 if not path: 701 if not path:
702 return 702 return
703 703