UBUNTU: [Debian] zfs -- handle rprovides via dpkg-gencontrol

BugLink: http://bugs.launchpad.net/bugs/1558871
Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian/rules b/debian/rules
index 69c6ceadf1194563d7a6e647e6ad68eaca466bdb..780d00059e650fb599f282cdf76c54f4fa5a3142 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -88,12 +88,6 @@ binary: binary-indep binary-arch
 
 build: build-arch build-indep
 
-# If we are building zfs update the provides.
-rprovides=
-ifeq ($(do_zfs),true)
-rprovides:=$(rprovides), spl-dkms, zfs-dkms
-endif
-
 clean: debian/control
        dh_testdir
        dh_testroot
@@ -153,7 +147,6 @@ $(DEBIAN)/control.stub: $(DEBIAN)/d-i/kernel-versions.in    \
                -e 's/ABINUM/$(abinum)/g'                                       \
                -e 's/SRCPKGNAME/$(src_pkg_name)/g'                             \
                -e 's/=HUMAN=/$(human_arch)/g'                                    \
-               -e 's/=RPROVIDES=/$(rprovides)/g'                               \
          > $$new;                                                              \
        done
        flavours="$(sort $(wildcard $(DEBIAN)/control.d/vars.* $(DEBIAN)/sub-flavours/*.vars))";\
@@ -163,7 +156,6 @@ $(DEBIAN)/control.stub: $(DEBIAN)/d-i/kernel-versions.in    \
                -e 's/ABINUM/$(abinum)/g'                                       \
                -e 's/SRCPKGNAME/$(src_pkg_name)/g'                             \
                -e 's/=HUMAN=/$(human_arch)/g'                                    \
-               -e 's/=RPROVIDES=/$(rprovides)/g'                               \
                >> $(DEBIAN)/control.stub;                                              \
        done
 

diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index 6c4f2bd96e6d84c84bc1db57466c5f6c2d557b27..1c87ebd133f1e06ad22bac6cb86cea165c346d3d 100644 (file)
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -1,3 +1,6 @@
+# Used when you need to 'escape' a comma.
+comma = ,
+
 #
 # The source package name will be the first token from $(DEBIAN)/changelog
 #

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index f5b7464cad4278123abd2c21cdd34085db58fcc1..c7ad3f788770c7c488e700db3e2ff3b5422bcf49 100644 (file)
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -37,19 +37,7 @@ prepare-%: $(stampdir)/stamp-prepare-%
 build-%: $(stampdir)/stamp-build-%
        @echo Debug: $@
 
-# Do the actual build, including image and modules
-$(stampdir)/stamp-build-%: target_flavour = $*
-$(stampdir)/stamp-build-%: splopts  = --with-linux=$(CURDIR)
-$(stampdir)/stamp-build-%: splopts += --with-linux-obj=$(builddir)/build-$*
-$(stampdir)/stamp-build-%: zfsopts  = $(splopts)
-$(stampdir)/stamp-build-%: zfsopts += --with-spl=$(builddir)/build-$*/spl
-$(stampdir)/stamp-build-%: zfsopts += --with-spl-obj=$(builddir)/build-$*/spl
-$(stampdir)/stamp-build-%: zfsopts += --prefix=/usr --with-config=kernel
-$(stampdir)/stamp-build-%: bldimg = $(call custom_override,build_image,$*)
-$(stampdir)/stamp-build-%: $(stampdir)/stamp-prepare-%
-       @echo Debug: $@ build_image $(build_image) bldimg $(bldimg)
-       $(build_cd) $(kmake) $(build_O) $(conc_level) $(bldimg) modules $(if $(filter true,$(do_dtbs)),dtbs)
-ifeq ($(do_zfs),true)
+define build_zfs =
        #
        # SPL/ZFS wants a fully built kernel before you can configure and build.
        # It seems to be impossible to tease out the application configuration
@@ -64,9 +52,33 @@ ifeq ($(do_zfs),true)
        rsync -a --exclude=dkms.conf --delete zfs/ $(builddir)/build-$*/zfs/
        cd $(builddir)/build-$*/zfs; sh autogen.sh; sh configure $(zfsopts)
        $(kmake) -C $(builddir)/build-$*/zfs/module $(conc_level)
-endif
+endef
+
+# Do the actual build, including image and modules
+$(stampdir)/stamp-build-%: target_flavour = $*
+$(stampdir)/stamp-build-%: splopts  = --with-linux=$(CURDIR)
+$(stampdir)/stamp-build-%: splopts += --with-linux-obj=$(builddir)/build-$*
+$(stampdir)/stamp-build-%: zfsopts  = $(splopts)
+$(stampdir)/stamp-build-%: zfsopts += --with-spl=$(builddir)/build-$*/spl
+$(stampdir)/stamp-build-%: zfsopts += --with-spl-obj=$(builddir)/build-$*/spl
+$(stampdir)/stamp-build-%: zfsopts += --prefix=/usr --with-config=kernel
+$(stampdir)/stamp-build-%: bldimg = $(call custom_override,build_image,$*)
+$(stampdir)/stamp-build-%: enable_zfs = $(call custom_override,do_zfs,$*)
+$(stampdir)/stamp-build-%: $(stampdir)/stamp-prepare-%
+       @echo Debug: $@ build_image $(build_image) bldimg $(bldimg)
+       $(build_cd) $(kmake) $(build_O) $(conc_level) $(bldimg) modules $(if $(filter true,$(do_dtbs)),dtbs)
+
+       $(if $(filter true,$(enable_zfs)),$(call build_zfs))
+
        @touch $@
 
+define install_zfs =
+       cd $(builddir)/build-$*/spl/module; \
+               $(kmake) -C $(builddir)/build-$* SUBDIRS=`pwd` modules_install $(splopts)
+       cd $(builddir)/build-$*/zfs/module; \
+               $(kmake) -C $(builddir)/build-$* SUBDIRS=`pwd` modules_install $(zfsopts)
+endef
+
 # Install the finished build
 install-%: pkgdir = $(CURDIR)/debian/$(bin_pkg_name)-$*
 install-%: pkgdir_ex = $(CURDIR)/debian/$(extra_pkg_name)-$*
@@ -85,6 +97,7 @@ install-%: MODHASHALGO=sha512
 install-%: MODSECKEY=$(builddir)/build-$*/certs/signing_key.pem
 install-%: MODPUBKEY=$(builddir)/build-$*/certs/signing_key.x509
 install-%: build_dir=$(builddir)/build-$*
+install-%: enable_zfs = $(call custom_override,do_zfs,$*)
 install-%: splopts  = INSTALL_MOD_STRIP=1
 install-%: splopts += INSTALL_MOD_PATH=$(pkgdir)/
 install-%: splopts += INSTALL_MOD_DIR=kernel/zfs
@@ -147,12 +160,8 @@ endif
        $(build_cd) $(kmake) $(build_O) $(conc_level) modules_install $(vdso) \
                INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=$(pkgdir)/ \
                INSTALL_FW_PATH=$(pkgdir)/lib/firmware/$(abi_release)-$*
-ifeq ($(do_zfs),true)
-       cd $(builddir)/build-$*/spl/module; \
-               $(kmake) -C $(builddir)/build-$* SUBDIRS=`pwd` modules_install $(splopts)
-       cd $(builddir)/build-$*/zfs/module; \
-               $(kmake) -C $(builddir)/build-$* SUBDIRS=`pwd` modules_install $(zfsopts)
-endif
+
+       $(if $(filter true,$(enable_zfs)),$(call install_zfs))
 
        #
        # Build module blacklists:
@@ -442,6 +451,7 @@ binary-%: dbgpkg = $(bin_pkg_name)-$*-dbgsym
 binary-%: dbgpkgdir = $(CURDIR)/debian/$(bin_pkg_name)-$*-dbgsym
 binary-%: pkgtools = $(tools_flavour_pkg_name)-$*
 binary-%: pkgcloud = $(cloud_flavour_pkg_name)-$*
+binary-%: rprovides = $(if $(filter true,$(call custom_override,do_zfs,$*)),$(comma) spl-dkms$(comma) zfs-dkms)
 binary-%: target_flavour = $*
 binary-%: install-%
        @echo Debug: $@
@@ -454,7 +464,7 @@ binary-%: install-%
        dh_fixperms -p$(pkgimg) -X/boot/
        dh_installdeb -p$(pkgimg)
        dh_shlibdeps -p$(pkgimg)
-       $(lockme) dh_gencontrol -p$(pkgimg)
+       $(lockme) dh_gencontrol -p$(pkgimg) -- -Vlinux:rprovides='$(rprovides)'
        dh_md5sums -p$(pkgimg)
        dh_builddeb -p$(pkgimg) -- -Zbzip2 -z9