summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/lib/oeqa/selftest/devtool.py4
-rw-r--r--scripts/lib/devtool/standard.py2
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):
150 result = runCmd('tar xfv libftdi1-1.1.tar.bz2', cwd=tempdir) 150 result = runCmd('tar xfv libftdi1-1.1.tar.bz2', cwd=tempdir)
151 srcdir = os.path.join(tempdir, 'libftdi1-1.1') 151 srcdir = os.path.join(tempdir, 'libftdi1-1.1')
152 self.assertTrue(os.path.isfile(os.path.join(srcdir, 'CMakeLists.txt')), 'Unable to find CMakeLists.txt in source directory') 152 self.assertTrue(os.path.isfile(os.path.join(srcdir, 'CMakeLists.txt')), 'Unable to find CMakeLists.txt in source directory')
153 # Test devtool add 153 # Test devtool add (and use -V so we test that too)
154 self.track_for_cleanup(workspacedir) 154 self.track_for_cleanup(workspacedir)
155 self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') 155 self.add_command_to_tearDown('bitbake-layers remove-layer */workspace')
156 result = runCmd('devtool add libftdi %s' % srcdir) 156 result = runCmd('devtool add libftdi %s -V 1.1' % srcdir)
157 self.assertTrue(os.path.exists(os.path.join(workspacedir, 'conf', 'layer.conf')), 'Workspace directory not created') 157 self.assertTrue(os.path.exists(os.path.join(workspacedir, 'conf', 'layer.conf')), 'Workspace directory not created')
158 # Test devtool status 158 # Test devtool status
159 result = runCmd('devtool status') 159 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):
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)