From 36726049a6a452f85d7cc849d57ad6af05d6d3ea Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Tue, 26 Aug 2014 10:29:31 -0700 Subject: archiver.bbclass: add revision to git tarfile name When archiving original source, insert the first 10 characters of srcrev, after stripping off any AUTOINC+, into the filename for tarfiles created from directories. Signed-off-by: Joe Slater Signed-off-by: Richard Purdie --- meta/classes/archiver.bbclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'meta/classes/archiver.bbclass') diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 35e541194c..058ba63437 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -146,7 +146,12 @@ python do_ar_original() { fetch.unpack(tmpdir, (url,)) os.chdir(tmpdir) - tarname = os.path.join(ar_outdir, basename + '.tar.gz') + # We split on '+' to chuck any annoying AUTOINC+ in the revision. + try: + src_rev = bb.fetch2.get_srcrev(d).split('+')[-1][:10] + except: + src_rev = 'NOREV' + tarname = os.path.join(ar_outdir, basename + '.' + src_rev + '.tar.gz') tar = tarfile.open(tarname, 'w:gz') tar.add('.') tar.close() -- cgit v1.2.3