@@ -1,26 +1,26 @@
# Check ABI for package against last release (if not same abinum)
abi-check-%: $(stampdir)/stamp-install-%
@echo Debug: $@
- $(DROOT)/scripts/abi-check "$*" \
+ $(DROOT)/scripts/checks/abi-check "$*" \
"$(prev_abidir)" "$(abidir)" $(skipabi)
# Check the module list against the last release (always)
module-check-%: $(stampdir)/stamp-install-%
@echo Debug: $@
- $(DROOT)/scripts/module-check "$*" \
+ $(DROOT)/scripts/checks/module-check "$*" \
"$(prev_abidir)" "$(abidir)" $(skipmodule)
# Check the signature of staging modules
module-signature-check-%: $(stampdir)/stamp-install-%
@echo Debug: $@
- $(DROOT)/scripts/module-signature-check "$*" \
+ $(DROOT)/scripts/checks/module-signature-check "$*" \
"$(DROOT)/$(mods_pkg_name)-$*" \
"$(DROOT)/$(mods_extra_pkg_name)-$*"
# Check the reptoline jmp/call functions against the last release.
retpoline-check-%: $(stampdir)/stamp-install-%
@echo Debug: $@
- $(SHELL) $(DROOT)/scripts/retpoline-check "$*" \
+ $(DROOT)/scripts/checks/retpoline-check "$*" \
"$(prev_abidir)" "$(abidir)" "$(skipretpoline)" "$(builddir)/build-$*"
checks-%: module-check-% module-signature-check-% abi-check-% retpoline-check-%
@@ -30,11 +30,10 @@ checks-%: module-check-% module-signature-check-% abi-check-% retpoline-check-%
config-prepare-check-%: $(stampdir)/stamp-prepare-tree-%
@echo Debug: $@
if [ -e $(commonconfdir)/config.common.ubuntu ]; then \
- perl -f $(DROOT)/scripts/config-check \
+ perl -f $(DROOT)/scripts/checks/config-check \
$(builddir)/build-$*/.config "$(arch)" "$*" "$(commonconfdir)" \
"$(skipconfig)" "$(do_enforce_all)"; \
else \
python3 $(DROOT)/scripts/misc/annotations -f $(commonconfdir)/annotations \
--arch $(arch) --flavour $* --check $(builddir)/build-$*/.config; \
fi
-
similarity index 100%
rename from debian/scripts/abi-check
rename to debian/scripts/checks/abi-check
similarity index 100%
rename from debian/scripts/config-check
rename to debian/scripts/checks/config-check
similarity index 100%
rename from debian/scripts/module-check
rename to debian/scripts/checks/module-check
similarity index 97%
rename from debian/scripts/module-signature-check
rename to debian/scripts/checks/module-signature-check
@@ -6,7 +6,7 @@ mods_extra_dir="${3}"
echo "II: Checking signature of staging modules for ${flavor}..."
-root=$(dirname "$(realpath -e "${0}")")/../..
+root=$(dirname "$(realpath -e "${0}")")/../../..
. "${root}"/debian/debian.env
# Collect the signature-inclusion files
similarity index 100%
rename from debian/scripts/retpoline-check
rename to debian/scripts/checks/retpoline-check
Tidy up the scripts directory and move all checker scripts to a new subdirectory. Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> --- debian/rules.d/4-checks.mk | 11 +++++------ debian/scripts/{ => checks}/abi-check | 0 debian/scripts/{ => checks}/config-check | 0 debian/scripts/{ => checks}/module-check | 0 debian/scripts/{ => checks}/module-signature-check | 2 +- debian/scripts/{ => checks}/retpoline-check | 0 6 files changed, 6 insertions(+), 7 deletions(-) rename debian/scripts/{ => checks}/abi-check (100%) rename debian/scripts/{ => checks}/config-check (100%) rename debian/scripts/{ => checks}/module-check (100%) rename debian/scripts/{ => checks}/module-signature-check (97%) rename debian/scripts/{ => checks}/retpoline-check (100%)