From 200661e3350036837b8328737d5de5a07df1452c Mon Sep 17 00:00:00 2001 From: Antonio Russo Date: Sun, 1 Jul 2018 08:59:12 -0400 Subject: [PATCH] Minor packaging cleanup Signed-off-by: Antonio Russo --- debian/rules | 9 ++++----- debian/zfs-test.install | 3 --- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/debian/rules b/debian/rules index f3f15e4a..7c8fc624 100755 --- a/debian/rules +++ b/debian/rules @@ -86,13 +86,12 @@ override_dh_auto_install: mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat.py' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat' @# Zed has dependencies outside of the system root. - $(INSTALL) -d '$(CURDIR)/debian/tmp/usr/sbin/' mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed' @# Install the DKMS source. @# We only want the files needed to build the modules - mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/scripts' - cp '$(CURDIR)/scripts/enum-extract.pl' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/scripts' + install -D -t '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/scripts' \ + '$(CURDIR)/scripts/enum-extract.pl' $(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)' || exit 1;) @# Hellish awk line: @# * Deletes from configure.ac the parts not needed for building the kernel module @@ -121,8 +120,8 @@ override_dh_auto_install: rm $${i}; \ done - chmod a-x $(CURDIR)/debian/tmp/etc/zfs/zfs-functions - chmod a-x $(CURDIR)/debian/tmp/etc/default/zfs + chmod a-x '$(CURDIR)/debian/tmp/etc/zfs/zfs-functions' + chmod a-x '$(CURDIR)/debian/tmp/etc/default/zfs' chmod a-x '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/zfs' override_dh_dkms: diff --git a/debian/zfs-test.install b/debian/zfs-test.install index ec850df8..2067af7e 100644 --- a/debian/zfs-test.install +++ b/debian/zfs-test.install @@ -8,9 +8,6 @@ usr/share/man/man1/zpios.1 usr/share/man/man1/ztest.1 usr/share/man/man8/zinject.8 usr/share/zfs/common.sh -usr/share/zfs/common.sh -usr/share/zfs/common.sh -usr/share/zfs/common.sh usr/share/zfs/runfiles/ usr/share/zfs/smb.sh usr/share/zfs/test-runner -- 2.39.2