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 <antonio.e.russo@gmail.com>

diff --git a/debian/control b/debian/control
index 85207b3fa1f8be536f49440ddba36d3afea77602..58be1703556e016af40b44328a7ff6bd21099931 100644 (file)
--- 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 1cbfaa39bd93dc3fd83e6a1f1e278dbbd854f776..6d41ff03054211e5eeeabb6bb4e2100be24bfbc3 100644 (file)
--- 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 7c8fc6248ac352b1af24f038661cebaf8ad23e30..2abe9d6f4161bf10fac6a2f1dc91c5e325e44c9e 100755 (executable)
--- 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'