Mirror/frr
1
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 05:27:16 +02:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

build: update packaging & docs for dir changes

Browse source 
`--sysconfdir` and `--localstatedir` now align with general autoconf
practices.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2024-01-25 16:35:29 +01:00
parent ff62df2e44
commit 444bc5e237
25 changed files with 65 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
alpine/APKBUILD.in
View file

@ -28,9 +28,7 @@ source="$pkgname-$pkgver.tar.gz"
builddir="$srcdir"/$pkgname-$pkgver builddir="$srcdir"/$pkgname-$pkgver
_sbindir=/usr/lib/frr _sbindir=/usr/lib/frr
_sysconfdir=/etc/frr
_libdir=/usr/lib _libdir=/usr/lib
_localstatedir=/var/run/frr
_user=frr _user=frr
build() { build() {
@ -38,10 +36,10 @@ build() {
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--sbindir=$_sbindir \ --sbindir=$_sbindir \
--sysconfdir=$_sysconfdir \
--libdir=$_libdir \ --libdir=$_libdir \
--localstatedir=$_localstatedir \
--enable-rpki \ --enable-rpki \
--enable-vtysh \ --enable-vtysh \
--enable-multipath=64 \ --enable-multipath=64 \

2
buildtest.sh
View file

@ -5,7 +5,7 @@
# builds some git commit of FRR in some different configurations # builds some git commit of FRR in some different configurations
# usage: buildtest.sh [commit [configurations...]] # usage: buildtest.sh [commit [configurations...]]
basecfg="--prefix=/usr --enable-user=frr --enable-group=frr --enable-vty-group=frr --enable-configfile-mask=0660 --enable-logfile-mask=0640 --enable-vtysh --sysconfdir=/etc/frr --localstatedir=/var/run/frr --libdir=/usr/lib64/frr --enable-rtadv --disable-static --enable-isisd --enable-multipath=0 --enable-pimd --enable-werror" basecfg="--prefix=/usr --enable-user=frr --enable-group=frr --enable-vty-group=frr --enable-configfile-mask=0660 --enable-logfile-mask=0640 --enable-vtysh --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib64/frr --enable-rtadv --disable-static --enable-isisd --enable-multipath=0 --enable-pimd --enable-werror"
configs_base="gcc|$basecfg" configs_base="gcc|$basecfg"

2
debian/rules vendored
View file

@ -41,9 +41,7 @@ export PYTHON=python3
override_dh_auto_configure: override_dh_auto_configure:
$(shell dpkg-buildflags --export=sh); \ $(shell dpkg-buildflags --export=sh); \
dh_auto_configure -- \ dh_auto_configure -- \
--localstatedir=/var/run/frr \
--sbindir=/usr/lib/frr \ --sbindir=/usr/lib/frr \
--sysconfdir=/etc/frr \
--with-vtysh-pager=/usr/bin/pager \ --with-vtysh-pager=/usr/bin/pager \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/frr \ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/frr \
--with-moduledir=/usr/lib/$(DEB_HOST_MULTIARCH)/frr/modules \ --with-moduledir=/usr/lib/$(DEB_HOST_MULTIARCH)/frr/modules \

2
doc/developer/building-frr-for-centos6.rst
View file

@ -161,10 +161,8 @@ an example.)
./configure \ ./configure \
--bindir=/usr/bin \ --bindir=/usr/bin \
--sbindir=/usr/lib/frr \ --sbindir=/usr/lib/frr \
--sysconfdir=/etc/frr \
--libdir=/usr/lib/frr \ --libdir=/usr/lib/frr \
--libexecdir=/usr/lib/frr \ --libexecdir=/usr/lib/frr \
--localstatedir=/var/run/frr \
--with-moduledir=/usr/lib/frr/modules \ --with-moduledir=/usr/lib/frr/modules \
--disable-pimd \ --disable-pimd \
--enable-snmp=agentx \ --enable-snmp=agentx \

2
doc/developer/building-frr-for-centos7.rst
View file

@ -58,10 +58,8 @@ an example.)
./configure \ ./configure \
--bindir=/usr/bin \ --bindir=/usr/bin \
--sbindir=/usr/lib/frr \ --sbindir=/usr/lib/frr \
--sysconfdir=/etc/frr \
--libdir=/usr/lib/frr \ --libdir=/usr/lib/frr \
--libexecdir=/usr/lib/frr \ --libexecdir=/usr/lib/frr \
--localstatedir=/var/run/frr \
--with-moduledir=/usr/lib/frr/modules \ --with-moduledir=/usr/lib/frr/modules \
--enable-snmp=agentx \ --enable-snmp=agentx \
--enable-multipath=64 \ --enable-multipath=64 \

2
doc/developer/building-frr-for-centos8.rst
View file

@ -52,10 +52,8 @@ an example.)
./configure \ ./configure \
--bindir=/usr/bin \ --bindir=/usr/bin \
--sbindir=/usr/lib/frr \ --sbindir=/usr/lib/frr \
--sysconfdir=/etc/frr \
--libdir=/usr/lib/frr \ --libdir=/usr/lib/frr \
--libexecdir=/usr/lib/frr \ --libexecdir=/usr/lib/frr \
--localstatedir=/var/run/frr \
--with-moduledir=/usr/lib/frr/modules \ --with-moduledir=/usr/lib/frr/modules \
--enable-snmp=agentx \ --enable-snmp=agentx \
--enable-multipath=64 \ --enable-multipath=64 \

4
doc/developer/building-frr-for-debian12.rst
View file

@ -47,9 +47,9 @@ an example.)
cd frr cd frr
./bootstrap.sh ./bootstrap.sh
./configure \ ./configure \
--localstatedir=/var/opt/frr \ --sysconfdir=/etc \
--localstatedir=/var \
--sbindir=/usr/lib/frr \ --sbindir=/usr/lib/frr \
--sysconfdir=/etc/frr \
--enable-multipath=64 \ --enable-multipath=64 \
--enable-user=frr \ --enable-user=frr \
--enable-group=frr \ --enable-group=frr \

10
doc/developer/building-frr-for-debian8.rst
View file

@ -57,9 +57,9 @@ an example.)
cd frr cd frr
./bootstrap.sh ./bootstrap.sh
./configure \ ./configure \
--localstatedir=/var/run/frr \ --sysconfdir=/etc \
--localstatedir=/var \
--sbindir=/usr/lib/frr \ --sbindir=/usr/lib/frr \
--sysconfdir=/etc/frr \
--enable-multipath=64 \ --enable-multipath=64 \
--enable-user=frr \ --enable-user=frr \
--enable-group=frr \ --enable-group=frr \
@ -118,9 +118,9 @@ Troubleshooting
The local state directory must exist and have the correct permissions The local state directory must exist and have the correct permissions
applied for the frrouting daemons to start. In the above ./configure applied for the frrouting daemons to start. In the above ./configure
example the local state directory is set to /var/run/frr example the local state directory is set to ``/var`` such that ``/var/run/frr``
(--localstatedir=/var/run/frr) Debian considers /var/run/frr to be is used. Debian considers ``/var/run/frr`` to be temporary and this is removed
temporary and this is removed after a reboot. after a reboot.
When using a different local state directory you need to create the new When using a different local state directory you need to create the new
directory and change the ownership to the frr user, for example: directory and change the ownership to the frr user, for example:

4
doc/developer/building-frr-for-debian9.rst
View file

@ -47,9 +47,9 @@ an example.)
cd frr cd frr
./bootstrap.sh ./bootstrap.sh
./configure \ ./configure \
--localstatedir=/var/opt/frr \ --sysconfdir=/etc \
--localstatedir=/var \
--sbindir=/usr/lib/frr \ --sbindir=/usr/lib/frr \
--sysconfdir=/etc/frr \
--enable-multipath=64 \ --enable-multipath=64 \
--enable-user=frr \ --enable-user=frr \
--enable-group=frr \ --enable-group=frr \

4
doc/developer/building-frr-for-freebsd10.rst
View file

@ -60,9 +60,9 @@ an example)
export LDFLAGS="-L/usr/local/lib" export LDFLAGS="-L/usr/local/lib"
export CPPFLAGS="-I/usr/local/include" export CPPFLAGS="-I/usr/local/include"
./configure \ ./configure \
--sysconfdir=/usr/local/etc/frr \ --sysconfdir=/usr/local/etc \
--localstatedir=/var \
--enable-pkgsrcrcdir=/usr/pkg/share/examples/rc.d \ --enable-pkgsrcrcdir=/usr/pkg/share/examples/rc.d \
--localstatedir=/var/run/frr \
--prefix=/usr/local \ --prefix=/usr/local \
--enable-multipath=64 \ --enable-multipath=64 \
--enable-user=frr \ --enable-user=frr \

4
doc/developer/building-frr-for-freebsd11.rst
View file

@ -65,9 +65,9 @@ an example)
setenv CPPFLAGS -I/usr/local/include setenv CPPFLAGS -I/usr/local/include
ln -s /usr/local/bin/sphinx-build-3.6 /usr/local/bin/sphinx-build ln -s /usr/local/bin/sphinx-build-3.6 /usr/local/bin/sphinx-build
./configure \ ./configure \
--sysconfdir=/usr/local/etc/frr \ --sysconfdir=/usr/local/etc \
--localstatedir=/var \
--enable-pkgsrcrcdir=/usr/pkg/share/examples/rc.d \ --enable-pkgsrcrcdir=/usr/pkg/share/examples/rc.d \
--localstatedir=/var/run/frr \
--prefix=/usr/local \ --prefix=/usr/local \
--enable-multipath=64 \ --enable-multipath=64 \
--enable-user=frr \ --enable-user=frr \

4
doc/developer/building-frr-for-freebsd13.rst
View file

@ -52,9 +52,9 @@ an example)
./bootstrap.sh ./bootstrap.sh
export MAKE=gmake LDFLAGS=-L/usr/local/lib CPPFLAGS=-I/usr/local/include export MAKE=gmake LDFLAGS=-L/usr/local/lib CPPFLAGS=-I/usr/local/include
./configure \ ./configure \
--sysconfdir=/usr/local/etc/frr \ --sysconfdir=/usr/local/etc \
--localstatedir=/var \
--enable-pkgsrcrcdir=/usr/pkg/share/examples/rc.d \ --enable-pkgsrcrcdir=/usr/pkg/share/examples/rc.d \
--localstatedir=/var/run/frr \
--prefix=/usr/local \ --prefix=/usr/local \
--enable-multipath=64 \ --enable-multipath=64 \
--enable-user=frr \ --enable-user=frr \

4
doc/developer/building-frr-for-freebsd14.rst
View file

@ -52,9 +52,9 @@ an example)
./bootstrap.sh ./bootstrap.sh
export MAKE=gmake LDFLAGS=-L/usr/local/lib CPPFLAGS=-I/usr/local/include export MAKE=gmake LDFLAGS=-L/usr/local/lib CPPFLAGS=-I/usr/local/include
./configure \ ./configure \
--sysconfdir=/usr/local/etc/frr \ --sysconfdir=/usr/local/etc \
--localstatedir=/var \
--enable-pkgsrcrcdir=/usr/pkg/share/examples/rc.d \ --enable-pkgsrcrcdir=/usr/pkg/share/examples/rc.d \
--localstatedir=/var/run/frr \
--prefix=/usr/local \ --prefix=/usr/local \
--enable-multipath=64 \ --enable-multipath=64 \
--enable-user=frr \ --enable-user=frr \

4
doc/developer/building-frr-for-freebsd9.rst
View file

@ -70,9 +70,9 @@ an example)
export LDFLAGS="-L/usr/local/lib" export LDFLAGS="-L/usr/local/lib"
export CPPFLAGS="-I/usr/local/include" export CPPFLAGS="-I/usr/local/include"
./configure \ ./configure \
--sysconfdir=/usr/local/etc/frr \ --sysconfdir=/usr/local/etc \
--localstatedir=/var \
--enable-pkgsrcrcdir=/usr/pkg/share/examples/rc.d \ --enable-pkgsrcrcdir=/usr/pkg/share/examples/rc.d \
--localstatedir=/var/run/frr \
--prefix=/usr/local \ --prefix=/usr/local \
--enable-multipath=64 \ --enable-multipath=64 \
--enable-user=frr \ --enable-user=frr \

4
doc/developer/building-frr-for-netbsd6.rst
View file

@ -64,9 +64,9 @@ an example)
export LDFLAGS="-L/usr/pkg/lib -R/usr/pkg/lib" export LDFLAGS="-L/usr/pkg/lib -R/usr/pkg/lib"
export CPPFLAGS="-I/usr/pkg/include" export CPPFLAGS="-I/usr/pkg/include"
./configure \ ./configure \
--sysconfdir=/usr/pkg/etc/frr \ --sysconfdir=/usr/pkg/etc \
--localstatedir=/var \
--enable-pkgsrcrcdir=/usr/pkg/share/examples/rc.d \ --enable-pkgsrcrcdir=/usr/pkg/share/examples/rc.d \
--localstatedir=/var/run/frr \
--enable-multipath=64 \ --enable-multipath=64 \
--enable-user=frr \ --enable-user=frr \
--enable-group=frr \ --enable-group=frr \

4
doc/developer/building-frr-for-netbsd7.rst
View file

@ -55,9 +55,9 @@ an example)
export LDFLAGS="-L/usr/pkg/lib -R/usr/pkg/lib" export LDFLAGS="-L/usr/pkg/lib -R/usr/pkg/lib"
export CPPFLAGS="-I/usr/pkg/include" export CPPFLAGS="-I/usr/pkg/include"
./configure \ ./configure \
--sysconfdir=/usr/pkg/etc/frr \ --sysconfdir=/usr/pkg/etc \
--localstatedir=/var \
--enable-pkgsrcrcdir=/usr/pkg/share/examples/rc.d \ --enable-pkgsrcrcdir=/usr/pkg/share/examples/rc.d \
--localstatedir=/var/run/frr \
--enable-multipath=64 \ --enable-multipath=64 \
--enable-user=frr \ --enable-user=frr \
--enable-group=frr \ --enable-group=frr \

4
doc/developer/building-frr-for-openbsd6.rst
View file

@ -71,8 +71,8 @@ an example)
export LDFLAGS="-L/usr/local/lib" export LDFLAGS="-L/usr/local/lib"
export CPPFLAGS="-I/usr/local/include" export CPPFLAGS="-I/usr/local/include"
./configure \ ./configure \
--sysconfdir=/etc/frr \ --sysconfdir=/etc \
--localstatedir=/var/frr \ --localstatedir=/var \
--enable-multipath=64 \ --enable-multipath=64 \
--enable-user=_frr \ --enable-user=_frr \
--enable-group=_frr \ --enable-group=_frr \

4
doc/developer/cross-compiling.rst
View file

@ -239,9 +239,9 @@ the last thing to actually build is FRR itself:
--host=${HOST_ARCH} \ --host=${HOST_ARCH} \
--with-sysroot=/usr/${HOST_ARCH} \ --with-sysroot=/usr/${HOST_ARCH} \
--with-clippy=./build-clippy/lib/clippy \ --with-clippy=./build-clippy/lib/clippy \
--sysconfdir=/etc/frr \ --sysconfdir=/etc \
--localstatedir=/var \
--sbindir="\${prefix}/lib/frr" \ --sbindir="\${prefix}/lib/frr" \
--localstatedir=/var/run/frr \
--prefix=/usr \ --prefix=/usr \
--enable-user=frr \ --enable-user=frr \
--enable-group=frr \ --enable-group=frr \

4
doc/developer/include-compile.rst
View file

@ -14,8 +14,8 @@ obtained by running ``./configure -h``. The options shown below are examples.
--sbindir=\${prefix}/lib/frr \ --sbindir=\${prefix}/lib/frr \
--libdir=\${prefix}/lib/frr \ --libdir=\${prefix}/lib/frr \
--libexecdir=\${prefix}/lib/frr \ --libexecdir=\${prefix}/lib/frr \
--localstatedir=/var/run/frr \ --sysconfdir=/etc \
--sysconfdir=/etc/frr \ --localstatedir=/var \
--with-moduledir=\${prefix}/lib/frr/modules \ --with-moduledir=\${prefix}/lib/frr/modules \
--enable-configfile-mask=0640 \ --enable-configfile-mask=0640 \
--enable-logfile-mask=0640 \ --enable-logfile-mask=0640 \

9
doc/developer/topotests.rst
View file

@ -113,9 +113,9 @@ If you prefer to manually build FRR, then use the following suggested config:
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
--localstatedir=/var/run/frr \ --sysconfdir=/etc \
--localstatedir=/var \
--sbindir=/usr/lib/frr \ --sbindir=/usr/lib/frr \
--sysconfdir=/etc/frr \
--enable-vtysh \ --enable-vtysh \
--enable-pimd \ --enable-pimd \
--enable-pim6d \ --enable-pim6d \
@ -383,8 +383,9 @@ for ``master`` branch:
./bootstrap.sh ./bootstrap.sh
./configure \ ./configure \
--enable-address-sanitizer \ --enable-address-sanitizer \
--prefix=/usr/lib/frr --sysconfdir=/etc/frr \ --prefix=/usr/lib/frr \
--localstatedir=/var/run/frr \ --sysconfdir=/etc \
--localstatedir=/var \
--sbindir=/usr/lib/frr --bindir=/usr/lib/frr \ --sbindir=/usr/lib/frr --bindir=/usr/lib/frr \
--with-moduledir=/usr/lib/frr/modules \ --with-moduledir=/usr/lib/frr/modules \
--enable-multipath=0 --enable-rtadv \ --enable-multipath=0 --enable-rtadv \

19
doc/user/installation.rst
View file

@ -394,13 +394,20 @@ options to the configuration script.
.. option:: --sysconfdir <dir> .. option:: --sysconfdir <dir>
Look for configuration files in `dir` [`prefix`/etc]. Note that sample Look for configuration files in `dir`/frr [`prefix`/etc]. Note that sample
configuration files will be installed here. configuration files will be installed here. Should be ``/etc`` unless
your platform splits package configuration locations.
.. option:: --localstatedir <dir> .. option:: --localstatedir <dir>
Configure zebra to use `dir` for local state files, such as pid files and Configure base directory for local state. Indirectly controls
unix sockets. ``--runstatedir``. Should be ``/var`` in most cases.
.. option:: --runstatedir <dir>
Configure FRR to use `dir`/frr for local state files, such as pid files and
unix sockets. Should be ``/var/run`` (default through ``--localstatedir``)
or ``/run`` in most cases.
.. option:: --with-scriptdir <dir> .. option:: --with-scriptdir <dir>
@ -579,9 +586,9 @@ the options you chose:
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
--localstatedir=/var/run/frr \ --sysconfdir=/etc \
--localstatedir=/var \
--sbindir=/usr/lib/frr \ --sbindir=/usr/lib/frr \
--sysconfdir=/etc/frr \
--enable-pimd \ --enable-pimd \
--enable-watchfrr \ --enable-watchfrr \
... ...

4
docker/ubuntu-ci/Dockerfile
View file

@ -110,9 +110,9 @@ RUN cd ~/frr && \
./bootstrap.sh && \ ./bootstrap.sh && \
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
--localstatedir=/var/run/frr \ --sysconfdir=/etc \
--localstatedir=/var \
--sbindir=/usr/lib/frr \ --sbindir=/usr/lib/frr \
--sysconfdir=/etc/frr \
--enable-sharpd \ --enable-sharpd \
--enable-multipath=64 \ --enable-multipath=64 \
--enable-user=frr \ --enable-user=frr \

17
redhat/frr.spec.in
View file

@ -42,8 +42,9 @@
%define zeb_docs %{zeb_src}/doc %define zeb_docs %{zeb_src}/doc
%define frr_tools %{zeb_src}/tools %define frr_tools %{zeb_src}/tools
# defines for configure %if 0%{!?_runstatedir:1}
%define rundir %{_localstatedir}/run/%{name} %define _runstatedir %{_localstatedir}/run
%endif
############################################################################ ############################################################################
@ -317,8 +318,8 @@ routing state through standard SNMP MIBs.
%configure \ %configure \
--sbindir=%{_sbindir} \ --sbindir=%{_sbindir} \
--sysconfdir=%{configdir} \ --sysconfdir=%{_sysconfdir} \
--localstatedir=%{rundir} \ --localstatedir=%{_localstatedir} \
--disable-static \ --disable-static \
--disable-werror \ --disable-werror \
--enable-irdp \ --enable-irdp \
@ -471,7 +472,7 @@ install %{zeb_src}/tools/etc/frr/daemons %{buildroot}%{_sysconfdir}/frr
install %{zeb_src}/tools/etc/frr/frr.conf %{buildroot}%{_sysconfdir}/frr/frr.conf.template install %{zeb_src}/tools/etc/frr/frr.conf %{buildroot}%{_sysconfdir}/frr/frr.conf.template
install -m644 %{zeb_rh_src}/frr.pam %{buildroot}%{_sysconfdir}/pam.d/frr install -m644 %{zeb_rh_src}/frr.pam %{buildroot}%{_sysconfdir}/pam.d/frr
install -m644 %{zeb_src}/tools/etc/logrotate.d/frr %{buildroot}%{_sysconfdir}/logrotate.d/frr install -m644 %{zeb_src}/tools/etc/logrotate.d/frr %{buildroot}%{_sysconfdir}/logrotate.d/frr
install -d -m750 %{buildroot}%{rundir} install -d -m750 %{buildroot}%{_runstatedir}/frr
%if 0%{?rhel} > 7 || 0%{?fedora} > 29 %if 0%{?rhel} > 7 || 0%{?fedora} > 29
# avoid `ERROR: ambiguous python shebang in` errors # avoid `ERROR: ambiguous python shebang in` errors
@ -495,7 +496,7 @@ rm -f %{buildroot}%{_sbindir}/ospfclient.py
getent passwd %{frr_user} >/dev/null || \ getent passwd %{frr_user} >/dev/null || \
useradd -r -u %{frr_uid} -g %{frr_user} \ useradd -r -u %{frr_uid} -g %{frr_user} \
-s /sbin/nologin -c "FRRouting suite" \ -s /sbin/nologin -c "FRRouting suite" \
-d %{rundir} %{frr_user} -d %{_runstatedir}/frr %{frr_user}
%if 0%{?vty_group:1} %if 0%{?vty_group:1}
usermod -a -G %{vty_group} %{frr_user} usermod -a -G %{vty_group} %{frr_user}
@ -655,11 +656,11 @@ fi
%if 0%{?frr_user:1} %if 0%{?frr_user:1}
%dir %attr(751,%{frr_user},%{frr_user}) %{configdir} %dir %attr(751,%{frr_user},%{frr_user}) %{configdir}
%dir %attr(755,%{frr_user},%{frr_user}) %{_localstatedir}/log/frr %dir %attr(755,%{frr_user},%{frr_user}) %{_localstatedir}/log/frr
%dir %attr(751,%{frr_user},%{frr_user}) %{rundir} %dir %attr(751,%{frr_user},%{frr_user}) %{_runstatedir}/frr
%else %else
%dir %attr(750,root,root) %{configdir} %dir %attr(750,root,root) %{configdir}
%dir %attr(755,root,root) %{_localstatedir}/log/frr %dir %attr(755,root,root) %{_localstatedir}/log/frr
%dir %attr(750,root,root) %{rundir} %dir %attr(750,root,root) %{_runstatedir}/frr
%endif %endif
%{_infodir}/frr.info.gz %{_infodir}/frr.info.gz
%{_mandir}/man*/* %{_mandir}/man*/*

4
snapcraft/snapcraft.yaml.in
View file

@ -381,10 +381,10 @@ parts:
- --enable-vrrpd - --enable-vrrpd
- --enable-configfile-mask=0640 - --enable-configfile-mask=0640
- --enable-logfile-mask=0640 - --enable-logfile-mask=0640
- --localstatedir=/var/run - --sysconfdir=/etc
- --localstatedir=/var
- --sbindir=/sbin - --sbindir=/sbin
- --bindir=/bin - --bindir=/bin
- --sysconfdir=/etc/frr
- --with-pkg-extra-version=@PACKAGE_EXTRAVERSION@ - --with-pkg-extra-version=@PACKAGE_EXTRAVERSION@
frr-defaults: frr-defaults:
plugin: dump plugin: dump

4
tests/topotests/docker/inner/compile_frr.sh
View file

@ -64,9 +64,9 @@ if [ ! -e Makefile ]; then
--enable-dev-build \ --enable-dev-build \
--with-moduledir=/usr/lib/frr/modules \ --with-moduledir=/usr/lib/frr/modules \
--prefix=/usr \ --prefix=/usr \
--localstatedir=/var/run/frr \ --sysconfdir=/etc \
--localstatedir=/var \
--sbindir=/usr/lib/frr \ --sbindir=/usr/lib/frr \
--sysconfdir=/etc/frr \
--enable-multipath=0 \ --enable-multipath=0 \
--enable-fpm \ --enable-fpm \
--enable-sharpd \ --enable-sharpd \