aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorJoe Slater <jslater@windriver.com>2014-10-16 13:53:03 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-24 17:31:57 +0100
commit83c6930cdfac5a7759c4786172a5c70226e6adc4 (patch)
treefc121c76804a774652bc82875c48103490bd2013 /meta/classes
parentce0a999efe5c9bfd4780bd2b7c24e99f580474c0 (diff)
downloadopenembedded-core-contrib-83c6930cdfac5a7759c4786172a5c70226e6adc4.tar.gz
openembedded-core-contrib-83c6930cdfac5a7759c4786172a5c70226e6adc4.tar.bz2
openembedded-core-contrib-83c6930cdfac5a7759c4786172a5c70226e6adc4.zip
archiver: fix truncation of src_rev
In trying to eliminate AUTOINC+ from revision strings, we accidently truncated the strings to almost guarantee information from SRCREV_FORMAT, when supplied, would be lost. So, we now only delete any AUTOINC+'s from the string. Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/archiver.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 058ba63437..b598aa3ad6 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -146,9 +146,9 @@ python do_ar_original() {
fetch.unpack(tmpdir, (url,))
os.chdir(tmpdir)
- # We split on '+' to chuck any annoying AUTOINC+ in the revision.
+ # We eliminate any AUTOINC+ in the revision.
try:
- src_rev = bb.fetch2.get_srcrev(d).split('+')[-1][:10]
+ src_rev = bb.fetch2.get_srcrev(d).replace('AUTOINC+','')
except:
src_rev = 'NOREV'
tarname = os.path.join(ar_outdir, basename + '.' + src_rev + '.tar.gz')