aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-06-09 15:50:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-12 15:04:11 +0100
commit1a6424ee4c865601ff324e9599a2f48c9e6723ee (patch)
treefc333cf182ebaf870474046eb24668b1a36686f4
parent861159318a99a314d2f8bdb0fa772a6b4bd7a97e (diff)
downloadopenembedded-core-contrib-1a6424ee4c865601ff324e9599a2f48c9e6723ee.tar.gz
openembedded-core-contrib-1a6424ee4c865601ff324e9599a2f48c9e6723ee.tar.bz2
openembedded-core-contrib-1a6424ee4c865601ff324e9599a2f48c9e6723ee.zip
classes/buildhistory: use BB_CMDLINE to get bitbake command line
We put the bitbake command line in the buildhistory commit message for informational purposes, but calling sys.argv to get that as we were previously doesn't really work in memory resident mode - that gives you the command used to start the bitbake server which is much less interesting. Use the just-introduced BB_CMDLINE variable instead. Part of the fix for [YOCTO #11634]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/buildhistory.bbclass13
1 files changed, 8 insertions, 5 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 3e907fc3f9..74b837e974 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -696,11 +696,14 @@ def buildhistory_get_sdkvars(d):
def buildhistory_get_cmdline(d):
- if sys.argv[0].endswith('bin/bitbake'):
- bincmd = 'bitbake'
- else:
- bincmd = sys.argv[0]
- return '%s %s' % (bincmd, ' '.join(sys.argv[1:]))
+ argv = d.getVar('BB_CMDLINE', False)
+ if argv:
+ if argv[0].endswith('bin/bitbake'):
+ bincmd = 'bitbake'
+ else:
+ bincmd = argv[0]
+ return '%s %s' % (bincmd, ' '.join(argv[1:]))
+ return ''
buildhistory_single_commit() {