diff options
| author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-10-11 00:01:49 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-10-16 23:52:03 +0100 |
| commit | 094499c819722ad698ccb64ec65dd439b211c31c (patch) | |
| tree | 7460a3d6b5a413a8dc2b2b862e9349309a1057e9 /scripts | |
| parent | a3e9e7a38b3d9caed49380ebc05651a97f613c7c (diff) | |
| download | openembedded-core-094499c819722ad698ccb64ec65dd439b211c31c.tar.gz openembedded-core-094499c819722ad698ccb64ec65dd439b211c31c.tar.bz2 openembedded-core-094499c819722ad698ccb64ec65dd439b211c31c.zip | |
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'
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/devtool/standard.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 14e87b95a4..beea0d4c27 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -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))) |