From 9532b18cac385c9f37fc1a89c12733971bf7dee6 Mon Sep 17 00:00:00 2001 From: Juerg Haefliger Date: Mon, 9 Jan 2023 15:37:58 +0100 Subject: [PATCH] UBUNTU: [Packaging] checks/retpoline-check: Make 'skipretpoline' argument optional 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 Signed-off-by: Andrea Righi --- 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...";