diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2021-04-19 11:00:41 +0200 |
|---|---|---|
| committer |   Anuj Mittal <anuj.mittal@intel.com> | 2021-04-23 16:14:22 +0800 |
| commit | 77deac8501990ac8071eb11d4bec6aec4be948b7 (patch) | |
| tree | 1181d8e6616ceadd8ed6ea48da956974be612870 /scripts | |
| parent | 84afcdcb9d7ee24596bd3f8d808d30c9d558d918 (diff) | |
| download | openembedded-core-contrib-77deac8501990ac8071eb11d4bec6aec4be948b7.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
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>
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__": package_classes_var = "DEPLOY_DIR_" + tinfoil.config_data.getVar("PACKAGE_CLASSES").split()[0].replace("package_", "").upper() feed_dir = tinfoil.config_data.getVar(package_classes_var, expand=True) - try: - if package_classes_var == "DEPLOY_DIR_RPM": - subprocess.check_output(subprocess.run(['oe-run-native', 'elfutils-native', 'debuginfod', '--verbose', '-R', feed_dir])) - else: - subprocess.check_output(subprocess.run(['oe-run-native', 'elfutils-native', 'debuginfod', '--verbose', '-U', feed_dir])) - except subprocess.CalledProcessError: - print("\nTo use the debuginfod server Please ensure that this variable PACKAGECONFIG_pn-elfutils-native = \"debuginfod libdebuginfod\" is set in the local.conf") - except KeyboardInterrupt: - sys.exit(1) + subprocess.call(['bitbake', '-c', 'addto_recipe_sysroot', 'elfutils-native']) + + subprocess.call(['oe-run-native', 'elfutils-native', 'debuginfod', '--verbose', '-R', '-U', feed_dir]) + print("\nTo use the debuginfod server please ensure that this variable PACKAGECONFIG_pn-elfutils-native = \"debuginfod libdebuginfod\" is set in the local.conf") |