From 315b078fe8142e9d609e65a05c12f3a5cc4f38ce Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Thu, 25 Jun 2020 20:03:13 +0200 Subject: Drop using patchelf out of PATH New patchelf 0.11 release is out and it has fixes hitting us in both 0.9 and 0.10 on different binaries. So let's simply requiring having patchelf 0.11 in all cases and be done with it (actually, if not running 4G binaries, using 0.9 is enough). Related: OS#4389 Change-Id: I2701e46e7710db4c923a68e6b3a2f3c7b126f356 --- src/osmo_gsm_tester/obj/ms_amarisoft.py | 1 - src/osmo_gsm_tester/obj/ms_srs.py | 1 - 2 files changed, 2 deletions(-) (limited to 'src/osmo_gsm_tester') diff --git a/src/osmo_gsm_tester/obj/ms_amarisoft.py b/src/osmo_gsm_tester/obj/ms_amarisoft.py index b2dc9c7..565786b 100644 --- a/src/osmo_gsm_tester/obj/ms_amarisoft.py +++ b/src/osmo_gsm_tester/obj/ms_amarisoft.py @@ -145,7 +145,6 @@ class AmarisoftUE(MS): # setting capabilities will later disable use of LD_LIBRARY_PATH from ELF loader -> modify RPATH instead. self.log('Setting RPATH for ltetue') # patchelf >= 0.10 is required to support passing several files at once: - self.rem_host.set_remote_env({'PATCHELF_BIN': '/opt/bin/patchelf-v0.10' }) self.rem_host.change_elf_rpath(remote_binary, str(self.remote_inst)) # We also need to patch the arch-optimized binaries that lteue() will exec() into: self.rem_host.change_elf_rpath(self.remote_inst.child('', 'lteue-*'), str(self.remote_inst)) diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py index 04df1ba..9f77bb6 100644 --- a/src/osmo_gsm_tester/obj/ms_srs.py +++ b/src/osmo_gsm_tester/obj/ms_srs.py @@ -176,7 +176,6 @@ class srsUE(MS): # setting capabilities will later disable use of LD_LIBRARY_PATH from ELF loader -> modify RPATH instead. self.log('Setting RPATH for srsue') # srsue binary needs patchelf >= 0.9+52 to avoid failing during patch. OS#4389, patchelf-GH#192. - self.rem_host.set_remote_env({'PATCHELF_BIN': '/opt/bin/patchelf-v0.10' }) self.rem_host.change_elf_rpath(remote_binary, remote_lib) # srsue requires CAP_SYS_ADMIN to jump to net network namespace: netns(CLONE_NEWNET): -- cgit v1.2.3