diff options
author | Ross Burton <ross.burton@arm.com> | 2022-10-10 12:42:19 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-09 17:42:08 +0000 |
commit | ea5e17bf05c7445736ba28c24d7b3caea6803271 (patch) | |
tree | 93601804e519876efdb1c54bd88269cd0acc438b /scripts/oe-check-sstate | |
parent | d9f78277fc64ca94d987ba1e7a3d325f9dbba914 (diff) | |
download | poky-ea5e17bf05c7445736ba28c24d7b3caea6803271.tar.gz |
scripts/oe-check-sstate: cleanup
The scriptutils import isn't used, there's no need to run bitbake
in a shell environment, and invoke bitbake as a list instead of a
string.
(From OE-Core rev: 4b9946bd3961679048e1460bdfc74b286c386feb)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 663aa284adf312eb5c8a471e5dbff2634e87897d)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/oe-check-sstate')
-rwxr-xr-x | scripts/oe-check-sstate | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/scripts/oe-check-sstate b/scripts/oe-check-sstate index f4cc5869de..7f9f835da4 100755 --- a/scripts/oe-check-sstate +++ b/scripts/oe-check-sstate | |||
@@ -18,7 +18,6 @@ import re | |||
18 | scripts_path = os.path.dirname(os.path.realpath(__file__)) | 18 | scripts_path = os.path.dirname(os.path.realpath(__file__)) |
19 | lib_path = scripts_path + '/lib' | 19 | lib_path = scripts_path + '/lib' |
20 | sys.path = sys.path + [lib_path] | 20 | sys.path = sys.path + [lib_path] |
21 | import scriptutils | ||
22 | import scriptpath | 21 | import scriptpath |
23 | scriptpath.add_bitbake_lib_path() | 22 | scriptpath.add_bitbake_lib_path() |
24 | import argparse_oe | 23 | import argparse_oe |
@@ -51,11 +50,8 @@ def check(args): | |||
51 | env['TMPDIR:forcevariable'] = tmpdir | 50 | env['TMPDIR:forcevariable'] = tmpdir |
52 | 51 | ||
53 | try: | 52 | try: |
54 | output = subprocess.check_output( | 53 | cmd = ['bitbake', '--dry-run'] + args.target |
55 | 'bitbake -n %s' % ' '.join(args.target), | 54 | output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, env=env) |
56 | stderr=subprocess.STDOUT, | ||
57 | env=env, | ||
58 | shell=True) | ||
59 | 55 | ||
60 | task_re = re.compile('NOTE: Running setscene task [0-9]+ of [0-9]+ \(([^)]+)\)') | 56 | task_re = re.compile('NOTE: Running setscene task [0-9]+ of [0-9]+ \(([^)]+)\)') |
61 | tasks = [] | 57 | tasks = [] |