From 4cbaa78789eab1b69a0207be4a5d20a2ce9e7bb4 Mon Sep 17 00:00:00 2001 From: Antonio Russo Date: Sat, 23 Jun 2018 14:59:20 -0400 Subject: [PATCH] Remove ZFS_AC_PACKAGE macros from DKMS sources This macro is used by upstream to assist in creating packaging. It is not useful to us, and produces an install time dependency on some dpkg utils that can be avoided. See #900714, #902233. Signed-off-by: Antonio Russo --- debian/control | 2 +- debian/control.in | 2 +- debian/rules | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 85207b3f..58be1703 100644 --- a/debian/control +++ b/debian/control @@ -99,7 +99,7 @@ Package: zfs-dkms Architecture: all Pre-Depends: spl-dkms (<<${source:Upstream-Version}.), spl-dkms (>= ${source:Upstream-Version}) -Depends: dkms (>> 2.1.1.2-5), dpkg-dev, lsb-release, ${misc:Depends} +Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends} Recommends: zfs-zed, zfsutils-linux (>= ${binary:Version}), linux-libc-dev (<< 4.19~) Provides: zfs-modules Description: OpenZFS filesystem kernel modules for Linux diff --git a/debian/control.in b/debian/control.in index 1cbfaa39..6d41ff03 100644 --- a/debian/control.in +++ b/debian/control.in @@ -91,7 +91,7 @@ Package: zfs-dkms Architecture: all Pre-Depends: spl-dkms (<<${source:Upstream-Version}.), spl-dkms (>= ${source:Upstream-Version}) -Depends: dkms (>> 2.1.1.2-5), dpkg-dev, lsb-release, ${misc:Depends} +Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends} Recommends: zfs-zed, zfsutils-linux (>= ${binary:Version}), @LINUX_COMPAT@ Provides: zfs-modules Description: OpenZFS filesystem kernel modules for Linux diff --git a/debian/rules b/debian/rules index 7c8fc624..2abe9d6f 100755 --- a/debian/rules +++ b/debian/rules @@ -98,8 +98,9 @@ override_dh_auto_install: @# * It deletes from inside AC_CONFIG_FILES([]) everything except: @# (Makefile$|include/|module/|*.release$) @# * Takes care of spaces and tabs + @# * Remove reference to ZFS_AC_PACKAGE awk '/^AC_CONFIG_FILES\(\[/,/^\]\)/ { if ($$0 !~ /^(AC_CONFIG_FILES\(\[([ \t]+)?$$|\]\)([ \t]+)?$$|([ \t]+)?(include\/|module\/|Makefile([ \t]+)?$$|zfs\.release([ \t]+)?$$))/){next} } {print}' \ - '$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac' + '$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac' | sed '/ZFS_AC_PACKAGE/d' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/configure.ac' @# Set "SUBDIRS = module include" for CONFIG_KERNEL and remove SUBDIRS for all other configs. sed '1,/CONFIG_KERNEL/s/SUBDIRS.*=.*//g;s/SUBDIRS.*=.*/SUBDIRS = module include/g;' \ '$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/Makefile.am' -- 2.39.2