[oe-commits] Joe Slater : archiver.bbclass: add revision to git tarfile name

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 36726049a6a452f85d7cc849d57ad6af05d6d3ea
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=36726049a6a452f85d7cc849d57ad6af05d6d3ea

Author: Joe Slater <jslater at windriver.com>
Date:   Tue Aug 26 10:29:31 2014 -0700

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 <jslater at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/archiver.bbclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 35e5411..058ba63 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()