Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/60236 )
Change subject: util/futility: Ensure futility checks for flashrom as a dep ......................................................................
util/futility: Ensure futility checks for flashrom as a dep
futility actually depends on flashrom. Previously it was of the form of subprocess and now uses the libflashrom API directly. Due to the previous subprocess decoupling it was not obvious that the dependency existed however not the runtime requirement is also a strict buildtime requirement. Therefore update the Makefile accordingly.
BUG=b:203715651,b:209702505 TEST=builds
Change-Id: Id9744424f75299eb8335c1c0c2aca2808bde829d Signed-off-by: Edward O'Callaghan quasisec@google.com --- M util/futility/Makefile.inc 1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/60236/1
diff --git a/util/futility/Makefile.inc b/util/futility/Makefile.inc index 9890339..eae7be0 100644 --- a/util/futility/Makefile.inc +++ b/util/futility/Makefile.inc @@ -4,7 +4,7 @@
HOSTPKGCONFIG ?= pkg-config
-$(VBOOT_FUTILITY): | check-openssl-presence +$(VBOOT_FUTILITY): | check-openssl-presence | check-flashrom-presence @printf " MAKE $(subst $(objutil)/,,$(@))\n" unset CFLAGS LDFLAGS; $(MAKE) -C $(VBOOT_SOURCE) \ BUILD=$(VBOOT_HOST_BUILD) \ @@ -18,6 +18,11 @@ $(HOSTPKGCONFIG) --exists libcrypto || \ (echo "Error: Ensure that pkg-config and openssl's libcrypto, including header files, are installed."; exit 1)
+.PHONY: check-flashrom-presence +check-flashrom-presence: + $(HOSTPKGCONFIG) --exists flashrom || \ + (echo "Error: Ensure that pkg-config and flashrom's libflashrom, including header files, are installed."; exit 1) + $(objutil)/futility/futility: $(VBOOT_FUTILITY) mkdir -p $(dir $@) cp $< $@.tmp