summaryrefslogtreecommitdiffstats
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:36:15 +0100
commit1a0485040c45be683488a2e4bea224daa4a8f6d5 (patch)
tree45e5073eba41652b3a9349f22d2d1fdf49fb1941
parentcaebcda4126b690784389e53113ffc3169447ae6 (diff)
downloadpoky-1a0485040c45be683488a2e4bea224daa4a8f6d5.tar.gz
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. (From OE-Core rev: 83c6930cdfac5a7759c4786172a5c70226e6adc4) Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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() {
146 fetch.unpack(tmpdir, (url,)) 146 fetch.unpack(tmpdir, (url,))
147 147
148 os.chdir(tmpdir) 148 os.chdir(tmpdir)
149 # We split on '+' to chuck any annoying AUTOINC+ in the revision. 149 # We eliminate any AUTOINC+ in the revision.
150 try: 150 try:
151 src_rev = bb.fetch2.get_srcrev(d).split('+')[-1][:10] 151 src_rev = bb.fetch2.get_srcrev(d).replace('AUTOINC+','')
152 except: 152 except:
153 src_rev = 'NOREV' 153 src_rev = 'NOREV'
154 tarname = os.path.join(ar_outdir, basename + '.' + src_rev + '.tar.gz') 154 tarname = os.path.join(ar_outdir, basename + '.' + src_rev + '.tar.gz')