diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-04-27 10:53:18 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-27 15:05:40 +0100 |
| commit | bdbeff0cd342e31053d7203d78fc5dda611052b1 (patch) | |
| tree | 585a5a2f7bbe4f85de7ea6a410b0b997ed9be582 | |
| parent | b9fd8d4d4dfae72de2e81e9b14de072e12cecdcf (diff) | |
| download | openembedded-core-bdbeff0cd342e31053d7203d78fc5dda611052b1.tar.gz openembedded-core-bdbeff0cd342e31053d7203d78fc5dda611052b1.tar.bz2 openembedded-core-bdbeff0cd342e31053d7203d78fc5dda611052b1.zip | |
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].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oeqa/selftest/devtool.py | 4 | ||||
| -rw-r--r-- | scripts/lib/devtool/standard.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py index 1a5eecd84c..68818359bc 100644 --- a/meta/lib/oeqa/selftest/devtool.py +++ b/meta/lib/oeqa/selftest/devtool.py @@ -150,10 +150,10 @@ class DevtoolTests(oeSelfTest): result = runCmd('tar xfv libftdi1-1.1.tar.bz2', cwd=tempdir) srcdir = os.path.join(tempdir, 'libftdi1-1.1') self.assertTrue(os.path.isfile(os.path.join(srcdir, 'CMakeLists.txt')), 'Unable to find CMakeLists.txt in source directory') - # Test devtool add + # Test devtool add (and use -V so we test that too) self.track_for_cleanup(workspacedir) self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') - result = runCmd('devtool add libftdi %s' % srcdir) + result = runCmd('devtool add libftdi %s -V 1.1' % srcdir) self.assertTrue(os.path.exists(os.path.join(workspacedir, 'conf', 'layer.conf')), 'Workspace directory not created') # Test devtool status result = runCmd('devtool status') 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): (stdout, _) = bb.process.run('git rev-parse HEAD', cwd=srctree) initial_rev = stdout.rstrip() - appendfile = os.path.join(appendpath, '%s.bbappend' % args.recipename) + appendfile = os.path.join(appendpath, '%s.bbappend' % bp) with open(appendfile, 'w') as f: f.write('inherit externalsrc\n') f.write('EXTERNALSRC = "%s"\n' % srctree) |