Patchwork [bitbake-devel,PATCH_V3,1/3] bitbake: call the initConfiguration when reparsing

login
register
mail settings
Submitter Cristiana Voicu
Date June 20, 2013, 2:21 p.m.
Message ID <1371738077-13703-1-git-send-email-cristiana.voicu@intel.com>
Download mbox | patch
Permalink /patch/52137/
State New
Headers show

Comments

Cristiana Voicu - June 20, 2013, 2:21 p.m.
As it is implemented now, when parsing the configuration files is
needed, it also needs an initialization.
Also, implemented a function to create an extra configuration files
which can be used as postfile/prefiles when parsing.

Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
---
 bitbake/lib/bb/command.py |    2 +-
 bitbake/lib/bb/cooker.py  |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

Patch

diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py
index 43dd2f4..1727654 100644
--- a/bitbake/lib/bb/command.py
+++ b/bitbake/lib/bb/command.py
@@ -396,7 +396,7 @@  class CommandsAsync:
         postfiles = params[1].split()
         command.cooker.configuration.prefile = prefiles
         command.cooker.configuration.postfile = postfiles
-        command.cooker.loadConfigurationData(tracking=True)
+        command.cooker.loadConfigurationData()
         command.finishAsyncCommand()
     parseConfigurationFiles.needcache = False
 
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 9c9734f..2245f8e 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -109,7 +109,6 @@  class BBCooker:
                 sys.exit("FATAL: Failed to import extra cache class '%s'." % cache_name)
 
         self.data = None
-        self.initConfigurationData()
         self.loadConfigurationData()
 
         # Take a lock so only one copy of bitbake can run against a given build
@@ -158,6 +157,7 @@  class BBCooker:
         self.data.disableTracking()
 
     def loadConfigurationData(self):
+        self.initConfigurationData()
         self.databuilder.parseBaseConfiguration()
         self.data = self.databuilder.data
         self.data_hash = self.databuilder.data_hash
@@ -245,6 +245,11 @@  class BBCooker:
             loginfo = {"op":set, "file":default_file, "line":total.count("\n")}
             self.data.setVar(var, val, **loginfo)
 
+    def createConfigFile(self, name):
+        path = os.getcwd()
+        confpath = os.path.join(path, "conf", name)
+        open(confpath, 'w').close()
+
     def parseConfiguration(self):
 
         # Set log file verbosity
@@ -1200,7 +1205,6 @@  class BBCooker:
 
     def reset(self):
         self.state = state.initial
-        self.initConfigurationData()
         self.loadConfigurationData()
 
 def server_main(cooker, func, *args):