c/zfsonlinux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

debian: replace zpool.d patch by configure option

Browse Source 
the --with-zfsexecdir configure option is available in ZFS 0.8 and replaces
the patch for cmd/zpool/Makefile.am

(cherry-picked from salsa.d.o e1af594a0970e2b84c922f483e6798e7d155b7b7)

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
Stoiko Ivanov 2019-05-23 23:11:29 +02:00 committed by Thomas Lamprecht
parent 58608b5f2e
commit d56eab879e
3 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
zfs/debian/patches/0005-fix-install-path-of-zpool.d-scripts.patch
View File

@ -1,38 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Thu, 12 Oct 2017 08:57:48 +0200
Subject: [PATCH] fix install path of zpool.d scripts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
cmd/zpool/Makefile.am | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am
index d07f8d616..5d26f326e 100644
--- a/cmd/zpool/Makefile.am
+++ b/cmd/zpool/Makefile.am
@@ -22,11 +22,11 @@ zpool_LDADD = \
-lm $(LIBBLKID)
zpoolconfdir = $(sysconfdir)/zfs/zpool.d
-zpoolexecdir = $(libexecdir)/zfs/zpool.d
+zpoollibdir = /usr/lib/zfs-linux/zpool.d
EXTRA_DIST = zpool.d/README
-dist_zpoolexec_SCRIPTS = \
+dist_zpoollib_SCRIPTS = \
zpool.d/enc \
zpool.d/encdev \
zpool.d/fault_led \
@@ -119,5 +119,5 @@ install-data-hook:
for f in $(zpoolconfdefaults); do \
test -f "$(DESTDIR)$(zpoolconfdir)/$${f}" -o \
-L "$(DESTDIR)$(zpoolconfdir)/$${f}" || \
- ln -s "$(zpoolexecdir)/$${f}" "$(DESTDIR)$(zpoolconfdir)"; \
+ ln -s "$(zpoollibdir)/$${f}" "$(DESTDIR)$(zpoolconfdir)"; \
done

1
zfs/debian/patches/series
View File

@ -2,7 +2,6 @@
0002-Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core.patch
0003-add-man-page-reference-to-systemd-units.patch
0004-always-load-ZFS-module-on-boot.patch
0005-fix-install-path-of-zpool.d-scripts.patch
0006-Use-python3-for-arcstat.py-arc_summary.py-dbufstat.p.patch
0007-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch
0008-increase-default-zcmd-allocation-to-256K.patch

1
zfs/debian/rules
View File

@ -20,6 +20,7 @@ override_dh_auto_configure:
--sbindir=/sbin \
--libdir=/lib \
--with-udevdir=/lib/udev \
--with-zfsexecdir=/usr/lib/zfs-linux \
--enable-systemd \
--with-systemdunitdir=/lib/systemd/system \
--with-systemdpresetdir=/lib/systemd/system-preset \