diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-03-20 18:42:32 +0100 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-03-20 19:17:35 +0100 |
| commit | cafa320eba9bc41480091cd1ab62fdf17da943d4 (patch) | |
| tree | d24a99f69eaccaf2e94545fa476c77b144938660 | |
| parent | 41230705dcccd2010dc7a748dfaa8cc6fb2c3f91 (diff) | |
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
| -rwxr-xr-x | osmo-gsm-tester/osmo-gsm-tester-master.sh | 10 |
1 files changed, 6 insertions, 4 deletions
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 @@ build_srslte() { 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 } |