From 3f2a5e5b4171c0fd6ad9712cfe616848ca80ec46 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 6 Apr 2020 16:32:11 +0200 Subject: [PATCH] contrib: build amarisoft: Set trx_zmq.so RPATH to point to copied dependency libsrslte_rf.so In the ENB case it's not really required since osmo-gsm-tester makes use of LD_LIBRARY_PATH. However, since the UE is potentially run with capabilitites to create tunnels and alike, LD_LIBRARY_PATH cannot be used and lteue will fail to load trx_zmq.so (because it cannot find its dependency libsrslte_rf.so). Change-Id: Ifcbc6ed1c4c465b4cfab4c5689cde44624095f29 --- contrib/jenkins-build-amarisoft.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/jenkins-build-amarisoft.sh b/contrib/jenkins-build-amarisoft.sh index f9715782..e4b37cc1 100755 --- a/contrib/jenkins-build-amarisoft.sh +++ b/contrib/jenkins-build-amarisoft.sh @@ -47,6 +47,7 @@ tar --strip-components=1 -zxf inst-tmp/*/lteenb-linux*.tar.gz -C inst-amarisofte if [ "x${BUILD_AMARISOFT_TRX_ZMQ}" = "x1" ]; then cp ${base}/${project_name_srslte}/build/lib/src/phy/rf/libsrslte_rf.so inst-amarisoftenb/ cp ${base}/${project_name_zmq}/build/libtrx_zmq-linux-2018-10-18.so inst-amarisoftenb/trx_zmq.so + patchelf --set-rpath '$ORIGIN/' inst-amarisoftenb/trx_zmq.so fi cp ${base}/inst-tmp/trx_uhd-linux*/trx_uhd.so inst-amarisoftenb/ this="amarisoftenb.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}" @@ -60,6 +61,7 @@ tar --strip-components=1 -zxf inst-tmp/*/lteue-linux*.tar.gz -C inst-amarisoftue if [ "x${BUILD_AMARISOFT_TRX_ZMQ}" = "x1" ]; then cp ${base}/${project_name_srslte}/build/lib/src/phy/rf/libsrslte_rf.so inst-amarisoftue/ cp ${base}/${project_name_zmq}/build/libtrx_zmq-linux-2018-10-18.so inst-amarisoftue/trx_zmq.so + patchelf --set-rpath '$ORIGIN/' inst-amarisoftue/trx_zmq.so fi cp ${base}/inst-tmp/trx_uhd-linux*/trx_uhd.so inst-amarisoftue/ this="amarisoftue.build-${BUILD_NUMBER-$(date +%Y-%m-%d_%H_%M_%S)}"