proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-26 04:54:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6601 from Jafaral/version

Browse Source 
build: Allow removal of build configs from version string
This commit is contained in:
Donald Sharp 2020-06-22 08:03:08 -04:00 committed by GitHub
commit dbec65f6ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -645,6 +645,9 @@ AC_ARG_WITH([crypto],
AC_ARG_WITH([frr-format], AC_ARG_WITH([frr-format],
AS_HELP_STRING([--with-frr-format[=<.../frr-format.so>]], [use frr-format GCC plugin])) AS_HELP_STRING([--with-frr-format[=<.../frr-format.so>]], [use frr-format GCC plugin]))
AC_ARG_ENABLE([version-build-config],
AS_HELP_STRING([--disable-version-build-config], [do not include build configs in show version command]))
#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"], [], [])
@ -1682,6 +1685,10 @@ case "${enable_bmp}" in
;; ;;
esac esac
if test "$enable_version_build_config" != "no";then
AC_DEFINE([ENABLE_VERSION_BUILD_CONFIG], [1], [Report build configs in show version])
fi
dnl ########################################################################## dnl ##########################################################################
dnl LARGE if block dnl LARGE if block
if test "$enable_clippy_only" != "yes"; then if test "$enable_clippy_only" != "yes"; then

12
doc/user/installation.rst
View File

@ -279,6 +279,18 @@ options from the list below.
With this option, we provide a way to strip out these characters for APK dev With this option, we provide a way to strip out these characters for APK dev
package builds. package builds.
..option:: --disable-version-build-config
Remove the "configuerd with" field that has all of the build configuration
arguments when reporting the version string in `show version` command.
..option:: --with-pkg-extra-version=VER
Add extra version field, for packagers/distributions
..option:: --with-pkg-git-version
Add git information to MOTD and build version string
.. option:: --enable-multipath=X .. option:: --enable-multipath=X
Compile FRR with up to X way ECMP supported. This number can be from 0-999. Compile FRR with up to X way ECMP supported. This number can be from 0-999.

5
lib/command.c
View File

@ -144,7 +144,9 @@ void print_version(const char *progname)
{ {
printf("%s version %s\n", progname, FRR_VERSION); printf("%s version %s\n", progname, FRR_VERSION);
printf("%s\n", FRR_COPYRIGHT); printf("%s\n", FRR_COPYRIGHT);
#ifdef ENABLE_VERSION_BUILD_CONFIG
printf("configured with:\n\t%s\n", FRR_CONFIG_ARGS); printf("configured with:\n\t%s\n", FRR_CONFIG_ARGS);
#endif
} }
char *argv_concat(struct cmd_token **argv, int argc, int shift) char *argv_concat(struct cmd_token **argv, int argc, int shift)
@ -1334,8 +1336,9 @@ DEFUN (show_version,
vty_out(vty, "%s %s (%s).\n", FRR_FULL_NAME, FRR_VERSION, vty_out(vty, "%s %s (%s).\n", FRR_FULL_NAME, FRR_VERSION,
cmd_hostname_get() ? cmd_hostname_get() : ""); cmd_hostname_get() ? cmd_hostname_get() : "");
vty_out(vty, "%s%s\n", FRR_COPYRIGHT, GIT_INFO); vty_out(vty, "%s%s\n", FRR_COPYRIGHT, GIT_INFO);
#ifdef ENABLE_VERSION_BUILD_CONFIG
vty_out(vty, "configured with:\n %s\n", FRR_CONFIG_ARGS); vty_out(vty, "configured with:\n %s\n", FRR_CONFIG_ARGS);
#endif
return CMD_SUCCESS; return CMD_SUCCESS;
} }