diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-02-11 14:13:31 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-11 12:33:03 +0000 |
commit | fa50153bc2c7949a6251e9d5e9b6e97869f07482 (patch) | |
tree | 77f64ddf32f82cd33037efe991b89b80ac020c9e /meta/lib | |
parent | f767757b3ea87ef953558514256fd5e8c93c5f97 (diff) | |
download | poky-fa50153bc2c7949a6251e9d5e9b6e97869f07482.tar.gz |
devtool: modify: make -x the default behaviour
It's going to be more common for users not to have the prepared source
tree for a recipe already, so the default behaviour ought to be to
extract it for them from the recipe. Change the default to extract
(effectively making the -x option a no-op) and add a --no-extract/-n
option to disable it. Later we can look at trying to be smart and
reusing an existing source tree instead of erroring out if it exists;
for now this is just the default reversal.
(From OE-Core rev: 80a44e52609a89d9ffe816181ae193af491c06ac)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/selftest/devtool.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/devtool.py b/meta/lib/oeqa/selftest/devtool.py index d95cb08749..345cabbda9 100644 --- a/meta/lib/oeqa/selftest/devtool.py +++ b/meta/lib/oeqa/selftest/devtool.py | |||
@@ -570,7 +570,8 @@ class DevtoolTests(DevtoolBase): | |||
570 | self.track_for_cleanup(self.workspacedir) | 570 | self.track_for_cleanup(self.workspacedir) |
571 | self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') | 571 | self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') |
572 | # (don't bother with cleaning the recipe on teardown, we won't be building it) | 572 | # (don't bother with cleaning the recipe on teardown, we won't be building it) |
573 | result = runCmd('devtool modify %s -x %s' % (testrecipe, tempdir)) | 573 | # We don't use -x here so that we test the behaviour of devtool modify without it |
574 | result = runCmd('devtool modify %s %s' % (testrecipe, tempdir)) | ||
574 | # Check git repo | 575 | # Check git repo |
575 | self._check_src_repo(tempdir) | 576 | self._check_src_repo(tempdir) |
576 | # Add a couple of commits | 577 | # Add a couple of commits |