<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19016">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Drop using patchelf out of PATH<br><br>New patchelf 0.11 release is out and it has fixes hitting us in both 0.9<br>and 0.10 on different binaries. So let's simply requiring having<br>patchelf 0.11 in all cases and be done with it (actually, if not running<br>4G binaries, using 0.9 is enough).<br><br>Related: OS#4389<br>Change-Id: I2701e46e7710db4c923a68e6b3a2f3c7b126f356<br>---<br>M src/osmo_gsm_tester/obj/ms_amarisoft.py<br>M src/osmo_gsm_tester/obj/ms_srs.py<br>2 files changed, 0 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/16/19016/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/obj/ms_amarisoft.py b/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>index b2dc9c7..565786b 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_amarisoft.py</span><br><span>@@ -145,7 +145,6 @@</span><br><span>         # setting capabilities will later disable use of LD_LIBRARY_PATH from ELF loader -> modify RPATH instead.</span><br><span>         self.log('Setting RPATH for ltetue')</span><br><span>         # patchelf >= 0.10 is required to support passing several files at once:</span><br><span style="color: hsl(0, 100%, 40%);">-        self.rem_host.set_remote_env({'PATCHELF_BIN': '/opt/bin/patchelf-v0.10' })</span><br><span>         self.rem_host.change_elf_rpath(remote_binary, str(self.remote_inst))</span><br><span>         # We also need to patch the arch-optimized binaries that lteue() will exec() into:</span><br><span>         self.rem_host.change_elf_rpath(self.remote_inst.child('', 'lteue-*'), str(self.remote_inst))</span><br><span>diff --git a/src/osmo_gsm_tester/obj/ms_srs.py b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>index 04df1ba..9f77bb6 100644</span><br><span>--- a/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>+++ b/src/osmo_gsm_tester/obj/ms_srs.py</span><br><span>@@ -176,7 +176,6 @@</span><br><span>         # setting capabilities will later disable use of LD_LIBRARY_PATH from ELF loader -> modify RPATH instead.</span><br><span>         self.log('Setting RPATH for srsue')</span><br><span>         # srsue binary needs patchelf >= 0.9+52 to avoid failing during patch. OS#4389, patchelf-GH#192.</span><br><span style="color: hsl(0, 100%, 40%);">-        self.rem_host.set_remote_env({'PATCHELF_BIN': '/opt/bin/patchelf-v0.10' })</span><br><span>         self.rem_host.change_elf_rpath(remote_binary, remote_lib)</span><br><span> </span><br><span>         # srsue requires CAP_SYS_ADMIN to jump to net network namespace: netns(CLONE_NEWNET):</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19016">change 19016</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-gsm-tester/+/19016"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I2701e46e7710db4c923a68e6b3a2f3c7b126f356 </div>
<div style="display:none"> Gerrit-Change-Number: 19016 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>