Install files under multiarch directories

adapted from debian-upstream 8f137b115a89348e7816f60b5e8410fd303fec81

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
Stoiko Ivanov 2020-12-02 20:18:02 +01:00 committed by Thomas Lamprecht
parent 374aad5bea
commit 457cad5f88
11 changed files with 19 additions and 13 deletions

View File

@ -1 +0,0 @@
lib/libnvpair.so.*

1
debian/libnvpair1linux.install.in vendored Normal file
View File

@ -0,0 +1 @@
lib/@DEB_HOST_MULTIARCH@/libnvpair.so.*

View File

@ -1 +0,0 @@
lib/libuutil.so.*

1
debian/libuutil1linux.install.in vendored Normal file
View File

@ -0,0 +1 @@
lib/@DEB_HOST_MULTIARCH@/libuutil.so.*

View File

@ -1,2 +0,0 @@
lib/libzfs.so.*
lib/libzfs_core.so.*

2
debian/libzfs2linux.install.in vendored Normal file
View File

@ -0,0 +1,2 @@
lib/@DEB_HOST_MULTIARCH@/libzfs.so.*
lib/@DEB_HOST_MULTIARCH@/libzfs_core.so.*

View File

@ -1,4 +0,0 @@
lib/*.a usr/lib/
usr/include
usr/lib/*.so
lib/pkgconfig/*.pc usr/lib/pkgconfig/

4
debian/libzfslinux-dev.install.in vendored Normal file
View File

@ -0,0 +1,4 @@
lib/@DEB_HOST_MULTIARCH@/*.a usr/lib/@DEB_HOST_MULTIARCH@/
usr/include
usr/lib/@DEB_HOST_MULTIARCH@/*.so
/usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/*.pc

View File

@ -1 +0,0 @@
lib/libzpool.so.*

1
debian/libzpool2linux.install.in vendored Normal file
View File

@ -0,0 +1 @@
lib/@DEB_HOST_MULTIARCH@/libzpool.so.*

14
debian/rules vendored
View File

@ -28,7 +28,8 @@ override_dh_auto_configure:
dh_auto_configure -- \
--bindir=/usr/bin \
--sbindir=/sbin \
--libdir=/lib \
--libdir=/lib/"$(DEB_HOST_MULTIARCH)" \
--with-pkgconfigdir='/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig' \
--with-udevdir=/lib/udev \
--with-zfsexecdir=/usr/lib/zfs-linux \
--enable-systemd \
@ -39,6 +40,11 @@ override_dh_auto_configure:
--with-systemdgeneratordir=/lib/systemd/system-generators \
--with-config=user
for i in $(wildcard $(CURDIR)/debian/*.install.in) ; do \
basename "$$i" | grep _KVERS_ && continue ; \
sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' "$$i" > "$${i%%.in}" ; \
done
override_dh_auto_test:
# The dh_auto_test rule is disabled because
# `make check` cannot run in an unprivileged build environment.
@ -62,9 +68,9 @@ override_dh_auto_install:
@# Zed has dependencies outside of the system root.
mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
mkdir -p $(CURDIR)/debian/tmp/usr/lib
for i in `ls $(CURDIR)/debian/tmp/lib/*.so`; do \
ln -s /lib/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/`basename $${i}`; \
mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
for i in `ls $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*.so`; do \
ln -s /lib/$(DEB_HOST_MULTIARCH)/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/`basename $${i}`; \
rm $${i}; \
done