mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-28 06:32:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

devtool: fix upgrade for recipes with git submodules

Browse Source 
Fixes [YOCTO #15943]

Fixes invalid path argument while calling "git rev-list" from submodule folders.
Replaced the local __run() wrapper function with _run() at "git rev-list" command calls.

(From OE-Core rev: c1839a24f08a87984d475d23f37a7c923d424267)

Signed-off-by: Tobias Pistora <pistora.tobias@gmail.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Tobias Pistora
2025-08-13 11:20:41 +02:00
committed by Richard Purdie
parent 0edb9bfda1
commit 4c7b000732
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/lib/devtool/upgrade.py
View File

@@ -280,7 +280,7 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee
# note is still attached to the old commit. Avoid this by making
# sure all old devtool related commits have a note attached to them
# (this assumes git config notes.rewriteMode is set to ignore).
(stdout, _) = __run('git rev-list devtool-base..%s' % target_branch)
(stdout, _) = _run('git rev-list devtool-base..%s' % target_branch, cwd=path)
for rev in stdout.splitlines():
if not oe.patch.GitApplyTree.getNotes(path, rev):
oe.patch.GitApplyTree.addNote(path, rev, "dummy")
@@ -298,7 +298,7 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee
logger.warning('Command \'%s\' failed:\n%s' % (e.command, e.stdout))
# Remove any dummy notes added above.
(stdout, _) = __run('git rev-list devtool-base..%s' % target_branch)
(stdout, _) = _run('git rev-list devtool-base..%s' % target_branch, cwd=path)
for rev in stdout.splitlines():
oe.patch.GitApplyTree.removeNote(path, rev, "dummy")