diff options
| author | David Lamparter <equinox@diac24.net> | 2018-10-28 18:54:14 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2019-02-19 21:30:52 +0100 |
| commit | 26f0a29704e076f42ba8266c994186be4b615e47 (patch) | |
| tree | 5299967018509d7924c0e183b4a9b51345b7a39d | |
| parent | 61185d62c0e4d8e21b825a98430f0d746c22938e (diff) | |
debianpkg: install libraries to /usr/lib64/frr
This makes them "private libraries" (which they are, since we don't
maintain a proper versioned ABI on libfrr.) This also properly fixes
another few lintian warnings.
Signed-off-by: David Lamparter <equinox@diac24.net>
| -rw-r--r-- | debianpkg/frr-snmp.install | 2 | ||||
| -rw-r--r-- | debianpkg/frr.install | 4 | ||||
| -rw-r--r-- | debianpkg/frr.lintian-overrides | 6 | ||||
| -rwxr-xr-x | debianpkg/rules | 7 |
4 files changed, 10 insertions, 9 deletions
diff --git a/debianpkg/frr-snmp.install b/debianpkg/frr-snmp.install index 33fcdfb598..5517ca7eec 100644 --- a/debianpkg/frr-snmp.install +++ b/debianpkg/frr-snmp.install @@ -1,2 +1,2 @@ -usr/lib/*/libfrrsnmp.* +usr/lib/*/frr/libfrrsnmp.* usr/lib/*/frr/modules/*_snmp.so diff --git a/debianpkg/frr.install b/debianpkg/frr.install index 2b672f07f7..f2498a5fd4 100644 --- a/debianpkg/frr.install +++ b/debianpkg/frr.install @@ -1,8 +1,8 @@ etc/frr/ usr/bin/vtysh usr/bin/mtracebis -usr/lib/*/libfrr.* -usr/lib/*/libfrrospfapiclient.* +usr/lib/*/frr/libfrr.* +usr/lib/*/frr/libfrrospfapiclient.* usr/lib/frr/frr usr/lib/frr/*d usr/lib/frr/watchfrr diff --git a/debianpkg/frr.lintian-overrides b/debianpkg/frr.lintian-overrides index 7c62ec3765..4df816fa05 100644 --- a/debianpkg/frr.lintian-overrides +++ b/debianpkg/frr.lintian-overrides @@ -1,9 +1,3 @@ -# libfrr* are for internal use only and do not provide a stable API or ABI. -# soname / library versioning is irrelevant and they must always be shipped -# exact-matching to the daemons compiled against it -frr binary: package-name-doesnt-match-sonames libfrr0 libfrrospfapiclient0 -frr binary: no-symbols-control-file * - # we're a bit special since we provide network connectivity by starting up # routing protocols. frr binary: systemd-service-file-refers-to-unusual-wantedby-target lib/systemd/system/frr.service network-online.target diff --git a/debianpkg/rules b/debianpkg/rules index 9baec7d457..8e1d3e98af 100755 --- a/debianpkg/rules +++ b/debianpkg/rules @@ -133,6 +133,9 @@ override_dh_auto_configure: --sbindir=/usr/lib/frr \ --sysconfdir=/etc/frr \ --with-vtysh-pager=/usr/bin/pager \ + --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)/frr \ + --with-moduledir=/usr/lib/$(DEB_HOST_MULTIARCH)/frr/modules \ + LIBTOOLFLAGS="-rpath /usr/lib/$(DEB_HOST_MULTIARCH)/frr" \ $(USE_DOC) \ $(USE_SNMP) \ $(USE_OSPFAPI) \ @@ -181,6 +184,10 @@ endif override_dh_auto_build: dh_auto_build -- $(MAKE_SILENT) +override_dh_makeshlibs: +# we don't need or want ldconfig for private libs + dh_makeshlibs -n + override_dh_missing: dh_missing --fail-missing |