From: Andrea Righi <andrea.righi@canonical.com>
Date: Mon, 4 Nov 2019 13:40:59 +0000 (+0100)
Subject: UBUNTU: [Config] re-enable zfs
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~1319
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=283d75a23e4ddfd048130dda72fbef2266a7abd4;p=mirror_ubuntu-focal-kernel.git

UBUNTU: [Config] re-enable zfs

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
---

diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk
index c980d65930f7..b4b6de3c99f3 100644
--- a/debian.master/rules.d/amd64.mk
+++ b/debian.master/rules.d/amd64.mk
@@ -21,6 +21,6 @@ do_tools_host = true
 do_extras_package = true
 do_tools_common = true
 do_tools_acpidbg = true
-do_zfs		= false
+do_zfs		= true
 do_dkms_nvidia  = false
 do_dkms_vbox    = false
diff --git a/debian.master/rules.d/arm64.mk b/debian.master/rules.d/arm64.mk
index 53c063597b93..f0f90148177a 100644
--- a/debian.master/rules.d/arm64.mk
+++ b/debian.master/rules.d/arm64.mk
@@ -22,4 +22,4 @@ do_tools_perf_jvmti = true
 do_tools_bpftool = true
 
 do_dtbs		= true
-do_zfs		= false
+do_zfs		= true
diff --git a/debian.master/rules.d/ppc64el.mk b/debian.master/rules.d/ppc64el.mk
index 34fc5e9f37c8..3934ef482a57 100644
--- a/debian.master/rules.d/ppc64el.mk
+++ b/debian.master/rules.d/ppc64el.mk
@@ -18,4 +18,4 @@ do_tools_perf_jvmti = true
 do_tools_bpftool  = true
 
 #do_flavour_image_package = false
-do_zfs		= false
+do_zfs		= true
diff --git a/debian.master/rules.d/s390x.mk b/debian.master/rules.d/s390x.mk
index d665a883ad09..4b3698fc9c45 100644
--- a/debian.master/rules.d/s390x.mk
+++ b/debian.master/rules.d/s390x.mk
@@ -18,4 +18,4 @@ do_tools_perf     = true
 do_tools_perf_jvmti = true
 do_tools_bpftool  = true
 
-do_zfs		= false
+do_zfs		= true