Message ID | 1463070742-18767-2-git-send-email-apw@canonical.com |
---|---|
State | New |
Headers | show |
Applied to Yakkety
diff --git a/debian/rules b/debian/rules index 780d000..f2e801c 100755 --- a/debian/rules +++ b/debian/rules @@ -42,6 +42,7 @@ 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 diff --git a/debian/zfs-modules.ignore b/debian/zfs-modules.ignore new file mode 100644 index 0000000..9529d23 --- /dev/null +++ b/debian/zfs-modules.ignore @@ -0,0 +1,8 @@ +spl +splat +zavl +zcommon +zfs +znvpair +zpios +zunicode
When we cross-compile we have to turn off the inbuilt zfs modules. When doing this we also need to allow the modules so produced to go missing in this build while still checking the remainder of the modules. BugLink: http://bugs.launchpad.net/bugs/1581127 Signed-off-by: Andy Whitcroft <apw@canonical.com> --- debian/rules | 1 + debian/zfs-modules.ignore | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 debian/zfs-modules.ignore