Commit f0f9046d authored by Jaroslava Fiedlerova's avatar Jaroslava Fiedlerova Committed by Robert Schmidt
parent efaf8006
......@@ -6,7 +6,7 @@
# Finds the xran library. Note that the library number is as follows:
# - oran_e_maintenance_release_v1.5 -> 5.1.6
# - oran_f_release_v1.3 -> 6.1.4
# - oran_k_release_v1.4 -> 11.1.4
# - oran_k_release_v1.5 -> 11.1.5
#
# Required options
# ^^^^^^^^^^^^^^^^
......
......@@ -406,7 +406,7 @@ cd ~/openairinterface5g/
```bash
git clone https://github.com/openairinterface/o-du-phy.git ~/phy
cd ~/phy
git checkout 11.1.4 # the tag points to the `main` branch which has all patches applied that are relevant for OAI integration; the tag matches the value of cmake variable `K_VERSION`
git checkout 11.1.5 # the tag points to the `main` branch which has all patches applied that are relevant for OAI integration; the tag matches the value of cmake variable `K_VERSION`
```
or use `xran_DOWNLOAD` option when compiling OAI gNB.
......
......@@ -9,8 +9,8 @@
FROM ran-base:latest AS ran-base
ARG xran_VERSION=11.1.4
ARG DPDK_VERSION=22.11.11
ARG xran_VERSION=11.1.5
ARG E2AP_VERSION=E2AP_V3
ARG KPM_VERSION=KPM_V3_00
ENV DEBIAN_FRONTEND=noninteractive
......
......@@ -13,8 +13,8 @@ ENV TZ=Europe
RUN rm -Rf /oai-ran
WORKDIR /oai-ran
ARG xran_VERSION=11.1.4
ARG DPDK_VERSION=22.11.11
ARG xran_VERSION=11.1.5
## Download and build DPDK
RUN wget --no-verbose http://fast.dpdk.org/rel/dpdk-$DPDK_VERSION.tar.xz && \
......
......@@ -9,7 +9,7 @@
FROM ran-base:latest AS ran-base
ARG xran_VERSION=11.1.4
ARG xran_VERSION=11.1.5
ARG DPDK_VERSION=22.11
ARG T2_PATCH=AMD-T2-SDFEC_25-03-1.patch
ENV DEBIAN_FRONTEND=noninteractive
......
......@@ -9,8 +9,8 @@
FROM ran-base:latest AS ran-base
ARG xran_VERSION=11.1.4
ARG DPDK_VERSION=22.11.11
ARG xran_VERSION=11.1.5
ARG E2AP_VERSION=E2AP_V3
ARG KPM_VERSION=KPM_V3_00
ENV DEBIAN_FRONTEND=noninteractive
......
......@@ -15,7 +15,7 @@ message(STATUS " hugetlbfs library found in ${hugetlbfs_LIB}")
pkg_check_modules(dpdk REQUIRED libdpdk)
if(dpdk_VERSION VERSION_LESS 22.11)
message(FATAL_ERROR "DPDK version miniminum 22 required for K release, but found ${dpdk_VERSION}")
message(FATAL_ERROR "We require min DPDK version 22.11, but found ${dpdk_VERSION}")
endif()
target_link_libraries(wls_integration_lib PRIVATE ${dpdk_LINK_LIBRARIES})
target_include_directories(wls_integration_lib PRIVATE ${dpdk_INCLUDE_DIRS})
......
......@@ -18,7 +18,7 @@ add_library(oran_fhlib_5g MODULE
oran-init.c
)
set(K_VERSION 11.1.4)
set(K_VERSION 11.1.5)
add_boolean_option(xran_DOWNLOAD ON "Download and build xran library if not found in xran_LOCATION" OFF)
......@@ -29,16 +29,16 @@ if(xran_FOUND)
elseif(xran_VERSION VERSION_GREATER_EQUAL 6 AND xran_VERSION VERSION_LESS 7)
message(FATAL_ERROR "xran F release not supported starting from tag 2026.w29.\nPlease switch to K version ${K_VERSION}")
elseif(xran_VERSION VERSION_EQUAL K_VERSION)
if(dpdk_VERSION VERSION_LESS 22)
message(FATAL_ERROR "DPDK version miniminum 22 required for K release, but found ${dpdk_VERSION}")
if(dpdk_VERSION VERSION_LESS 22.11)
message(FATAL_ERROR "We require min DPDK version 22.11, but found ${dpdk_VERSION}")
endif()
target_compile_definitions(oran_fhlib_5g PRIVATE K_RELEASE)
else()
message(FATAL_ERROR "Found xran version ${xran_VERSION} but needed ${F_VERSION} (F release) or ${K_VERSION} (K release)")
message(FATAL_ERROR "Found xran version ${xran_VERSION} but needed ${K_VERSION} (K release)")
endif()
elseif(NOT xran_FOUND AND xran_DOWNLOAD)
if(dpdk_VERSION VERSION_LESS 22)
message(FATAL_ERROR "DPDK version miniminum 22 required for K release, but found ${dpdk_VERSION}")
if(dpdk_VERSION VERSION_LESS 22.11)
message(FATAL_ERROR "We require min DPDK version 22.11, but found ${dpdk_VERSION}")
endif()
include(ExternalProject)
set(xran_DIR "${CMAKE_BINARY_DIR}/.deps/src/extern_xran/fhi_lib/lib")
......
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