Message ID | 20220513131752.713273-7-vicamo.yang@canonical.com |
---|---|
State | New |
Headers | show |
Series | build backport-iwlwifi-dkms as linux-modules-iwlwifi-ABI | expand |
This is now applied to Unstable. However, do note that I had to tweak it slightly like so: - $(foreach _m,$(all_dkms_modules),$(eval do_$(_m) = false)) +$(foreach _m,$(all_dkms_modules),$(eval do_$(_m) = false)) this is because make didn't like such lines starting with whitespace: $ fakeroot make -f debian/rules clean do_mainline_build=true debian/rules:90: *** recipe commences before first target. Stop. ditto with $ DEB_BUILD_PROFILES=autopkgtest fakeroot make -f debian/rules clean So it seems that whilst the codepaths for autopkgtest build profile & mainline builds were adjusted, they were not tested neither in ful, nor at least by trying to execute the clean target.
diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index 00aeb5cc55f1..d0384f0227a4 100644 --- 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 = false -do_v4l2loopback = false do_odm_drivers = true diff --git a/debian.master/rules.d/arm64.mk b/debian.master/rules.d/arm64.mk index 97b64d213d8b..d215e1bda1fe 100644 --- 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 = false diff --git a/debian.master/rules.d/ppc64el.mk b/debian.master/rules.d/ppc64el.mk index 1745f1e333c0..b205a5153b51 100644 --- 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 = false diff --git a/debian.master/rules.d/s390x.mk b/debian.master/rules.d/s390x.mk index d665a883ad09..0620c638a724 100644 --- 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 = false