Update to use top-level re2 + stratum update

Signed-off-by: Sabeel Ansari <sabeel.ansari@intel.com>
ipdk-io · Feb 10, 2025 · 8b1a969 · 8b1a969
1 parent 41c94ca
commit 8b1a969
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -29,8 +29,8 @@ env:
   SDE_INSTALL_DIR: /opt/p4dev/dpdk-sde
 
   DEPS_REPOSITORY: ipdk-io/stratum-deps
-  DEPS_TAG: v1.2.1
-  DEPS_FILENAME: deps-ubuntu-latest-x86_64.tar.gz
+  DEPS_TAG: v1.3.5
+  DEPS_FILENAME: deps-ubuntu-22.04-1.3.5-x86_64.tar.gz
   DEPS_INSTALL_DIR: /opt/p4dev/x86deps
 
   PREREQS: libbsd-dev libnl-3-dev libnl-route-3-dev libnl-genl-3-dev

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,13 +1,13 @@
 # CMake build file for superproject.
 #
-# Copyright 2022-2024 Intel Corporation
+# Copyright 2022-2025 Intel Corporation
 # SPDX-License-Identifier: Apache 2.0
 #
 
 # Version 3.15 is the baseline for P4 Control Plane.
 cmake_minimum_required(VERSION 3.15)
 
-project(networking-recipe VERSION 3.3.0 LANGUAGES C CXX)
+project(networking-recipe VERSION 3.4.0 LANGUAGES C CXX)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 

diff --git a/clients/gnmi-ctl/CMakeLists.txt b/clients/gnmi-ctl/CMakeLists.txt
@@ -26,7 +26,7 @@ target_link_libraries(gnmi-ctl
         gflags::gflags_shared
         gRPC::grpc
         gRPC::grpc++
-        gRPC::re2
+        re2::re2
         protobuf::libprotobuf
         pthread
 )

diff --git a/clients/sgnmi_cli/CMakeLists.txt b/clients/sgnmi_cli/CMakeLists.txt
@@ -24,7 +24,7 @@ target_link_libraries(sgnmi_cli
         gflags::gflags_shared
         gRPC::grpc
         gRPC::grpc++
-        gRPC::re2
+        re2::re2
         protobuf::libprotobuf
         pthread
 )

diff --git a/stratum/stratum b/stratum/stratum
+10 −0		stratum/hal/lib/tdi/BUILD
+20 −0		stratum/hal/lib/tdi/es2k/BUILD
+0 −5		stratum/hal/lib/tdi/es2k/es2k_virtual_port_manager.cc
+56 −0		stratum/hal/lib/tdi/tdi_fixed_function_manager_mock.h
+90 −0		stratum/hal/lib/tdi/tdi_fixed_function_manager_test.cc
+1 −1		stratum/tools/gnmi/CMakeLists.txt