summaryrefslogtreecommitdiffstats
path: root/scripts/lib/devtool
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-04-27 10:53:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-27 15:05:52 +0100
commite8db1ccef362e11a0736b3e1b89555dcf2a7dfa1 (patch)
treeffcb1eebb59e186f39cfc748d8111f42810564c9 /scripts/lib/devtool
parentf1f9fab266503eb81aa624b98b8577e5fe3ad5b6 (diff)
downloadpoky-e8db1ccef362e11a0736b3e1b89555dcf2a7dfa1.tar.gz
devtool: add: use correct bbappend file name with -V option
We weren't adding the version into the bbappend file name when -V was specified which meant that building or resetting failed. Also adjust one of the tests so that we're testing devtool add both with and without this option. Fixes [YOCTO #7647]. (From OE-Core rev: bdbeff0cd342e31053d7203d78fc5dda611052b1) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool')
-rw-r--r--scripts/lib/devtool/standard.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index faf5c92176..893226578a 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -73,7 +73,7 @@ def add(args, config, basepath, workspace):
73 (stdout, _) = bb.process.run('git rev-parse HEAD', cwd=srctree) 73 (stdout, _) = bb.process.run('git rev-parse HEAD', cwd=srctree)
74 initial_rev = stdout.rstrip() 74 initial_rev = stdout.rstrip()
75 75
76 appendfile = os.path.join(appendpath, '%s.bbappend' % args.recipename) 76 appendfile = os.path.join(appendpath, '%s.bbappend' % bp)
77 with open(appendfile, 'w') as f: 77 with open(appendfile, 'w') as f:
78 f.write('inherit externalsrc\n') 78 f.write('inherit externalsrc\n')
79 f.write('EXTERNALSRC = "%s"\n' % srctree) 79 f.write('EXTERNALSRC = "%s"\n' % srctree)