From: David Lamparter <equinox@diac24.net>
Date: Thu, 25 Oct 2018 13:00:55 +0000 (+0200)
Subject: debianpkg: ditch development-only files
X-Git-Tag: frr-7.0~5^2~62
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=72b33fa88a2509c040e427a6e19a3cc97049bf92;p=matthieu%2Ffrr.git

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 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