From 1adcd3fb5aec1f8553e80aff1fbab492118cf54d Mon Sep 17 00:00:00 2001 From: Raphael Defosseux Date: Wed, 21 Feb 2024 09:30:52 +0100 Subject: [PATCH 1/2] Revert "fix(ci): hot-fix for E2-agent build w/ latest version of ASN1C" This reverts commit 2b796874ca974589a94cf98bcf63b63c8bfa8317. --- cmake_targets/tools/build_helper | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cmake_targets/tools/build_helper b/cmake_targets/tools/build_helper index 484783af8d..8ff0dcfa8c 100755 --- a/cmake_targets/tools/build_helper +++ b/cmake_targets/tools/build_helper @@ -666,10 +666,7 @@ install_asn1c_from_source(){ # GIT_SSL_NO_VERIFY=true git clone https://gitlab.eurecom.fr/oai/asn1c.git /tmp/asn1c git clone https://github.com/mouse07410/asn1c /tmp/asn1c cd /tmp/asn1c - # 2024-02-06: problem compatibility between E2-agent and 4cfcd4f191c3fa41f6ac1b15cb2ad3acc1520af5 from asn1c - # Reverting to previous commit that works - # TODO : revert to vlm_master once FlexRic and E2-agent are fixed - git checkout -f a6bdcd22658d6b7c3ed218d8c1375907ac532b64 + git checkout vlm_master # Showing which version is used git log -n1 autoreconf -iv From 1b237f6abe24637d1317e47793cbc989fa1d67c5 Mon Sep 17 00:00:00 2001 From: mir Date: Tue, 20 Feb 2024 18:12:08 +0100 Subject: [PATCH 2/2] Fix name clashes between OAI and E2 Agent generated by the linker --- CMakeLists.txt | 15 ++++----------- openair2/E2AP/RAN_FUNCTION/CMakeLists.txt | 4 ++-- openair2/E2AP/RAN_FUNCTION/read_setup_ran.c | 2 +- openair2/E2AP/flexric | 2 +- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5854dae3d5..b2605c529c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1436,8 +1436,7 @@ target_link_libraries(L2 PRIVATE asn1_lte_rrc_hdrs asn1_nr_rrc_hdrs) if(E2_AGENT) target_link_libraries(L2 PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup) - target_compile_definitions(L2 PRIVATE E2_AGENT) - target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION}) + target_compile_definitions(L2 PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT) endif() @@ -1463,8 +1462,7 @@ target_link_libraries(e1_if PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs asn1_f1ap target_link_libraries(L2_NR PRIVATE f1ap x2ap s1ap ngap nr_rrc e1ap nr_rlc) if(E2_AGENT) target_link_libraries(L2_NR PUBLIC e2_agent e2_agent_arg e2_ran_func_du_cucp_cuup) - target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION}) - target_compile_definitions(L2_NR PRIVATE E2_AGENT) + target_compile_definitions(L2_NR PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT) endif() add_library(L2_LTE_NR @@ -1983,8 +1981,7 @@ target_link_libraries(lte-softmodem PRIVATE ${T_LIB}) target_link_libraries(lte-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs) if(E2_AGENT) - target_compile_definitions(lte-softmodem PRIVATE E2_AGENT) - target_compile_definitions(lte-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION}) + target_compile_definitions(lte-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT) endif() add_executable(oairu @@ -2082,7 +2079,7 @@ target_link_libraries(nr-softmodem PRIVATE ${T_LIB}) target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs) target_link_libraries(nr-softmodem PRIVATE asn1_nr_rrc_hdrs asn1_lte_rrc_hdrs) if(E2_AGENT) - target_compile_definitions(nr-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION}) + target_compile_definitions(nr-softmodem PRIVATE ${E2AP_VERSION} ${KPM_VERSION} E2_AGENT) endif() @@ -2095,10 +2092,6 @@ endif() # force the generation of ASN.1 so that we don't need to wait during the build target_link_libraries(nr-softmodem PRIVATE asn1_lte_rrc asn1_nr_rrc asn1_s1ap asn1_ngap asn1_m2ap asn1_m3ap asn1_x2ap asn1_f1ap asn1_lpp) -if(E2_AGENT) - target_compile_definitions(nr-softmodem PRIVATE E2_AGENT) -endif() - add_executable(nr-cuup executables/nr-cuup.c diff --git a/openair2/E2AP/RAN_FUNCTION/CMakeLists.txt b/openair2/E2AP/RAN_FUNCTION/CMakeLists.txt index 47f7ae4154..3cb3d062f4 100644 --- a/openair2/E2AP/RAN_FUNCTION/CMakeLists.txt +++ b/openair2/E2AP/RAN_FUNCTION/CMakeLists.txt @@ -39,5 +39,5 @@ add_library(e2_ran_func_du_cucp_cuup STATIC ../flexric/test/rnd/fill_rnd_data_slice.c ) -target_link_libraries(e2_ran_func_du_cucp_cuup PUBLIC asn1_nr_rrc nr_rrc asn1_nr_rrc_hdrs e2_time_obj kpm_ric_info_common_obj 3gpp_derived_ie_obj e2sm_rc_ir_obj sm_common_ie_obj) -target_compile_definitions(e2_ran_func_du_cucp_cuup PUBLIC ${E2AP_VERSION} ${KPM_VERSION} NGRAN_GNB_DU NGRAN_GNB_CUCP NGRAN_GNB_CUUP) +target_link_libraries(e2_ran_func_du_cucp_cuup PUBLIC asn1_nr_rrc nr_rrc asn1_nr_rrc_hdrs e2_time_obj kpm_ric_info_common_obj 3gpp_derived_ie_obj e2sm_rc_ir_obj sm_common_ie_obj e2_agent) +target_compile_definitions(e2_ran_func_du_cucp_cuup PUBLIC ${E2AP_VERSION} ${KPM_VERSION} NGRAN_GNB_DU NGRAN_GNB_CUCP NGRAN_GNB_CUUP) diff --git a/openair2/E2AP/RAN_FUNCTION/read_setup_ran.c b/openair2/E2AP/RAN_FUNCTION/read_setup_ran.c index 2bc481d527..774ea290d6 100644 --- a/openair2/E2AP/RAN_FUNCTION/read_setup_ran.c +++ b/openair2/E2AP/RAN_FUNCTION/read_setup_ran.c @@ -29,7 +29,7 @@ void read_setup_ran(void* data, const ngran_node_t node_type) { assert(data != NULL); #ifdef E2AP_V1 - + (void)node_type; #elif defined(E2AP_V2) || defined(E2AP_V3) arr_node_component_config_add_t* dst = (arr_node_component_config_add_t*)data; diff --git a/openair2/E2AP/flexric b/openair2/E2AP/flexric index 29af8408af..7c424e882a 160000 --- a/openair2/E2AP/flexric +++ b/openair2/E2AP/flexric @@ -1 +1 @@ -Subproject commit 29af8408afad3da36824bd7912562202023ae924 +Subproject commit 7c424e882adae6ad72a24470d8c3e731189062c0