[Unstable/Lunar][PATCH 4/5] UBUNTU: [Packaging] checks/retpoline-check: Make 'skipretpoline' argument optional

Juerg Haefliger juerg.haefliger at canonical.com
Wed Jan 11 08:58:38 UTC 2023


Make the 'skipretpoline' argument optional and also more robust to match
the other checker scripts.

While at it, drop the invalid/unused 5th argument from the call site in
the rules file.

Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>
---
 debian/rules.d/4-checks.mk            | 2 +-
 debian/scripts/checks/retpoline-check | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk
index b13f043b11b0..4afe42fa629f 100644
--- a/debian/rules.d/4-checks.mk
+++ b/debian/rules.d/4-checks.mk
@@ -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)" "$(skip_checks)" "$(builddir)/build-$*"
+		"$(prev_abidir)" "$(abidir)" $(skip_checks)
 
 checks-%: module-check-% module-signature-check-% abi-check-% retpoline-check-%
 	@echo Debug: $@
diff --git a/debian/scripts/checks/retpoline-check b/debian/scripts/checks/retpoline-check
index 7dbfb303360b..5a0f870a741b 100755
--- a/debian/scripts/checks/retpoline-check
+++ b/debian/scripts/checks/retpoline-check
@@ -3,7 +3,12 @@
 flavour="$1"
 prev_abidir="$2"
 curr_abidir="$3"
-skipretpoline="$4"
+
+skipretpoline=${4:-}
+case "${skipretpoline,,}" in
+	1|true|yes) skipretpoline=true ;;
+	*) skipretpoline=false ;;
+esac
 
 echo "II: Checking retpoline indirections for $flavour...";
 
-- 
2.34.1




More information about the kernel-team mailing list