UBUNTU: [Packaging] drop do_<mod> arch specific configs

BugLink: https://bugs.launchpad.net/bugs/1969434
They should been assigned automatically based on the latest
dkms-versions.

Also disable building any dkms for mainline builds.

Signed-off-by: You-Sheng Yang (vicamo) <vicamo.yang@canonical.com>
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>

diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk
index 2288c25a7a52bbb52f7c6353bc6fc5b223a70dae..d0384f0227a479a6a73a766c2711ac0221913737 100644 (file)
--- a/debian.master/rules.d/amd64.mk
+++ b/debian.master/rules.d/amd64.mk
@@ -20,6 +20,4 @@ do_tools_host = true
 do_extras_package = true
 do_tools_common = true
 do_tools_acpidbg = true
-do_zfs         = true
-do_v4l2loopback        = true
 do_odm_drivers  = true

diff --git a/debian.master/rules.d/arm64.mk b/debian.master/rules.d/arm64.mk
index e0415a4075ace0ed4229b4eade18c5c9b78c2b16..d215e1bda1fed0c2526605a1bc9f5fc03b1aad8a 100644 (file)
--- a/debian.master/rules.d/arm64.mk
+++ b/debian.master/rules.d/arm64.mk
@@ -19,4 +19,3 @@ do_tools_perf_jvmti = true
 do_tools_bpftool = true
 
 do_dtbs                = true
-do_zfs         = true

diff --git a/debian.master/rules.d/ppc64el.mk b/debian.master/rules.d/ppc64el.mk
index ec8f7e914614c63379af0ac056c1b2946e704195..b205a5153b51a7761da21a77983d5d65ca361e23 100644 (file)
--- a/debian.master/rules.d/ppc64el.mk
+++ b/debian.master/rules.d/ppc64el.mk
@@ -16,4 +16,3 @@ do_tools_perf_jvmti = true
 do_tools_bpftool  = true
 
 #do_flavour_image_package = false
-do_zfs         = true

diff --git a/debian.master/rules.d/s390x.mk b/debian.master/rules.d/s390x.mk
index 4b3698fc9c45a6b6fb37e7ec29e325b1da86b79e..0620c638a7247d1509d358f6e95302080d5a0c7d 100644 (file)
--- a/debian.master/rules.d/s390x.mk
+++ b/debian.master/rules.d/s390x.mk
@@ -17,5 +17,3 @@ do_tools_cpupower = true
 do_tools_perf     = true
 do_tools_perf_jvmti = true
 do_tools_bpftool  = true
-
-do_zfs         = true

diff --git a/debian/rules b/debian/rules
index 540e7a3cfccf59dcb7fc31d31005e917d92748a2..435b1616a4a943fcbcfe31a109d5621df45457ff 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,6 @@ $(foreach _m,$(all_dkms_modules), \
 # Don't build tools in a cross compile environment.
 ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
        do_tools=false
-       do_zfs=false
 endif
 
 # Are any of the kernel signing options enabled.
@@ -79,7 +78,7 @@ endif
 #  - disable dkms builds as the versions used may have been deleted
 ifneq ($(filter autopkgtest,$(DEB_BUILD_PROFILES)),)
        flavours := $(firstword $(flavours))
-       $(foreach _m,$(all_dkms_modules),$(eval do_$(_m) = false))
+$(foreach _m,$(all_dkms_modules),$(eval do_$(_m) = false))
 endif
 
 # Being used to build a mainline build -- turn off things which do not work.
@@ -87,7 +86,7 @@ ifeq ($(do_mainline_build),true)
        do_extras_package=false
        do_tools=false
        no_dumpfile=1
-       do_zfs=false
+$(foreach _m,$(all_dkms_modules),$(eval do_$(_m) = false))
        skipabi=true
        skipmodule=true
        skipretpoline=true