[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3924/8267] externalsrc: Add optional srcdir arg to srctree_hash_files
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 3924/8267] externalsrc: Add optional srcdir arg to srctree_hash_files
- Date: Sun, 17 Dec 2017 01:18:56 +0000 (UTC)
commit 02f89167a394d3a64ac0699f8ecae18563e560ab
Author: Ola x Nilsson <ola x nilsson axis com>
Date: Thu Dec 22 14:59:49 2016 +0100
externalsrc: Add optional srcdir arg to srctree_hash_files
Make it easier to reuse the function for other dirs than EXTERNALSRC.
(From OE-Core rev: 9ddcfb51e637acba82089da6430ac77e29f0f1ef)
Signed-off-by: Ola x Nilsson <ola x nilsson axis com>
Signed-off-by: Ross Burton <ross burton intel com>
Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
meta/classes/externalsrc.bbclass | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index eec5e61..6ec46a6 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -143,12 +143,12 @@ python externalsrc_compile_prefunc() {
bb.plain('NOTE: %s: compiling from external source tree %s' % (d.getVar('PN'), d.getVar('EXTERNALSRC')))
}
-def srctree_hash_files(d):
+def srctree_hash_files(d, srcdir=None):
import shutil
import subprocess
import tempfile
- s_dir = d.getVar('EXTERNALSRC')
+ s_dir = srcdir or d.getVar('EXTERNALSRC')
git_dir = os.path.join(s_dir, '.git')
oe_hash_file = os.path.join(git_dir, 'oe-devtool-tree-sha1')
@@ -166,7 +166,7 @@ def srctree_hash_files(d):
fobj.write(sha1)
ret = oe_hash_file + ':True'
else:
- ret = d.getVar('EXTERNALSRC') + '/*:True'
+ ret = s_dir + '/*:True'
return ret
def srctree_configure_hash_files(d):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]