From 8b1a9698018104783752f6699ea36172616677b0 Mon Sep 17 00:00:00 2001 From: Sabeel Ansari Date: Mon, 10 Feb 2025 13:23:05 -0800 Subject: [PATCH] Update to use top-level re2 + stratum update Signed-off-by: Sabeel Ansari --- .github/workflows/pipeline.yml | 4 ++-- CMakeLists.txt | 4 ++-- clients/gnmi-ctl/CMakeLists.txt | 2 +- clients/sgnmi_cli/CMakeLists.txt | 2 +- stratum/stratum | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 338098e5..f966b473 100644 --- 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 index e946a145..6ad346b2 100644 --- 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 index 31a35bf6..3258b788 100644 --- 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 index 8fc34c23..36db7ae0 100644 --- 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 index 6742692c..da3964e0 160000 --- a/stratum/stratum +++ b/stratum/stratum @@ -1 +1 @@ -Subproject commit 6742692cac623ea7fb8f5b6c2b680666711c393a +Subproject commit da3964e0248343189b6371ed327e3f2add2e241d