matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

configure, zebra: include DPDK headers and shared libs in the dp-dpdk build

Browse source 
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
   -> Moved new capabilities needed to under HAVE_DPDK
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
This commit is contained in:
Anuradha Karuppiah 2021-12-30 14:41:42 -08:00 committed by Donald Sharp
parent 36c3b29675
commit fd03f1d4b7
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -1998,6 +1998,18 @@ if test "$enable_grpc" = "yes"; then
AC_LANG_POP([C++]) AC_LANG_POP([C++])
fi fi
dnl ---------
dnl DPDK
dnl ---------
if test "$enable_dp_dpdk" = "yes"; then
PKG_CHECK_MODULES([DPDK], [libdpdk], [
AC_DEFINE([HAVE_DPDK], [1], [Enable DPDK backend])
DPDK=true
], [
AC_MSG_ERROR([configuration specifies --enable-dp-dpdk but DPDK libs were not found])
])
fi
dnl ----- dnl -----
dnl LTTng dnl LTTng
dnl ----- dnl -----

10
zebra/main.c
View file

@ -105,9 +105,13 @@ const struct option longopts[] = {
#endif /* HAVE_NETLINK */ #endif /* HAVE_NETLINK */
{0}}; {0}};
zebra_capabilities_t _caps_p[] = {ZCAP_NET_ADMIN, ZCAP_SYS_ADMIN, zebra_capabilities_t _caps_p[] = {ZCAP_NET_ADMIN, ZCAP_SYS_ADMIN,
ZCAP_NET_RAW, ZCAP_IPC_LOCK, ZCAP_NET_RAW,
ZCAP_READ_SEARCH, ZCAP_SYS_RAWIO}; #ifdef HAVE_DPDK
ZCAP_IPC_LOCK, ZCAP_READ_SEARCH,
ZCAP_SYS_RAWIO
#endif
};
/* zebra privileges to run with */ /* zebra privileges to run with */
struct zebra_privs_t zserv_privs = { struct zebra_privs_t zserv_privs = {

2
zebra/subdir.am
View file

@ -268,3 +268,5 @@ endif
zebra_zebra_dplane_dpdk_la_SOURCES = zebra/dpdk/zebra_dplane_dpdk.c zebra/dpdk/zebra_dplane_dpdk_vty.c zebra_zebra_dplane_dpdk_la_SOURCES = zebra/dpdk/zebra_dplane_dpdk.c zebra/dpdk/zebra_dplane_dpdk_vty.c
zebra_zebra_dplane_dpdk_la_LDFLAGS = -avoid-version -module -shared -export-dynamic -L/usr/local/lib -v zebra_zebra_dplane_dpdk_la_LDFLAGS = -avoid-version -module -shared -export-dynamic -L/usr/local/lib -v
zebra_zebra_dplane_dpdk_la_CFLAGS = $(DPDK_CFLAGS)
zebra_zebra_dplane_dpdk_la_LIBADD = $(DPDK_LIBS)