From 4ac8d2a3304129881bb62183ae016d22ef39c649 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Fri, 8 Dec 2017 13:49:27 +0000 Subject: [PATCH] UBUNTU: [Packaging] disable zfs module checks when zfs is disabled We currently disable the zfs module changes when we disable zfs builds as part of cross-compilation. We should disable the zfs module checks whenever zfs itself is disabled. Pull the zfs module disablement support such that it is always present. BugLink: http://bugs.launchpad.net/bugs/1737176 Signed-off-by: Andy Whitcroft --- debian/rules | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 6c8855f2b3a9..19fe3651f8cf 100755 --- a/debian/rules +++ b/debian/rules @@ -42,7 +42,6 @@ ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH)) do_tools=false disable_d_i=true do_zfs=false - do_zfs_disable:=$(shell cat $(DROOT)/zfs-modules.ignore >>$(prev_abidir)/../modules.ignore) endif # Stages -- support both DEB_STAGE=stage1 and DEB_BUILD_PROFILE=bootstrap @@ -75,6 +74,10 @@ ifneq ($(do_tools),true) do_tools_common= endif +ifeq $($(do_zfs),false) + do_zfs_disable:=$(shell cat $(DROOT)/zfs-modules.ignore >>$(prev_abidir)/../modules.ignore) +endif + # Either tools package needs the common source preparation do_any_tools=$(sort $(filter-out false,$(do_linux_tools) $(do_cloud_tools))) -- 2.14.1