From b832909b42dc3cb83901a99ac37666919b6f79d9 Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Tue, 16 Feb 2021 18:05:38 -0500 Subject: *: 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 --- debian/frr.dirs | 1 - debian/frr.install | 1 - debian/rules | 3 --- 3 files changed, 5 deletions(-) (limited to 'debian') diff --git a/debian/frr.dirs b/debian/frr.dirs index 9e592e370c..e3832d10a1 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 9972b579f0..6bc1786581 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 25ae04261d..93d0cdb2a0 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 -- cgit v1.2.3