Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to stratum-deps v1.3.4 #723

Merged
merged 4 commits into from
Jan 1, 2025
Merged

Update to stratum-deps v1.3.4 #723

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d7e443e
Modify to use discrete re2 package
ffoulkes Jan 1, 2025
30bc52e
Update to stratum-deps v1.3.4
ffoulkes Jan 1, 2025
aff2ff4
Merge branch 'main' into re2-fix
ffoulkes Jan 1, 2025
a8f8648
Update stratum submodule to v3.3.0.0
ffoulkes Jan 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.4
DEPS_FILENAME: deps-ubuntu-1.3.4-x86_64.tar.gz
DEPS_INSTALL_DIR: /opt/p4dev/x86deps

PREREQS: libbsd-dev libnl-3-dev libnl-route-3-dev libnl-genl-3-dev
Expand Down
2 changes: 1 addition & 1 deletion clients/gnmi-ctl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ target_link_libraries(gnmi-ctl
gflags::gflags_shared
gRPC::grpc
gRPC::grpc++
gRPC::re2
protobuf::libprotobuf
pthread
re2::re2
)

target_include_directories(gnmi-ctl
Expand Down
2 changes: 1 addition & 1 deletion clients/sgnmi_cli/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ target_link_libraries(sgnmi_cli
gflags::gflags_shared
gRPC::grpc
gRPC::grpc++
gRPC::re2
protobuf::libprotobuf
pthread
re2::re2
)

if(HAVE_POSIX_AIO)
Expand Down
8 changes: 8 additions & 0 deletions cmake/StratumDependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,14 @@ mark_as_advanced(Protobuf_DIR)

message(STATUS "Found Protobuf version ${Protobuf_VERSION}")

#-----------------------------------------------------------------------
# Google Regular Expression library (RE2).
#-----------------------------------------------------------------------
find_package(re2 CONFIG REQUIRED)
mark_as_advanced(re2_DIR)

message(STATUS "Found RE2 version ${re2_VERSION}")

#-----------------------------------------------------------------------
# Google RPC (gRPC).
#-----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion krnlmon/krnlmon
Open in desktop
Submodule krnlmon updated 19 files
+12 −51 .github/workflows/pipeline.yml
+13 −5 CMakePresets.json
+1 −0 switchlink/.gitignore
+59 −33 switchlink/BUILD.bazel
+3 −1 switchlink/CMakeLists.txt
+2 −2 switchlink/sai/BUILD.bazel
+1 −1 switchlink/switchlink_db.c
+4 −121 switchlink/switchlink_db.h
+3 −0 switchlink/switchlink_db_int.h
+145 −0 switchlink/switchlink_db_types.h
+30 −0 switchlink/switchlink_defs.h
+1 −1 switchlink/switchlink_globals.h
+1 −1 switchlink/switchlink_handlers.h
+1 −1 switchlink/switchlink_link.c
+4 −4 switchlink/switchlink_link_types.h
+1 −1 switchlink/switchlink_main.c
+2 −1 switchlink/switchlink_neigh.c
+1 −1 switchlink/switchlink_route.c
+4 −9 switchlink/switchlink_types.h
2 changes: 1 addition & 1 deletion stratum/stratum
Open in desktop
Submodule stratum updated 3 files
+1 −1 .github/workflows/clang-format-check.yml
+3 −3 .github/workflows/pipeline.yml
+1 −1 stratum/tools/gnmi/CMakeLists.txt
Loading