mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

externalsrc: Detect code changes in submodules

Browse Source 
The srctree_hash was calculated only from main source directory ignoring
changes in submodules.

[YOCTO #13748]

Use submodule--helper to determine all submodules, and calculate hash
from all git tree objects names combined.

(From OE-Core rev: 50ff9afb3990bcf60b4fa1f937506cb84028c32d)

(From OE-Core rev: 6d8a58b11117372fdbf0a86fbc6698ee509fc816)

Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9385670add)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tomasz Dziendzielski
2021-01-27 09:33:31 +01:00
committed by Richard Purdie
parent dccc532bfb
commit 8488b2d64a
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/externalsrc.bbclass
+11 -1
View File
@@ -190,6 +190,7 @@ def srctree_hash_files(d, srcdir=None):
import shutil import shutil
import subprocess import subprocess
import tempfile import tempfile
import hashlib
s_dir = srcdir or d.getVar('EXTERNALSRC') s_dir = srcdir or d.getVar('EXTERNALSRC')
git_dir = None git_dir = None
@@ -214,7 +215,16 @@ def srctree_hash_files(d, srcdir=None):
env = os.environ.copy() env = os.environ.copy()
env['GIT_INDEX_FILE'] = tmp_index.name env['GIT_INDEX_FILE'] = tmp_index.name
subprocess.check_output(['git', 'add', '-A', '.'], cwd=s_dir, env=env) subprocess.check_output(['git', 'add', '-A', '.'], cwd=s_dir, env=env)
sha1 = subprocess.check_output(['git', 'write-tree'], cwd=s_dir, env=env).decode("utf-8") git_sha1 = subprocess.check_output(['git', 'write-tree'], cwd=s_dir, env=env).decode("utf-8")
submodule_helper = subprocess.check_output(['git', 'submodule--helper', 'list'], cwd=s_dir, env=env).decode("utf-8")
for line in submodule_helper.splitlines():
module_dir = os.path.join(s_dir, line.rsplit(maxsplit=1)[1])
proc = subprocess.Popen(['git', 'add', '-A', '.'], cwd=module_dir, env=env, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
proc.communicate()
proc = subprocess.Popen(['git', 'write-tree'], cwd=module_dir, env=env, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
stdout, _ = proc.communicate()
git_sha1 += stdout.decode("utf-8")
sha1 = hashlib.sha1(git_sha1.encode("utf-8")).hexdigest()
with open(oe_hash_file, 'w') as fobj: with open(oe_hash_file, 'w') as fobj:
fobj.write(sha1) fobj.write(sha1)
ret = oe_hash_file + ':True' ret = oe_hash_file + ':True'