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>
This commit is contained in:
committed by
Paolo Pisati
parent
608aac0667
commit
a7ff8883d2
@@ -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
|
||||
|
||||
@@ -19,4 +19,3 @@ do_tools_perf_jvmti = true
|
||||
do_tools_bpftool = true
|
||||
|
||||
do_dtbs = true
|
||||
do_zfs = true
|
||||
|
||||
@@ -16,4 +16,3 @@ do_tools_perf_jvmti = true
|
||||
do_tools_bpftool = true
|
||||
|
||||
#do_flavour_image_package = false
|
||||
do_zfs = true
|
||||
|
||||
@@ -17,5 +17,3 @@ do_tools_cpupower = true
|
||||
do_tools_perf = true
|
||||
do_tools_perf_jvmti = true
|
||||
do_tools_bpftool = true
|
||||
|
||||
do_zfs = true
|
||||
|
||||
Vendored
+2
-3
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user