Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

tools, ospfclient: add a config option to skip installing python scripts

Browse source 
The new config option --disable-python-runtime allows make install to proceed
without installing any of the python scripts. When installing from deb/rpm
packages those are bundled as frr-pythontools, which is independent from the
frr binaries and can already be skipped. I.e, this PR gives the option to skip
those scripts when building/installing from sources too.

Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
This commit is contained in:
Jafar Al-Gharaibeh 2024-08-20 15:02:54 -05:00
parent d9775c690c
commit b3dc3680bc
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -850,6 +850,9 @@ AC_ARG_WITH([frr-format],
AC_ARG_ENABLE([version-build-config], AC_ARG_ENABLE([version-build-config],
AS_HELP_STRING([--disable-version-build-config], [do not include build configs in show version command])) AS_HELP_STRING([--disable-version-build-config], [do not include build configs in show version command]))
AC_ARG_ENABLE([python_runtime],
AS_HELP_STRING([--disable-python-runtime], [do not install python scripts or have python runtime dependency]))
#if openssl, else use the internal #if openssl, else use the internal
AS_IF([test "$with_crypto" = "openssl"], [ AS_IF([test "$with_crypto" = "openssl"], [
AC_CHECK_LIB([crypto], [EVP_DigestInit], [LIBS="$LIBS -lcrypto"], [], []) AC_CHECK_LIB([crypto], [EVP_DigestInit], [LIBS="$LIBS -lcrypto"], [], [])
@ -2811,6 +2814,9 @@ AM_CONDITIONAL([PATHD], [test "$enable_pathd" != "no"])
AM_CONDITIONAL([PATHD_PCEP], [test "$enable_pathd" != "no"]) AM_CONDITIONAL([PATHD_PCEP], [test "$enable_pathd" != "no"])
AM_CONDITIONAL([DP_DPDK], [test "$enable_dp_dpdk" = "yes"]) AM_CONDITIONAL([DP_DPDK], [test "$enable_dp_dpdk" = "yes"])
AM_CONDITIONAL([PYTHON_RUNTIME_DEPENDENCY], [test "$enable_python_runtime" != "no"])
AC_CONFIG_FILES([Makefile],[ AC_CONFIG_FILES([Makefile],[
test "$enable_dev_build" = "yes" && makefile_devbuild="--dev-build" test "$enable_dev_build" = "yes" && makefile_devbuild="--dev-build"
${PYTHON} "${ac_abs_top_srcdir}/python/makefile.py" ${makefile_devbuild} || exit 1 ${PYTHON} "${ac_abs_top_srcdir}/python/makefile.py" ${makefile_devbuild} || exit 1

3
ospfclient/subdir.am
View file

@ -7,10 +7,13 @@ lib_LTLIBRARIES += ospfclient/libfrrospfapiclient.la
noinst_PROGRAMS += ospfclient/ospfclient noinst_PROGRAMS += ospfclient/ospfclient
#man8 += $(MANBUILD)/frr-ospfclient.8 #man8 += $(MANBUILD)/frr-ospfclient.8
if PYTHON_RUNTIME_DEPENDENCY
sbin_SCRIPTS += \ sbin_SCRIPTS += \
ospfclient/ospfclient.py \ ospfclient/ospfclient.py \
# end # end
endif endif
endif
ospfclient_libfrrospfapiclient_la_LDFLAGS = $(LIB_LDFLAGS) -version-info 0:0:0 ospfclient_libfrrospfapiclient_la_LDFLAGS = $(LIB_LDFLAGS) -version-info 0:0:0
ospfclient_libfrrospfapiclient_la_LIBADD = lib/libfrr.la ospfclient_libfrrospfapiclient_la_LIBADD = lib/libfrr.la

11
tools/subdir.am
View file

@ -13,15 +13,20 @@ EXTRA_PROGRAMS += \
# end # end
sbin_PROGRAMS += tools/ssd sbin_PROGRAMS += tools/ssd
if PYTHON_RUNTIME_DEPENDENCY
sbin_SCRIPTS += \
tools/frr-reload.py \
tools/generate_support_bundle.py \
tools/frr_babeltrace.py
endif
sbin_SCRIPTS += \ sbin_SCRIPTS += \
tools/frr-reload \ tools/frr-reload \
tools/frr-reload.py \
tools/frr \ tools/frr \
\ \
tools/frrcommon.sh \ tools/frrcommon.sh \
tools/frrinit.sh \ tools/frrinit.sh \
tools/generate_support_bundle.py \
tools/frr_babeltrace.py \
tools/watchfrr.sh \ tools/watchfrr.sh \
# end # end