<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/17540">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-gsm-tester: Use non 'inst' name as target install dir, and remove it once archived<br><br>osmo-gsm-tester uses also the "inst/" directory, so using that name to<br>install from cmake is not a good idea here, since they will end up in<br>the same directory under /tmp/trial/inst.<br>Also, make sure the temporary install dst directory is removed after<br>creating the archive, since at that point is no longer needed.<br><br>Change-Id: Ib6610487140f0703d5817241bc4a63027696c1d4<br>---<br>M osmo-gsm-tester/osmo-gsm-tester-master.sh<br>1 file changed, 4 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/40/17540/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmo-gsm-tester/osmo-gsm-tester-master.sh b/osmo-gsm-tester/osmo-gsm-tester-master.sh</span><br><span>index bd8a659..1636482 100755</span><br><span>--- a/osmo-gsm-tester/osmo-gsm-tester-master.sh</span><br><span>+++ b/osmo-gsm-tester/osmo-gsm-tester-master.sh</span><br><span>@@ -18,16 +18,17 @@</span><br><span>                 exit 1</span><br><span>         fi</span><br><span>         pushd "/tmp/trial"</span><br><span style="color: hsl(0, 100%, 40%);">-        rm -rf inst && mkdir inst</span><br><span style="color: hsl(120, 100%, 40%);">+        rm -rf sysroot && mkdir sysroot</span><br><span>         rm -rf build && mkdir build && cd build || exit 1</span><br><span style="color: hsl(0, 100%, 40%);">-        cmake -DCMAKE_INSTALL_PREFIX="../inst/" "${git_repo_dir}"</span><br><span style="color: hsl(120, 100%, 40%);">+        cmake -DCMAKE_INSTALL_PREFIX="../sysroot/" "${git_repo_dir}"</span><br><span>         set +x; echo; echo; set -x</span><br><span>         make "-j$(nproc)"</span><br><span>         set +x; echo; echo; set -x</span><br><span>         make install</span><br><span>         this="srslte.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}"</span><br><span>         tar="${this}.tgz"</span><br><span style="color: hsl(0, 100%, 40%);">-        tar czf "/tmp/trial/$tar" -C "/tmp/trial/inst" .</span><br><span style="color: hsl(120, 100%, 40%);">+        tar czf "/tmp/trial/$tar" -C "/tmp/trial/sysroot" .</span><br><span style="color: hsl(120, 100%, 40%);">+        rm -rf "/tmp/trial/sysroot"</span><br><span>         cd "/tmp/trial/" && md5sum "$tar" >>checksums.md5</span><br><span>         popd</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/17540">change 17540</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/docker-playground/+/17540"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ib6610487140f0703d5817241bc4a63027696c1d4 </div>
<div style="display:none"> Gerrit-Change-Number: 17540 </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>