Skip to content

Commit

Permalink
Fix packaging for libzoa.so (openzfs#42)
Browse files Browse the repository at this point in the history
Move libzoa.so from package zfsutils-linux to libzfslinux-dev and
obtain it from its "installed" location (lib/) rather than the src tree
  • Loading branch information
mmaybee authored Dec 2, 2021
1 parent 8b3cf9c commit 460d071
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion debian/libzfslinux-dev.install
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
lib/*.a usr/lib/
usr/include
usr/lib/*.so
lib/*.so
lib/pkgconfig/*.pc
6 changes: 0 additions & 6 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,6 @@ override_dh_auto_install:
printf '#!/bin/sh\ncp "$$@"\n' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/cp'
chmod 755 '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/cp'

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}`; \
rm $${i}; \
done

chmod a-x $(CURDIR)/debian/tmp/etc/zfs/zfs-functions
chmod a-x $(CURDIR)/debian/tmp/etc/default/zfs

Expand Down
2 changes: 1 addition & 1 deletion debian/zfsutils-linux.install
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ usr/lib/*/zfs/zpool.d/
usr/lib/*/zfs/zpool_influxdb
sbin/fsck.zfs
sbin/mount.zfs
sbin/zcache
sbin/zcachedb
sbin/zgenhostid
sbin/ztest
Expand All @@ -39,7 +40,6 @@ sbin/zfs
sbin/zfs_object_agent
sbin/zfs_object_perf
sbin/zoa_test
cmd/zfs_object_agent/libzoa.so lib/
usr/bin/zvol_wait
usr/bin/zoa_chaos_monkey
usr/bin/start_zoa
Expand Down

0 comments on commit 460d071

Please sign in to comment.