Change in docker-playground[master]: osmo-gsm-tester: Use non 'inst' name as target install dir, and remov...

[pespin]

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/17540 )

Change subject: osmo-gsm-tester: Use non 'inst' name as target install dir, and remove it once archived
......................................................................

osmo-gsm-tester: Use non 'inst' name as target install dir, and remove it once archived

osmo-gsm-tester uses also the "inst/" directory, so using that name to
install from cmake is not a good idea here, since they will end up in
the same directory under /tmp/trial/inst.
Also, make sure the temporary install dst directory is removed after
creating the archive, since at that point is no longer needed.

Change-Id: Ib6610487140f0703d5817241bc4a63027696c1d4
---
M osmo-gsm-tester/osmo-gsm-tester-master.sh
1 file changed, 6 insertions(+), 4 deletions(-)

Approvals:
  pespin: Looks good to me, approved; Verified



diff --git a/osmo-gsm-tester/osmo-gsm-tester-master.sh b/osmo-gsm-tester/osmo-gsm-tester-master.sh
index bd8a659..059fae7 100755
--- a/osmo-gsm-tester/osmo-gsm-tester-master.sh
+++ b/osmo-gsm-tester/osmo-gsm-tester-master.sh
@@ -18,17 +18,19 @@
                 exit 1
         fi
         pushd "/tmp/trial"
-        rm -rf inst && mkdir inst
+        rm -rf sysroot && mkdir sysroot
         rm -rf build && mkdir build && cd build || exit 1
-        cmake -DCMAKE_INSTALL_PREFIX="../inst/" "${git_repo_dir}"
+        cmake -DCMAKE_INSTALL_PREFIX="../sysroot/" "${git_repo_dir}"
         set +x; echo; echo; set -x
         make "-j$(nproc)"
         set +x; echo; echo; set -x
         make install
+        cd ..
         this="srslte.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}"
         tar="${this}.tgz"
-        tar czf "/tmp/trial/$tar" -C "/tmp/trial/inst" .
-        cd "/tmp/trial/" && md5sum "$tar" >>checksums.md5
+        tar czf "/tmp/trial/$tar" -C "/tmp/trial/sysroot" .
+        rm -rf build sysroot
+        md5sum "$tar" >>checksums.md5
         popd
 }
 

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/17540
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ib6610487140f0703d5817241bc4a63027696c1d4
Gerrit-Change-Number: 17540
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200320/218571e8/attachment.htm>