diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-04-19 11:00:41 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-04-30 14:37:25 +0100 |
commit | 692b2ffa924a8e5c73a50431b068fb2f25452cb7 (patch) | |
tree | 2bc03cebd9047691298725f5b4d10d9b2302b0ff /scripts | |
parent | 1a3ffc03d5fdee2b5c8b0874f238be3f7bf79eb8 (diff) | |
download | poky-692b2ffa924a8e5c73a50431b068fb2f25452cb7.tar.gz |
scripts/oe-debuginfod: correct several issues
Particularly:
- nesting subprocess.run() inside subprocess.check_output() does not work at all.
How was this tested?
- -R and -U options can be combined; no need to separate the invocations based
on packaging format
- both exception handlers are unnecessary; we can simply print the hint if
invocation did not succeed
- to run debuginfod from its own sysroot, '-c addto_recipe_sysroot' for elfutils-native
must be executed
(From OE-Core rev: 77deac8501990ac8071eb11d4bec6aec4be948b7)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9e57bf636ec63e74d56f1ac48b5a27c5b80f1877)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/oe-debuginfod | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/scripts/oe-debuginfod b/scripts/oe-debuginfod index 967dd5807c..5560769888 100755 --- a/scripts/oe-debuginfod +++ b/scripts/oe-debuginfod | |||
@@ -20,12 +20,7 @@ if __name__ == "__main__": | |||
20 | package_classes_var = "DEPLOY_DIR_" + tinfoil.config_data.getVar("PACKAGE_CLASSES").split()[0].replace("package_", "").upper() | 20 | package_classes_var = "DEPLOY_DIR_" + tinfoil.config_data.getVar("PACKAGE_CLASSES").split()[0].replace("package_", "").upper() |
21 | feed_dir = tinfoil.config_data.getVar(package_classes_var, expand=True) | 21 | feed_dir = tinfoil.config_data.getVar(package_classes_var, expand=True) |
22 | 22 | ||
23 | try: | 23 | subprocess.call(['bitbake', '-c', 'addto_recipe_sysroot', 'elfutils-native']) |
24 | if package_classes_var == "DEPLOY_DIR_RPM": | 24 | |
25 | subprocess.check_output(subprocess.run(['oe-run-native', 'elfutils-native', 'debuginfod', '--verbose', '-R', feed_dir])) | 25 | subprocess.call(['oe-run-native', 'elfutils-native', 'debuginfod', '--verbose', '-R', '-U', feed_dir]) |
26 | else: | 26 | print("\nTo use the debuginfod server please ensure that this variable PACKAGECONFIG_pn-elfutils-native = \"debuginfod libdebuginfod\" is set in the local.conf") |
27 | subprocess.check_output(subprocess.run(['oe-run-native', 'elfutils-native', 'debuginfod', '--verbose', '-U', feed_dir])) | ||
28 | except subprocess.CalledProcessError: | ||
29 | print("\nTo use the debuginfod server Please ensure that this variable PACKAGECONFIG_pn-elfutils-native = \"debuginfod libdebuginfod\" is set in the local.conf") | ||
30 | except KeyboardInterrupt: | ||
31 | sys.exit(1) | ||