summaryrefslogtreecommitdiffstats
path: root/scripts
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 15:07:48 +0100
commitf047ee8c953526e4b571745fb91da3ce8522d758 (patch)
tree53129440414ddd4d69a1cc1a3ca76c61020ac3f7 /scripts
parent979de7703cf3e468aa2923da1445138e1c93d234 (diff)
downloadpoky-f047ee8c953526e4b571745fb91da3ce8522d758.tar.gz
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] (From OE-Core rev: b54796d013c562972e962126400503085281b425) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-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):
96 newenv[splitval[0]] = splitval[1] 96 newenv[splitval[0]] = splitval[1]
97 return subprocess.call("%s %s" % (fakerootcmd, cmd), env=newenv, **kwargs) 97 return subprocess.call("%s %s" % (fakerootcmd, cmd), env=newenv, **kwargs)
98 98
99def setup_tinfoil(config_only=False, basepath=None): 99def setup_tinfoil(config_only=False, basepath=None, tracking=False):
100 """Initialize tinfoil api from bitbake""" 100 """Initialize tinfoil api from bitbake"""
101 import scriptpath 101 import scriptpath
102 orig_cwd = os.path.abspath(os.curdir) 102 orig_cwd = os.path.abspath(os.curdir)
@@ -108,7 +108,7 @@ def setup_tinfoil(config_only=False, basepath=None):
108 sys.exit(1) 108 sys.exit(1)
109 109
110 import bb.tinfoil 110 import bb.tinfoil
111 tinfoil = bb.tinfoil.Tinfoil() 111 tinfoil = bb.tinfoil.Tinfoil(tracking=tracking)
112 tinfoil.prepare(config_only) 112 tinfoil.prepare(config_only)
113 tinfoil.logger.setLevel(logger.getEffectiveLevel()) 113 tinfoil.logger.setLevel(logger.getEffectiveLevel())
114 os.chdir(orig_cwd) 114 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):
955 raise DevtoolError('conf/layer.conf not found in bbappend ' 955 raise DevtoolError('conf/layer.conf not found in bbappend '
956 'destination layer "%s"' % args.append) 956 'destination layer "%s"' % args.append)
957 957
958 tinfoil = setup_tinfoil(basepath=basepath) 958 tinfoil = setup_tinfoil(basepath=basepath, tracking=True)
959 959
960 rd = parse_recipe(config, tinfoil, args.recipename, True) 960 rd = parse_recipe(config, tinfoil, args.recipename, True)
961 if not rd: 961 if not rd: