diff mbox series

[Unstable/Lunar,2/3] UBUNTU: [Packaging] debian/rules: Rename 'skip_checks' to 'do_skip_checks'

Message ID 20230112131649.216288-3-juerg.haefliger@canonical.com
State New
Headers show
Series debian/rules: Rename some flag variables | expand

Commit Message

Juerg Haefliger Jan. 12, 2023, 1:16 p.m. UTC
Flag variables (that can take true/false values and drive different build
behaviors) are named 'do_<foo>'. Rename 'skip_checks' to follow that
convention.

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
---
 debian/rules                   | 2 +-
 debian/rules.d/1-maintainer.mk | 2 +-
 debian/rules.d/4-checks.mk     | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/debian/rules b/debian/rules
index 7775c0e92c46..6280ee5f19b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,7 +95,7 @@  ifeq ($(do_mainline_build),true)
 	do_tools=false
 	no_dumpfile=1
 $(foreach _m,$(all_dkms_modules),$(eval do_$(_m) = false))
-	skip_checks=true
+	do_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 18cfc7e630b7..7b7d7294dd54 100644
--- a/debian/rules.d/1-maintainer.mk
+++ b/debian/rules.d/1-maintainer.mk
@@ -79,7 +79,7 @@  printenv:
 	@echo "upstream_tag      = $(upstream_tag)"
 	@echo "variants          = $(variants)"
 	@echo "flavours          = $(flavours)"
-	@echo "skip_checks       = $(skip_checks)"
+	@echo "do_skip_checks    = $(do_skip_checks)"
 	@echo "do_dbgsym_package = $(do_dbgsym_package)"
 	@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 791ba7a0a30a..dba124fbad8e 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)" $(skip_checks)
+		"$(prev_abidir)" "$(abidir)" $(do_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)" $(skip_checks)
+		"$(prev_abidir)" "$(abidir)" $(do_skip_checks)
 
 # Check the signature of staging modules
 module-signature-check-%: $(stampdir)/stamp-install-%
@@ -16,13 +16,13 @@  module-signature-check-%: $(stampdir)/stamp-install-%
 	$(DROOT)/scripts/checks/module-signature-check "$*" \
 		"$(DROOT)/$(mods_pkg_name)-$*" \
 		"$(DROOT)/$(mods_extra_pkg_name)-$*" \
-		$(skip_checks)
+		$(do_skip_checks)
 
 # Check the reptoline jmp/call functions against the last release.
 retpoline-check-%: $(stampdir)/stamp-install-%
 	@echo Debug: $@
 	$(DROOT)/scripts/checks/retpoline-check "$*" \
-		"$(prev_abidir)" "$(abidir)" $(skip_checks)
+		"$(prev_abidir)" "$(abidir)" $(do_skip_checks)
 
 checks-%: module-check-% module-signature-check-% abi-check-% retpoline-check-%
 	@echo Debug: $@