UBUNTU: [Packaging] debian/rules: Replace skip<foo> variables with skip_checks
There are different skip<foo> variables to disable individual ABI checks but they're all set together and only for mainline builds so replace them with the single variable skip_checks. Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
This commit is contained in:
committed by
Paolo Pisati
parent
4b3357e85c
commit
07fa07aa49
Vendored
+1
-3
@@ -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
|
||||
|
||||
Vendored
+1
-2
@@ -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)"
|
||||
|
||||
Vendored
+3
-3
@@ -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: $@
|
||||
|
||||
Reference in New Issue
Block a user