mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 18:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

devtool: update-recipe: enable var history tracking

Browse Source 
Enable variable history tracking so that the variables are updated in
the correct file - i.e. in the file they are already defined.

[YOCTO #7715]

(From OE-Core rev: b54796d013c562972e962126400503085281b425)

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Markus Lehtonen
2015-09-30 16:51:53 +03:00
committed by Richard Purdie
parent 979de7703c
commit f047ee8c95
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,7 +96,7 @@ def exec_fakeroot(d, cmd, **kwargs):
newenv[splitval[0]] = splitval[1] newenv[splitval[0]] = splitval[1]
return subprocess.call("%s %s" % (fakerootcmd, cmd), env=newenv, **kwargs) return subprocess.call("%s %s" % (fakerootcmd, cmd), env=newenv, **kwargs)
def setup_tinfoil(config_only=False, basepath=None): def setup_tinfoil(config_only=False, basepath=None, tracking=False):
"""Initialize tinfoil api from bitbake""" """Initialize tinfoil api from bitbake"""
import scriptpath import scriptpath
orig_cwd = os.path.abspath(os.curdir) orig_cwd = os.path.abspath(os.curdir)
@@ -108,7 +108,7 @@ def setup_tinfoil(config_only=False, basepath=None):
sys.exit(1) sys.exit(1)
import bb.tinfoil import bb.tinfoil
tinfoil = bb.tinfoil.Tinfoil() tinfoil = bb.tinfoil.Tinfoil(tracking=tracking)
tinfoil.prepare(config_only) tinfoil.prepare(config_only)
tinfoil.logger.setLevel(logger.getEffectiveLevel()) tinfoil.logger.setLevel(logger.getEffectiveLevel())
os.chdir(orig_cwd) os.chdir(orig_cwd)

2
scripts/lib/devtool/standard.py
View File

@@ -955,7 +955,7 @@ def update_recipe(args, config, basepath, workspace):
raise DevtoolError('conf/layer.conf not found in bbappend ' raise DevtoolError('conf/layer.conf not found in bbappend '
'destination layer "%s"' % args.append) 'destination layer "%s"' % args.append)
tinfoil = setup_tinfoil(basepath=basepath) tinfoil = setup_tinfoil(basepath=basepath, tracking=True)
rd = parse_recipe(config, tinfoil, args.recipename, True) rd = parse_recipe(config, tinfoil, args.recipename, True)
if not rd: if not rd: