diff options
| author | Patrik Teivonen <patrik.teivonen@qt.io> | 2022-10-17 12:12:20 +0300 |
|---|---|---|
| committer | Patrik Teivonen <patrik.teivonen@qt.io> | 2023-03-07 13:34:46 +0000 |
| commit | 4fb4a4b8d93e6defe3537909188f42c5bc3f7c89 (patch) | |
| tree | 6137c7f832da10bcbaea54eb7e801252a8c022be /packaging-tools/sdkcomponent.py | |
| parent | 79eaf24084f9040e5a15ad63216e9d5a55e3d928 (diff) | |
bldinstallercommon.py: Refactor RPATH/RUNPATH patching
Simplify RPATH/RUNPATH patching functionality.
Make calculate_relpath() use pathlib.
Remove unreliable length check, chrpath fails with the error msg.
Improve unit tests, add some test ELF binaries.
Fix certain input not producing correct relative output paths.
Task-number: QTBUG-106027
Change-Id: I33f89f934215d456b428713471db1fe5d89abbd8
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'packaging-tools/sdkcomponent.py')
| -rw-r--r-- | packaging-tools/sdkcomponent.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/packaging-tools/sdkcomponent.py b/packaging-tools/sdkcomponent.py index 5562082d6..1f493a4ee 100644 --- a/packaging-tools/sdkcomponent.py +++ b/packaging-tools/sdkcomponent.py @@ -574,8 +574,6 @@ def parse_ifw_sdk_archives( # 2) parent components 'target_install_base'. (1) takes priority target_install_dir = config_subst.get("target_install_dir", "") rpath_target = config_subst.get("rpath_target") - if rpath_target and not rpath_target.startswith(os.sep): - rpath_target = os.sep + rpath_target component_sha1_file = config_subst.get("component_sha1_file") archive_name = config_subst.get("archive_name") payload = IfwPayloadItem( |