Disable zpool-layout distribution.

Resolve this lintian warning by disabling the zpool-layout example:

W: zfsutils: executable-not-elf-or-script usr/libexec/zfs/zpool-layout/dragon.llnl.conf
W: zfsutils: executable-not-elf-or-script usr/libexec/zfs/zpool-layout/dragon.ddn.conf
N:
N:    This executable file is not an ELF format binary, and does not start
N:    with the #! sequence that marks interpreted scripts. It might be a sh
N:    script that fails to name /bin/sh as its shell, or it may be incorrectly
N:    marked as executable. Sometimes upstream files developed on Windows are
N:    marked unnecessarily as executable on other systems.
N:
N:    If you are using debhelper to build your package, running dh_fixperms
N:    will often correct this problem for you.
N:
N:    Refer to Debian Policy Manual section 10.4 (Scripts) for details.
N:
N:    Severity: normal, Certainty: certain
N:

diff --git a/debian/patches/disable-zpool-layout.patch b/debian/patches/disable-zpool-layout.patch
new file mode 100644 (file)
index 0000000..0914c38
--- /dev/null
+++ b/debian/patches/disable-zpool-layout.patch
@@ -0,0 +1,23 @@
+Index: b/scripts/Makefile.am
+===================================================================
+--- a/scripts/Makefile.am
++++ b/scripts/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = zpool-config zpool-layout zpios-test zpios-profile
++SUBDIRS = zpool-config zpios-test zpios-profile
+ 
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
+ dist_pkglibexec_SCRIPTS = \
+Index: b/scripts/Makefile.in
+===================================================================
+--- a/scripts/Makefile.in
++++ b/scripts/Makefile.in
+@@ -321,7 +321,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = zpool-config zpool-layout zpios-test zpios-profile
++SUBDIRS = zpool-config zpios-test zpios-profile
+ dist_pkglibexec_SCRIPTS = \
+       $(top_builddir)/scripts/common.sh \
+       $(top_srcdir)/scripts/zconfig.sh \

diff --git a/debian/patches/series b/debian/patches/series
index 87665e83cc8afc1350bec4310705b60feba4ec9e..ead9f506d7d53f2de5137615dd667bac4ed5be3f 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 volatile-version.patch
 disable-dist-init.patch
 disable-dist-dracut.patch
+disable-zpool-layout.patch