summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2016-03-11 16:10:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-12 22:11:20 +0000
commite59547e4154b772a36f4e58f1d454c0c38653c84 (patch)
tree18a61304b6eac554a3743a49db49e1d0ca4e8bb7
parent7256e5a9dba0652fe8361f3143771cb6371568b5 (diff)
downloadopenembedded-core-contrib-e59547e4154b772a36f4e58f1d454c0c38653c84.tar.gz
openembedded-core-contrib-e59547e4154b772a36f4e58f1d454c0c38653c84.tar.bz2
openembedded-core-contrib-e59547e4154b772a36f4e58f1d454c0c38653c84.zip
image-buildinfo.bbclass: fix performance problems
Inheriting image-buildinfo.bbclass primarily slowed down image building for two reasons: 1. The content of the shell command "buildinfo" gets expanded multiple times, each time again checking the state of all layers. 2. When expanded as part of the actual image creation, git is invoked under pseudo, which makes the check quite a bit slower (from a few seconds to a minute with many layers). To fix this, buildinfo now is a Python method which calls the checks only when really executed. Pseudo is told to unload itself when starting git. In addition, "git diff" is invoked with "--quiet", which avoids producing output that is just getting thrown away. As before, any kind of problem or output causes the layer to be marked as "modified". [Revision 2 of the change with some dead code removed] Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image-buildinfo.bbclass35
1 files changed, 22 insertions, 13 deletions
diff --git a/meta/classes/image-buildinfo.bbclass b/meta/classes/image-buildinfo.bbclass
index 5b738ae596..197b24235b 100644
--- a/meta/classes/image-buildinfo.bbclass
+++ b/meta/classes/image-buildinfo.bbclass
@@ -26,12 +26,17 @@ def image_buildinfo_outputvars(vars, listvars, d):
# Gets git branch's status (clean or dirty)
def get_layer_git_status(path):
- f = os.popen("cd %s; git diff --stat 2>&1 | tail -n 1" % path)
- data = f.read()
- if f.close() is None:
- if len(data) != 0:
- return "-- modified"
- return ""
+ import subprocess
+ try:
+ subprocess.check_output("cd %s; PSEUDO_UNLOAD=1 git diff --quiet --no-ext-diff" % path,
+ shell=True,
+ stderr=subprocess.STDOUT)
+ return ""
+ except subprocess.CalledProcessError, ex:
+ # Silently treat errors as "modified", without checking for the
+ # (expected) return code 1 in a modified git repo. For example, we get
+ # output and a 129 return code when a layer isn't a git repo at all.
+ return "-- modified"
# Returns layer revisions along with their respective status
def get_layer_revs(d):
@@ -53,17 +58,21 @@ def buildinfo_target(d):
return image_buildinfo_outputvars(vars, listvars, d)
# Write build information to target filesystem
-buildinfo () {
-cat > ${IMAGE_ROOTFS}${sysconfdir}/build << END
------------------------
+python buildinfo () {
+ with open(d.expand('${IMAGE_ROOTFS}${sysconfdir}/build'), 'w') as build:
+ build.writelines((
+ '''-----------------------
Build Configuration: |
-----------------------
-${@buildinfo_target(d)}
+''',
+ buildinfo_target(d),
+ '''
-----------------------
-Layer Revisions: |
+Layer Revisions: |
-----------------------
-${@get_layer_revs(d)}
-END
+''',
+ get_layer_revs(d)
+ ))
}
IMAGE_PREPROCESS_COMMAND += "buildinfo;"