summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@nvidia.com>2021-02-17 00:05:38 +0100
committerQuentin Young <qlyoung@nvidia.com>2021-04-09 19:14:30 +0200
commitb832909b42dc3cb83901a99ac37666919b6f79d9 (patch)
treec870f98a5f30158dcbaf733e0fe3c3d898756ee7 /debian
parentrpm: install frr.conf by default (diff)
downloadfrr-b832909b42dc3cb83901a99ac37666919b6f79d9.tar.xz
frr-b832909b42dc3cb83901a99ac37666919b6f79d9.zip
*: remove *.conf.sample files
Most of these are many, many years out of date. All of them vary randomly in quality. They show up by default in packages where they aren't really useful now that we use integrated config. Remove them. The useful ones have been moved to the docs. Signed-off-by: Quentin Young <qlyoung@nvidia.com>
Diffstat (limited to 'debian')
-rw-r--r--debian/frr.dirs1
-rw-r--r--debian/frr.install1
-rwxr-xr-xdebian/rules3
3 files changed, 0 insertions, 5 deletions
diff --git a/debian/frr.dirs b/debian/frr.dirs
index 9e592e370..e3832d10a 100644
--- a/debian/frr.dirs
+++ b/debian/frr.dirs
@@ -2,7 +2,6 @@ etc/frr/
etc/iproute2/rt_protos.d/
etc/logrotate.d/
usr/share/doc/frr/
-usr/share/doc/frr/examples/
usr/share/lintian/overrides/
usr/share/yang/
var/log/frr/
diff --git a/debian/frr.install b/debian/frr.install
index 9972b579f..6bc178658 100644
--- a/debian/frr.install
+++ b/debian/frr.install
@@ -16,6 +16,5 @@ usr/lib/frr/*.sh
usr/lib/frr/*d
usr/lib/frr/watchfrr
usr/lib/frr/zebra
-usr/share/doc/frr/examples
usr/share/man/
usr/share/yang/
diff --git a/debian/rules b/debian/rules
index 25ae04261..93d0cdb2a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,7 +43,6 @@ export PYTHON=python3
override_dh_auto_configure:
$(shell dpkg-buildflags --export=sh); \
dh_auto_configure -- \
- --enable-exampledir=/usr/share/doc/frr/examples/ \
--localstatedir=/var/run/frr \
--sbindir=/usr/lib/frr \
--sysconfdir=/etc/frr \
@@ -92,8 +91,6 @@ endif
cp -r tools/etc/* debian/tmp/etc/
-rm debian/tmp/etc/frr/daemons.conf
- sed -e 's#^!log file #!log file /var/log/frr/#' -i debian/tmp/usr/share/doc/frr/examples/*sample*
-
# drop dev-only files
find debian/tmp -name '*.la' -o -name '*.a' -o -name 'lib*.so' | xargs rm -f
rm -rf debian/tmp/usr/include