Skip to content

Commit

Permalink
Disable scripts distribution.
Browse files Browse the repository at this point in the history
Lintian complains about the installation of the libexec scripts
to the DKMS source in /usr/src. Resolve the lintian warning by
disabling the scripts dist rule.

This change supercedes commit f500cf9868d77ee2535902afed363688a1e154c9.

W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/common.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpios-test/lustre.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/dm0-raid0.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/file-raid0.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/file-raid10.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/file-raidz.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/file-raidz2.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/hda-raid0.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/lo-faulty-raid0.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/lo-faulty-raid10.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/lo-faulty-raidz.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/lo-faulty-raidz2.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/lo-faulty-raidz3.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/lo-raid0.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/lo-raid10.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/lo-raidz.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/lo-raidz2.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/md0-raid10.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/md0-raid5.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/ram0-raid0.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/scsi_debug-noraid.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/scsi_debug-raid0.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/scsi_debug-raid10.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/scsi_debug-raidz.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/scsi_debug-raidz2.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/scsi_debug-raidz3.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/sda-raid0.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/zpool-raid0.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/zpool-raid10.sh
W: zfs-dkms: script-not-executable usr/src/zfs-0.6.0/scripts/zpool-config/zpool-raidz.sh
N:
N:    This file starts with the #! sequence that marks interpreted scripts,
N:    but it is not executable.
N:
N:    Severity: normal, Certainty: certain
N:
  • Loading branch information
dajhorn committed May 6, 2011
1 parent 4fb7128 commit 5d633c8
Show file tree
Hide file tree
Showing 4 changed files with 111 additions and 76 deletions.
58 changes: 58 additions & 0 deletions debian/patches/disable-dist-scripts.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
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 \
Index: b/Makefile.am
===================================================================
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
include $(top_srcdir)/config/tgz.am

if CONFIG_USER
-USER_DIR = etc man scripts lib cmd
+USER_DIR = etc man lib cmd
endif
if CONFIG_KERNEL
KERNEL_DIR = module
Index: b/Makefile.in
===================================================================
--- a/Makefile.in
+++ b/Makefile.in
@@ -125,7 +125,7 @@
distdir dist dist-all distcheck
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = etc man scripts lib cmd module include
+DIST_SUBDIRS = etc man lib cmd module include
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -328,7 +328,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-@CONFIG_USER_TRUE@USER_DIR = etc man scripts lib cmd
+@CONFIG_USER_TRUE@USER_DIR = etc man lib cmd
@CONFIG_KERNEL_TRUE@KERNEL_DIR = module
SUBDIRS = $(USER_DIR) $(KERNEL_DIR) include
AUTOMAKE_OPTIONS = foreign
23 changes: 0 additions & 23 deletions debian/patches/disable-zpool-layout.patch

This file was deleted.

2 changes: 1 addition & 1 deletion debian/patches/series
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
volatile-version.patch
disable-dist-init.patch
disable-dist-dracut.patch
disable-zpool-layout.patch
disable-dist-scripts.patch
lintian-COPYING.patch
104 changes: 52 additions & 52 deletions debian/zfsutils.examples
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
etc/zfs/zdev.conf.x4550.example
etc/zfs/zdev.conf.supermicro.example
etc/zfs/zdev.conf.dragon.example
usr/libexec/zfs/common.sh
usr/libexec/zfs/zconfig.sh
usr/libexec/zfs/zfault.sh
usr/libexec/zfs/zfs.sh
usr/libexec/zfs/zpios-profile/zpios-profile-disk.sh
usr/libexec/zfs/zpios-profile/zpios-profile-pids.sh
usr/libexec/zfs/zpios-profile/zpios-profile-post.sh
usr/libexec/zfs/zpios-profile/zpios-profile-pre.sh
usr/libexec/zfs/zpios-profile/zpios-profile.sh
usr/libexec/zfs/zpios-sanity.sh
usr/libexec/zfs/zpios-survey.sh
usr/libexec/zfs/zpios-test/16th-8192rc-4rs-1cs-4off.sh
usr/libexec/zfs/zpios-test/1th-16rc-4rs-1cs-4off.sh
usr/libexec/zfs/zpios-test/1x256th-65536rc-4rs-1cs-4off.sh
usr/libexec/zfs/zpios-test/256th-65536rc-4rs-1cs-4off.sh
usr/libexec/zfs/zpios-test/4th-1024rc-4rs-1cs-4off.sh
usr/libexec/zfs/zpios-test/large-thread-survey.sh
usr/libexec/zfs/zpios-test/large.sh
usr/libexec/zfs/zpios-test/lustre.sh
usr/libexec/zfs/zpios-test/medium.sh
usr/libexec/zfs/zpios-test/small.sh
usr/libexec/zfs/zpios-test/tiny.sh
usr/libexec/zfs/zpios.sh
usr/libexec/zfs/zpool-config/dm0-raid0.sh
usr/libexec/zfs/zpool-config/file-raid0.sh
usr/libexec/zfs/zpool-config/file-raid10.sh
usr/libexec/zfs/zpool-config/file-raidz.sh
usr/libexec/zfs/zpool-config/file-raidz2.sh
usr/libexec/zfs/zpool-config/hda-raid0.sh
usr/libexec/zfs/zpool-config/lo-faulty-raid0.sh
usr/libexec/zfs/zpool-config/lo-faulty-raid10.sh
usr/libexec/zfs/zpool-config/lo-faulty-raidz.sh
usr/libexec/zfs/zpool-config/lo-faulty-raidz2.sh
usr/libexec/zfs/zpool-config/lo-faulty-raidz3.sh
usr/libexec/zfs/zpool-config/lo-raid0.sh
usr/libexec/zfs/zpool-config/lo-raid10.sh
usr/libexec/zfs/zpool-config/lo-raidz.sh
usr/libexec/zfs/zpool-config/lo-raidz2.sh
usr/libexec/zfs/zpool-config/md0-raid10.sh
usr/libexec/zfs/zpool-config/md0-raid5.sh
usr/libexec/zfs/zpool-config/ram0-raid0.sh
usr/libexec/zfs/zpool-config/scsi_debug-noraid.sh
usr/libexec/zfs/zpool-config/scsi_debug-raid0.sh
usr/libexec/zfs/zpool-config/scsi_debug-raid10.sh
usr/libexec/zfs/zpool-config/scsi_debug-raidz.sh
usr/libexec/zfs/zpool-config/scsi_debug-raidz2.sh
usr/libexec/zfs/zpool-config/scsi_debug-raidz3.sh
usr/libexec/zfs/zpool-config/sda-raid0.sh
usr/libexec/zfs/zpool-config/zpool-raid0.sh
usr/libexec/zfs/zpool-config/zpool-raid10.sh
usr/libexec/zfs/zpool-config/zpool-raidz.sh
usr/libexec/zfs/zpool-create.sh
scripts/common.sh
scripts/zconfig.sh
scripts/zfault.sh
scripts/zfs.sh
scripts/zpios-profile/zpios-profile-disk.sh
scripts/zpios-profile/zpios-profile-pids.sh
scripts/zpios-profile/zpios-profile-post.sh
scripts/zpios-profile/zpios-profile-pre.sh
scripts/zpios-profile/zpios-profile.sh
scripts/zpios-sanity.sh
scripts/zpios-survey.sh
scripts/zpios-test/16th-8192rc-4rs-1cs-4off.sh
scripts/zpios-test/1th-16rc-4rs-1cs-4off.sh
scripts/zpios-test/1x256th-65536rc-4rs-1cs-4off.sh
scripts/zpios-test/256th-65536rc-4rs-1cs-4off.sh
scripts/zpios-test/4th-1024rc-4rs-1cs-4off.sh
scripts/zpios-test/large-thread-survey.sh
scripts/zpios-test/large.sh
scripts/zpios-test/lustre.sh
scripts/zpios-test/medium.sh
scripts/zpios-test/small.sh
scripts/zpios-test/tiny.sh
scripts/zpios.sh
scripts/zpool-config/dm0-raid0.sh
scripts/zpool-config/file-raid0.sh
scripts/zpool-config/file-raid10.sh
scripts/zpool-config/file-raidz.sh
scripts/zpool-config/file-raidz2.sh
scripts/zpool-config/hda-raid0.sh
scripts/zpool-config/lo-faulty-raid0.sh
scripts/zpool-config/lo-faulty-raid10.sh
scripts/zpool-config/lo-faulty-raidz.sh
scripts/zpool-config/lo-faulty-raidz2.sh
scripts/zpool-config/lo-faulty-raidz3.sh
scripts/zpool-config/lo-raid0.sh
scripts/zpool-config/lo-raid10.sh
scripts/zpool-config/lo-raidz.sh
scripts/zpool-config/lo-raidz2.sh
scripts/zpool-config/md0-raid10.sh
scripts/zpool-config/md0-raid5.sh
scripts/zpool-config/ram0-raid0.sh
scripts/zpool-config/scsi_debug-noraid.sh
scripts/zpool-config/scsi_debug-raid0.sh
scripts/zpool-config/scsi_debug-raid10.sh
scripts/zpool-config/scsi_debug-raidz.sh
scripts/zpool-config/scsi_debug-raidz2.sh
scripts/zpool-config/scsi_debug-raidz3.sh
scripts/zpool-config/sda-raid0.sh
scripts/zpool-config/zpool-raid0.sh
scripts/zpool-config/zpool-raid10.sh
scripts/zpool-config/zpool-raidz.sh
scripts/zpool-create.sh

0 comments on commit 5d633c8

Please sign in to comment.