From c5dd48321a18a42abdeb07ee724e73b4ebe6cd28 Mon Sep 17 00:00:00 2001 From: herlesupreeth Date: Sun, 11 Aug 2024 18:44:41 +0200 Subject: [PATCH] Use latest code from open5gs, srsRAN_4G and srsRAN_Project repo --- base/Dockerfile | 2 +- srslte/Dockerfile | 4 ++-- srsran/Dockerfile | 2 +- srsran/gnb.yml | 4 ++-- srsran/gnb_zmq.yml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index 2d13f23..207672c 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -68,7 +68,7 @@ RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg - # Get open5gs code and install RUN git clone --recursive https://github.com/open5gs/open5gs && cd open5gs && \ - git checkout 322719f3e729aafacf531e85552d7a977fff3e2a && meson build --prefix=`pwd`/install && \ + git checkout tags/v2.7.2 && meson build --prefix=`pwd`/install && \ ninja -C build && cd build && ninja install && \ mkdir -p /open5gs/install/include diff --git a/srslte/Dockerfile b/srslte/Dockerfile index 1d28109..8cfe8ba 100644 --- a/srslte/Dockerfile +++ b/srslte/Dockerfile @@ -54,7 +54,7 @@ RUN git clone https://github.com/myriadrf/LimeSuite.git && \ # Get BladeRF, compile and install RUN git clone https://github.com/Nuand/bladeRF.git && \ - cd bladeRF/host/ && \ + cd bladeRF/host/ && git checkout tags/2024.05 && \ mkdir build && cd build && \ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local -DINSTALL_UDEV_RULES=ON -DBLADERF_GROUP=plugdev ../ && make && make install && \ ldconfig && \ @@ -84,7 +84,7 @@ RUN git clone https://github.com/srsran/srsGUI && \ # Get srsLTE, compile and install RUN git clone https://github.com/srsran/srsRAN_4G.git && \ cd srsRAN_4G && \ - git checkout 4eb990c9c6ad9b0af943bba71d0f8355b3ebb259 && \ + git checkout ec29b0c1ff79cebcbe66caa6d6b90778261c42b8 && \ mkdir build && cd build && \ cmake ../ && make -j`nproc` && make install && \ ldconfig diff --git a/srsran/Dockerfile b/srsran/Dockerfile index e4445c6..e60f711 100644 --- a/srsran/Dockerfile +++ b/srsran/Dockerfile @@ -40,7 +40,7 @@ RUN add-apt-repository ppa:ettusresearch/uhd && \ # Get srsRAN_Project, compile and install RUN git clone https://github.com/srsran/srsRAN_Project.git && \ - cd srsRAN_Project && git checkout 55c984b55736d0dd2d2ee328f1ae8d9de97e3e19 && \ + cd srsRAN_Project && git checkout 4ac5300d4927b5199af69e6bc2e55d061fc33652 && \ mkdir build && cd build && \ cmake ../ -DENABLE_EXPORT=ON -DENABLE_ZEROMQ=ON && make -j`nproc` && make install && \ ldconfig diff --git a/srsran/gnb.yml b/srsran/gnb.yml index baeb55d..bf401c2 100644 --- a/srsran/gnb.yml +++ b/srsran/gnb.yml @@ -36,5 +36,5 @@ pcap: e1ap_filename: /mnt/srsran/gnb_e1ap.pcap # Path where the E1AP PCAP is stored. e2ap_enable: false # Set to true to enable E2AP PCAPs. e2ap_filename: /mnt/srsran/gnb_e2ap.pcap # Path where the E2AP PCAP is stored. - gtpu_enable: false # Set to true to enable GTP-U PCAPs. - gtpu_filename: /mnt/srsran/gnb_gtpu.pcap # Path where the GTP-U PCAP is stored. + n3_enable: false # Set to true to enable N3 PCAPs. + n3_filename: /mnt/srsran/gnb_n3.pcap # Path where the N3 PCAP is stored. diff --git a/srsran/gnb_zmq.yml b/srsran/gnb_zmq.yml index 1107d7f..395c8d1 100644 --- a/srsran/gnb_zmq.yml +++ b/srsran/gnb_zmq.yml @@ -42,5 +42,5 @@ pcap: e1ap_filename: /mnt/srsran/gnb_e1ap.pcap # Path where the E1AP PCAP is stored. e2ap_enable: false # Set to true to enable E2AP PCAPs. e2ap_filename: /mnt/srsran/gnb_e2ap.pcap # Path where the E2AP PCAP is stored. - gtpu_enable: false # Set to true to enable GTP-U PCAPs. - gtpu_filename: /mnt/srsran/gnb_gtpu.pcap # Path where the GTP-U PCAP is stored. + n3_enable: false # Set to true to enable N3 PCAPs. + n3_filename: /mnt/srsran/gnb_n3.pcap # Path where the N3 PCAP is stored.