BBHandler: Don't generate the A variable which is time consuming and doesn't appear to get used

2 files changed, 22 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index fd998496e..d9682d702 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ Changes in Bitbake 1.8.x:
 	- Sync fetcher code with that in trunk, adding SRCREV support for svn
 	- Add ConfigParsed Event after configuration parsing is complete
 	- data.emit_var() - only call getVar if we need the variable
+	- Stop generating the A variable (seems to be legacy code)
 
 Changes in Bitbake 1.8.6:
 	- Correctly redirect stdin when forking
diff --git a/lib/bb/parse/parse_py/BBHandler.py b/lib/bb/parse/parse_py/BBHandler.py
index 5f8426df2..aaa262d3e 100644
--- a/lib/bb/parse/parse_py/BBHandler.py
+++ b/lib/bb/parse/parse_py/BBHandler.py
@@ -390,25 +390,27 @@ def vars_from_file(mypkg, d):
 def set_additional_vars(file, d, include):
     """Deduce rest of variables, e.g. ${A} out of ${SRC_URI}"""
 
-    bb.msg.debug(2, bb.msg.domain.Parsing, "BB %s: set_additional_vars" % file)
-
-    src_uri = data.getVar('SRC_URI', d, 1)
-    if not src_uri:
-        return
-
-    a = (data.getVar('A', d, 1) or '').split()
-
-    from bb import fetch
-    try:
-        ud = fetch.init(src_uri.split(), d)
-        a += fetch.localpaths(d, ud)
-    except fetch.NoMethodError:
-        pass
-    except bb.MalformedUrl,e:
-        raise ParseError("Unable to generate local paths for SRC_URI due to malformed uri: %s" % e)
-    del fetch
-
-    data.setVar('A', " ".join(a), d)
+    return
+    # Nothing seems to use this variable
+    #bb.msg.debug(2, bb.msg.domain.Parsing, "BB %s: set_additional_vars" % file)
+
+    #src_uri = data.getVar('SRC_URI', d, 1)
+    #if not src_uri:
+    #    return
+
+    #a = (data.getVar('A', d, 1) or '').split()
+
+    #from bb import fetch
+    #try:
+    #    ud = fetch.init(src_uri.split(), d)
+    #    a += fetch.localpaths(d, ud)
+    #except fetch.NoMethodError:
+    #    pass
+    #except bb.MalformedUrl,e:
+    #    raise ParseError("Unable to generate local paths for SRC_URI due to malformed uri: %s" % e)
+    #del fetch
+
+    #data.setVar('A', " ".join(a), d)
 
 
 # Add us to the handlers list