Commit 243cd8e9 authored by Reem Bahsoun's avatar Reem Bahsoun

Add BladeRF libraries to gNB and UE Docker image builder

parent 80fb09ba
...@@ -83,6 +83,7 @@ COPY --from=gnb-build \ ...@@ -83,6 +83,7 @@ COPY --from=gnb-build \
/oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
/oai-ran/cmake_targets/ran_build/build/librfsimulator.so \ /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
/oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \ /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
/oai-ran/cmake_targets/ran_build/build/liboai_bladerfdevif.so \
/oai-ran/cmake_targets/ran_build/build/libcoding.so \ /oai-ran/cmake_targets/ran_build/build/libcoding.so \
/oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \ /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
/oai-ran/cmake_targets/ran_build/build/libdfts.so \ /oai-ran/cmake_targets/ran_build/build/libdfts.so \
...@@ -104,6 +105,9 @@ COPY --from=gnb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai- ...@@ -104,6 +105,9 @@ COPY --from=gnb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-
## Copy E2 SM models ## Copy E2 SM models
COPY --from=gnb-build /usr/local/lib/flexric /usr/local/lib/flexric COPY --from=gnb-build /usr/local/lib/flexric /usr/local/lib/flexric
# Copy BladeRF runtime from base image
COPY --from=gnb-base /usr/local/lib/libbladeRF* /usr/local/lib/
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
ldconfig && \ ldconfig && \
echo "---- ldd on nr-softmodem ----" && \ echo "---- ldd on nr-softmodem ----" && \
...@@ -112,6 +116,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai ...@@ -112,6 +116,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
ldd /usr/local/lib/liboai_eth_transpro.so \ ldd /usr/local/lib/liboai_eth_transpro.so \
/usr/local/lib/librfsimulator.so \ /usr/local/lib/librfsimulator.so \
/usr/local/lib/liboai_usrpdevif.so \ /usr/local/lib/liboai_usrpdevif.so \
/usr/local/lib/liboai_bladerfdevif.so \
/usr/local/lib/libcoding.so \ /usr/local/lib/libcoding.so \
/usr/local/lib/libparams_libconfig.so \ /usr/local/lib/libparams_libconfig.so \
/usr/local/lib/libdfts.so \ /usr/local/lib/libdfts.so \
......
...@@ -86,6 +86,7 @@ COPY --from=nr-ue-build \ ...@@ -86,6 +86,7 @@ COPY --from=nr-ue-build \
/oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
/oai-ran/cmake_targets/ran_build/build/librfsimulator.so \ /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \
/oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \ /oai-ran/cmake_targets/ran_build/build/liboai_usrpdevif.so \
/oai-ran/cmake_targets/ran_build/build/liboai_bladerfdevif.so \
/oai-ran/cmake_targets/ran_build/build/libcoding.so \ /oai-ran/cmake_targets/ran_build/build/libcoding.so \
/oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \ /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
/oai-ran/cmake_targets/ran_build/build/libdfts.so \ /oai-ran/cmake_targets/ran_build/build/libdfts.so \
...@@ -102,6 +103,9 @@ COPY --from=nr-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin ...@@ -102,6 +103,9 @@ COPY --from=nr-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin
COPY --from=nr-ue-base /usr/local/lib/libuhd.so.4.8.0 /usr/local/lib COPY --from=nr-ue-base /usr/local/lib/libuhd.so.4.8.0 /usr/local/lib
COPY --from=nr-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-nr-ue/bin COPY --from=nr-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-nr-ue/bin
# Copy BladeRF runtime from base image
COPY --from=nr-ue-base /usr/local/lib/libbladeRF* /usr/local/lib/
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
ldconfig && \ ldconfig && \
echo "---- ldd on nr-uesoftmodem ----" && \ echo "---- ldd on nr-uesoftmodem ----" && \
...@@ -110,6 +114,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai ...@@ -110,6 +114,7 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
ldd /usr/local/lib/liboai_eth_transpro.so \ ldd /usr/local/lib/liboai_eth_transpro.so \
/usr/local/lib/librfsimulator.so \ /usr/local/lib/librfsimulator.so \
/usr/local/lib/liboai_usrpdevif.so \ /usr/local/lib/liboai_usrpdevif.so \
/usr/local/lib/liboai_bladerfdevif.so \
/usr/local/lib/libcoding.so \ /usr/local/lib/libcoding.so \
/usr/local/lib/libparams_libconfig.so \ /usr/local/lib/libparams_libconfig.so \
/usr/local/lib/libdfts.so \ /usr/local/lib/libdfts.so \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment