debianpkg: ditch development-only files

It is currently impossible to build external stuff that links against
installed FRR headers or libraries.  Such projects need to directly
reference an FRR source tree until we revamp the library installation
semantics.

In any case these files would then be in a frr-dev Debian package.

Signed-off-by: David Lamparter <equinox@diac24.net>

diff --git a/debianpkg/frr.install b/debianpkg/frr.install
index 7ef9aaa6112b4f73de3e5af4af8ac82f326368a1..b979f9be93ad4606438e302b41e838ce08eb6f2d 100644 (file)
--- 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 2e9888ed4f7ba4fc6cc1c6c8eaf34dd6f2da6185..30a3caf376c261be91fd0041c91baefdcf9acaac 100644 (file)
--- 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 (file)
index 0000000..e43b95c
--- /dev/null
+++ b/debianpkg/not-installed
@@ -0,0 +1 @@
+usr/include

diff --git a/debianpkg/rules b/debianpkg/rules
index 94891c14c2c3cef7dd91eb32a622a7d191df1b86..50eaf192b193e4f67671de0556e252435dec7e5b 100755 (executable)
--- 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 4193eadc152ce4cf237bacfeaa34b89ad3f6008d..0cd1bca0071a9cd79987c874b5a4bc40a324fb8e 100644 (file)
--- 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