summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2015-09-30 16:51:53 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-01 14:13:47 +0100
commitb54796d013c562972e962126400503085281b425 (patch)
tree266a795ced74ba74b5f3c11487afdee3720ca563
parent16957f5f1de0f1fb4052d5aef93ee10c893f4a38 (diff)
downloadopenembedded-core-contrib-b54796d013c562972e962126400503085281b425.tar.gz
openembedded-core-contrib-b54796d013c562972e962126400503085281b425.tar.bz2
openembedded-core-contrib-b54796d013c562972e962126400503085281b425.zip
devtool: update-recipe: enable var history tracking
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] Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/devtool/__init__.py4
-rw-r--r--scripts/lib/devtool/standard.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py
index c8c30202b1..50604e6e0d 100644
--- a/scripts/lib/devtool/__init__.py
+++ b/scripts/lib/devtool/__init__.py
@@ -96,7 +96,7 @@ def exec_fakeroot(d, cmd, **kwargs):
newenv[splitval[0]] = splitval[1]
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"""
import scriptpath
orig_cwd = os.path.abspath(os.curdir)
@@ -108,7 +108,7 @@ def setup_tinfoil(config_only=False, basepath=None):
sys.exit(1)
import bb.tinfoil
- tinfoil = bb.tinfoil.Tinfoil()
+ tinfoil = bb.tinfoil.Tinfoil(tracking=tracking)
tinfoil.prepare(config_only)
tinfoil.logger.setLevel(logger.getEffectiveLevel())
os.chdir(orig_cwd)
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 20eafec052..b455a2271d 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -955,7 +955,7 @@ def update_recipe(args, config, basepath, workspace):
raise DevtoolError('conf/layer.conf not found in bbappend '
'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)
if not rd: