diff options
author | Adrian Freihofer <adrian.freihofer@gmail.com> | 2024-02-25 21:47:02 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-27 11:38:46 +0000 |
commit | c82c57621be1447ff2bceb89f232de05b2b6f3a3 (patch) | |
tree | 61f2c5f883b8a1b66b156bcb2cc6ad39451a68d1 | |
parent | a5b75e29ff1163f433a707506161943289e98d6c (diff) | |
download | poky-c82c57621be1447ff2bceb89f232de05b2b6f3a3.tar.gz |
devtool: ide-sdk prefer sources from workspace
Improve the previous commit:
- log an error if some assumptions are not true
- Use TARGET_DBGSRC_DIR variable
- Do the same for ide none
Why the additional source mapping is required:
For example the cmake-example recipe refers to sources like this:
./recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-readelf \
-wi image/usr/bin/cmake-example | grep -B1 DW_AT_comp_dir
...
<560> DW_AT_name : (indirect line string, offset: 0x1da):
/usr/src/debug/cmake-example/1.0/oe-local-files/cpp-example.cpp
...
Another example is powertop:
./recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-readelf \
-wi image/usr/sbin/powertop | grep -B1 DW_AT_comp_dir
...
<561> DW_AT_name : (indirect line string, offset: 0x1da):
/usr/src/debug/powertop/2.15/src/devlist.cpp
...
For recipes with local files this works. The oe-local-files folder is
not available in the rootfs-dbg and therefore the sources are first
found in the workspace folder. GDB searches for source files in various
places:
https://sourceware.org/gdb/current/onlinedocs/gdb.html/Source-Path.html
However, for the powertop example the sources opened in the editor are
from the rootfs-dbg instead of from the workspace.
Bitbake calls the compiler with
-fmacro-prefix-map=${S}=${TARGET_DBGSRC_DIR}
where TARGET_DBGSRC_DIR defaults to "/usr/src/debug/${PN}/${PV}".
A source map which maps the recipe specific path from TARGET_DBGSRC_DIR
to the workspace fixes this.
The already existing source map for /usr/src/debug applies for all other
recipes. It finds the sources (read only) in the rootfs-dbg folder.
(From OE-Core rev: 06601632c1879cb80276f9b36de91fb7808311a5)
Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | scripts/lib/devtool/ide_plugins/__init__.py | 19 | ||||
-rw-r--r-- | scripts/lib/devtool/ide_plugins/ide_code.py | 16 | ||||
-rwxr-xr-x | scripts/lib/devtool/ide_sdk.py | 3 |
3 files changed, 32 insertions, 6 deletions
diff --git a/scripts/lib/devtool/ide_plugins/__init__.py b/scripts/lib/devtool/ide_plugins/__init__.py index 02707bfc37..19c2f61c5f 100644 --- a/scripts/lib/devtool/ide_plugins/__init__.py +++ b/scripts/lib/devtool/ide_plugins/__init__.py | |||
@@ -134,8 +134,23 @@ class GdbCrossConfig: | |||
134 | if self.image_recipe.rootfs_dbg: | 134 | if self.image_recipe.rootfs_dbg: |
135 | gdbinit_lines.append( | 135 | gdbinit_lines.append( |
136 | 'set solib-search-path "' + self.modified_recipe.solib_search_path_str(self.image_recipe) + '"') | 136 | 'set solib-search-path "' + self.modified_recipe.solib_search_path_str(self.image_recipe) + '"') |
137 | gdbinit_lines.append('set substitute-path "/usr/src/debug" "' + os.path.join( | 137 | # First: Search for sources of this recipe in the workspace folder |
138 | self.image_recipe.rootfs_dbg, 'usr', 'src', 'debug') + '"') | 138 | if self.modified_recipe.pn in self.modified_recipe.target_dbgsrc_dir: |
139 | gdbinit_lines.append('set substitute-path "%s" "%s"' % | ||
140 | (self.modified_recipe.target_dbgsrc_dir, self.modified_recipe.real_srctree)) | ||
141 | else: | ||
142 | logger.error( | ||
143 | "TARGET_DBGSRC_DIR must contain the recipe name PN.") | ||
144 | # Second: Search for sources of other recipes in the rootfs-dbg | ||
145 | if self.modified_recipe.target_dbgsrc_dir.startswith("/usr/src/debug"): | ||
146 | gdbinit_lines.append('set substitute-path "/usr/src/debug" "%s"' % os.path.join( | ||
147 | self.image_recipe.rootfs_dbg, "usr", "src", "debug")) | ||
148 | else: | ||
149 | logger.error( | ||
150 | "TARGET_DBGSRC_DIR must start with /usr/src/debug.") | ||
151 | else: | ||
152 | logger.warning( | ||
153 | "Cannot setup debug symbols configuration for GDB. IMAGE_GEN_DEBUGFS is not enabled.") | ||
139 | gdbinit_lines.append( | 154 | gdbinit_lines.append( |
140 | '%s %s:%d' % (remote_cmd, self.gdb_cross.host, self.gdbserver_port)) | 155 | '%s %s:%d' % (remote_cmd, self.gdb_cross.host, self.gdbserver_port)) |
141 | gdbinit_lines.append('set remote exec-file ' + self.binary) | 156 | gdbinit_lines.append('set remote exec-file ' + self.binary) |
diff --git a/scripts/lib/devtool/ide_plugins/ide_code.py b/scripts/lib/devtool/ide_plugins/ide_code.py index 09f0bb2a07..a62b93224e 100644 --- a/scripts/lib/devtool/ide_plugins/ide_code.py +++ b/scripts/lib/devtool/ide_plugins/ide_code.py | |||
@@ -242,9 +242,19 @@ class IdeVSCode(IdeBase): | |||
242 | if gdb_cross_config.image_recipe.rootfs_dbg: | 242 | if gdb_cross_config.image_recipe.rootfs_dbg: |
243 | launch_config['additionalSOLibSearchPath'] = modified_recipe.solib_search_path_str( | 243 | launch_config['additionalSOLibSearchPath'] = modified_recipe.solib_search_path_str( |
244 | gdb_cross_config.image_recipe) | 244 | gdb_cross_config.image_recipe) |
245 | src_file_map[os.path.join("/usr/src/debug", modified_recipe.pn, modified_recipe.pv)] = "${workspaceFolder}" | 245 | # First: Search for sources of this recipe in the workspace folder |
246 | src_file_map["/usr/src/debug"] = os.path.join( | 246 | if modified_recipe.pn in modified_recipe.target_dbgsrc_dir: |
247 | gdb_cross_config.image_recipe.rootfs_dbg, "usr", "src", "debug") | 247 | src_file_map[modified_recipe.target_dbgsrc_dir] = "${workspaceFolder}" |
248 | else: | ||
249 | logger.error( | ||
250 | "TARGET_DBGSRC_DIR must contain the recipe name PN.") | ||
251 | # Second: Search for sources of other recipes in the rootfs-dbg | ||
252 | if modified_recipe.target_dbgsrc_dir.startswith("/usr/src/debug"): | ||
253 | src_file_map["/usr/src/debug"] = os.path.join( | ||
254 | gdb_cross_config.image_recipe.rootfs_dbg, "usr", "src", "debug") | ||
255 | else: | ||
256 | logger.error( | ||
257 | "TARGET_DBGSRC_DIR must start with /usr/src/debug.") | ||
248 | else: | 258 | else: |
249 | logger.warning( | 259 | logger.warning( |
250 | "Cannot setup debug symbols configuration for GDB. IMAGE_GEN_DEBUGFS is not enabled.") | 260 | "Cannot setup debug symbols configuration for GDB. IMAGE_GEN_DEBUGFS is not enabled.") |
diff --git a/scripts/lib/devtool/ide_sdk.py b/scripts/lib/devtool/ide_sdk.py index 289bbbf47c..7807b322b3 100755 --- a/scripts/lib/devtool/ide_sdk.py +++ b/scripts/lib/devtool/ide_sdk.py | |||
@@ -301,6 +301,7 @@ class RecipeModified: | |||
301 | self.staging_incdir = None | 301 | self.staging_incdir = None |
302 | self.strip_cmd = None | 302 | self.strip_cmd = None |
303 | self.target_arch = None | 303 | self.target_arch = None |
304 | self.target_dbgsrc_dir = None | ||
304 | self.topdir = None | 305 | self.topdir = None |
305 | self.workdir = None | 306 | self.workdir = None |
306 | self.recipe_id = None | 307 | self.recipe_id = None |
@@ -357,7 +358,6 @@ class RecipeModified: | |||
357 | 'PACKAGE_DEBUG_SPLIT_STYLE') | 358 | 'PACKAGE_DEBUG_SPLIT_STYLE') |
358 | self.path = recipe_d.getVar('PATH') | 359 | self.path = recipe_d.getVar('PATH') |
359 | self.pn = recipe_d.getVar('PN') | 360 | self.pn = recipe_d.getVar('PN') |
360 | self.pv = recipe_d.getVar('PV') | ||
361 | self.recipe_sysroot = os.path.realpath( | 361 | self.recipe_sysroot = os.path.realpath( |
362 | recipe_d.getVar('RECIPE_SYSROOT')) | 362 | recipe_d.getVar('RECIPE_SYSROOT')) |
363 | self.recipe_sysroot_native = os.path.realpath( | 363 | self.recipe_sysroot_native = os.path.realpath( |
@@ -368,6 +368,7 @@ class RecipeModified: | |||
368 | recipe_d.getVar('STAGING_INCDIR')) | 368 | recipe_d.getVar('STAGING_INCDIR')) |
369 | self.strip_cmd = recipe_d.getVar('STRIP') | 369 | self.strip_cmd = recipe_d.getVar('STRIP') |
370 | self.target_arch = recipe_d.getVar('TARGET_ARCH') | 370 | self.target_arch = recipe_d.getVar('TARGET_ARCH') |
371 | self.target_dbgsrc_dir = recipe_d.getVar('TARGET_DBGSRC_DIR') | ||
371 | self.topdir = recipe_d.getVar('TOPDIR') | 372 | self.topdir = recipe_d.getVar('TOPDIR') |
372 | self.workdir = os.path.realpath(recipe_d.getVar('WORKDIR')) | 373 | self.workdir = os.path.realpath(recipe_d.getVar('WORKDIR')) |
373 | 374 | ||