From 6f7a293b512c662a60c129008d6fe892a62b1725 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Wed, 14 Sep 2011 10:14:17 -0600 Subject: [PATCH] UBUNTU: [Config] Fix binary-% build target Simplify the checks-% target such that ABI and modules checks are built in parallel whilst both depend on the build stamp. Signed-off-by: Tim Gardner --- debian/rules.d/4-checks.mk | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/debian/rules.d/4-checks.mk b/debian/rules.d/4-checks.mk index cc953b7..c4df2fa 100644 --- a/debian/rules.d/4-checks.mk +++ b/debian/rules.d/4-checks.mk @@ -1,25 +1,21 @@ # Check ABI for package against last release (if not same abinum) -$(abidir)/%: $(stampdir)/stamp-build-% +abi-check-%: $(stampdir)/stamp-build-% install -d $(abidir) sed -e 's/^\(.\+\)[[:space:]]\+\(.\+\)[[:space:]]\(.\+\)$$/\3 \2 \1/' \ - $(builddir)/build-$*/Module.symvers | sort > $@ - -abi-check-%: $(abidir)/% + $(builddir)/build-$*/Module.symvers | sort > $(abidir)/$* @perl -f $(DROOT)/scripts/abi-check "$*" "$(prev_abinum)" "$(abinum)" \ "$(prev_abidir)" "$(abidir)" "$(skipabi)" # Check the module list against the last release (always) -$(abidir)/%.modules: abi-check-% +module-check-%: $(stampdir)/stamp-build-% install -d $(abidir) find $(builddir)/build-$*/ -name \*.ko | \ - sed -e 's/.*\/\([^\/]*\)\.ko/\1/' | sort > $@ - -module-check-%: $(abidir)/%.modules + sed -e 's/.*\/\([^\/]*\)\.ko/\1/' | sort > $(abidir)/$*.modules @perl -f $(DROOT)/scripts/module-check "$*" \ "$(prev_abidir)" "$(abidir)" $(skipmodule) -checks-%: module-check-% - @# Will be calling more stuff later +checks-%: module-check-% abi-check-% + @echo checks-$* # Check the config against the known options list. config-prepare-check-%: $(stampdir)/stamp-prepare-tree-% -- 1.7.10.4