mirror of
https://git.yoctoproject.org/poky
synced 2026-04-18 21:32:12 +02:00
devtool: standard: Expand SRCREV before using it in _update_recipe_srcrev
If SRCREV contains a variable reference, any devtool command that
would try to update it would fail. E.g., if SRCREV = "R${PV}", then
devtool finish without having committed any changes would fail with:
oe.patch.CmdError: Command Error: 'sh -c 'git format-patch R${PV} -o
/tmp/oepatchb_doareb -- .'' exited with 0 Output:
fatal: bad revision 'R'
(From OE-Core rev: 094499c819722ad698ccb64ec65dd439b211c31c)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
aff0179aab
commit
ede79dea7c
@@ -1298,7 +1298,7 @@ def _update_recipe_srcrev(srctree, rd, appendlayerdir, wildcard_version, no_remo
|
||||
if not no_remove:
|
||||
# Find list of existing patches in recipe file
|
||||
patches_dir = tempfile.mkdtemp(dir=tempdir)
|
||||
old_srcrev = (rd.getVar('SRCREV', False) or '')
|
||||
old_srcrev = rd.getVar('SRCREV') or ''
|
||||
upd_p, new_p, del_p = _export_patches(srctree, rd, old_srcrev,
|
||||
patches_dir)
|
||||
logger.debug('Patches: update %s, new %s, delete %s' % (dict(upd_p), dict(new_p), dict(del_p)))
|
||||
|
||||
Reference in New Issue
Block a user