diff --git a/debianpkg/frr.install b/debianpkg/frr.install index 7ef9aaa611..b979f9be93 100644 --- a/debianpkg/frr.install +++ b/debianpkg/frr.install @@ -1,7 +1,6 @@ etc/frr/ usr/bin/vtysh usr/bin/mtracebis -usr/include/frr usr/lib/*/libfrr.* usr/lib/*/libfrrospfapiclient.* usr/lib/frr/*d diff --git a/debianpkg/frr.lintian-overrides b/debianpkg/frr.lintian-overrides index 2e9888ed4f..30a3caf376 100644 --- a/debianpkg/frr.lintian-overrides +++ b/debianpkg/frr.lintian-overrides @@ -1,6 +1,2 @@ -frr: non-dev-pkg-with-shlib-symlink usr/lib/libfrrospfapiclient.so.0.0.0 usr/lib/libfrrospfapiclient.so -frr: non-dev-pkg-with-shlib-symlink usr/lib/libfrr.so.0.0.0 usr/lib/libfrr.so -frr: non-dev-pkg-with-shlib-symlink usr/lib/libfrrfpm_pb.so.0.0.0 usr/lib/libfrrfpm_pb.so frr: package-name-doesnt-match-sonames libfrr0 libfrrfpm-pb0 libfrrospfapiclient0 frr: systemd-service-file-refers-to-unusual-wantedby-target lib/systemd/system/frr.service network-online.target -frr: shared-lib-without-dependency-information usr/lib/libfrrfpm_pb.so.0.0.0 diff --git a/debianpkg/not-installed b/debianpkg/not-installed new file mode 100644 index 0000000000..e43b95cb97 --- /dev/null +++ b/debianpkg/not-installed @@ -0,0 +1 @@ +usr/include diff --git a/debianpkg/rules b/debianpkg/rules index 94891c14c2..50eaf192b1 100755 --- a/debianpkg/rules +++ b/debianpkg/rules @@ -167,10 +167,9 @@ endif mkdir -p debian/tmp/etc/frr/ perl -pi -e 's#^!log file #!log file /var/log/frr/#' debian/tmp/usr/share/doc/frr/examples/*sample* - # we don't need .la files - rm debian/tmp/usr/lib/*/*.la - rm debian/tmp/usr/lib/*/frr/modules/*.la - rm debian/tmp/usr/lib/*/frr/libyang_plugins/*.la + # 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 override_dh_auto_build: dh_auto_build -- $(MAKE_SILENT) diff --git a/debianpkg/subdir.am b/debianpkg/subdir.am index 4193eadc15..0cd1bca007 100644 --- a/debianpkg/subdir.am +++ b/debianpkg/subdir.am @@ -36,4 +36,5 @@ EXTRA_DIST += \ debianpkg/frr.postrm \ debianpkg/frr.preinst \ debianpkg/frr.prerm \ + debianpkg/not-installed \ # end