diff --git a/debian/rules b/debian/rules index f2b460354f6c..7775c0e92c46 100755 --- a/debian/rules +++ b/debian/rules @@ -95,9 +95,7 @@ ifeq ($(do_mainline_build),true) do_tools=false no_dumpfile=1 $(foreach _m,$(all_dkms_modules),$(eval do_$(_m) = false)) - skipabi=true - skipmodule=true - skipretpoline=true + skip_checks=true endif # Disable tools build and packaging if do_tools != true diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 41d61adbd8ac..0e10a84cce1d 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -79,8 +79,7 @@ printenv: @echo "upstream_tag = $(upstream_tag)" @echo "variants = $(variants)" @echo "flavours = $(flavours)" - @echo "skipabi = $(skipabi)" - @echo "skipmodule = $(skipmodule)" + @echo "skip_checks = $(skip_checks)" @echo "skipdbg = $(skipdbg)" @echo "CONCURRENCY_LEVEL = $(CONCURRENCY_LEVEL)" @echo "ubuntu_selftests = $(ubuntu_selftests)" diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk index fc263f32e0ce..b13f043b11b0 100644 --- a/debian/rules.d/4-checks.mk +++ b/debian/rules.d/4-checks.mk @@ -2,13 +2,13 @@ abi-check-%: $(stampdir)/stamp-install-% @echo Debug: $@ $(DROOT)/scripts/checks/abi-check "$*" \ - "$(prev_abidir)" "$(abidir)" $(skipabi) + "$(prev_abidir)" "$(abidir)" $(skip_checks) # Check the module list against the last release (always) module-check-%: $(stampdir)/stamp-install-% @echo Debug: $@ $(DROOT)/scripts/checks/module-check "$*" \ - "$(prev_abidir)" "$(abidir)" $(skipmodule) + "$(prev_abidir)" "$(abidir)" $(skip_checks) # Check the signature of staging modules module-signature-check-%: $(stampdir)/stamp-install-% @@ -21,7 +21,7 @@ module-signature-check-%: $(stampdir)/stamp-install-% retpoline-check-%: $(stampdir)/stamp-install-% @echo Debug: $@ $(DROOT)/scripts/checks/retpoline-check "$*" \ - "$(prev_abidir)" "$(abidir)" "$(skipretpoline)" "$(builddir)/build-$*" + "$(prev_abidir)" "$(abidir)" "$(skip_checks)" "$(builddir)/build-$*" checks-%: module-check-% module-signature-check-% abi-check-% retpoline-check-% @echo Debug: $@