Makefile: move coreboot_dir and board_dir cleanup to canary dev cycle helper to not impact qemu builds (which need to inject pubkey chich changes at each build.....

Signed-off-by: Thierry Laurion <[email protected]>

Author: tlaurion

Makefile

@@ -142,12 +142,9 @@ PACKAGES	:= $(shell mkdir -p "$(packages)")
 HASHES		:= $(board_build)/hashes.txt
 SIZES		:= $(board_build)/sizes.txt
 
-# Create the board output directory and delete any board's build arficats
-# This ensures that artifacts are wiped 
-# TODO: verify that qemu builds which injects public still works between builds, otherwise move this is canary dev helper
+# Create the board output directory if it doesn't already exist
 BOARD_LOG	:= $(shell \
 	mkdir -p "$(board_build)" ; \
-	rm -rf "$(board_build)"/* ; \
 	echo "$(DATE) $(GIT_HASH) $(GIT_STATUS)" > "$(HASHES)" ; \
 	echo "$(DATE) $(GIT_HASH) $(GIT_STATUS)" > "$(SIZES)" ; \
 )
@@ -977,8 +974,14 @@ real.remove_canary_files-extract_patch_rebuild_what_changed:
 	@echo "This approach economizes time since most build artifacts do not need to be rebuilt, as the file dates should be the same as when you originally built them."
 	@echo "Only a minimal time is needed for rebuilding, which is also good for your SSD."
 	@echo "*** USE THIS APPROACH FIRST ***"
-	find ./build/ -type f -name ".canary" -print -delete
-	find ./install/*/* -print -exec rm -rf {} + 2>/dev/null || true
+	@echo "Removing ./build .canary files..."
+	@find ./build/ -type f -name ".canary" -print -delete || true
+	@echo "Removing install/*/* content..."
+	@find ./install/*/* -print -exec rm -rf {} + 2>/dev/null || true
+	@echo "Removing coreboot board related artifacts $(build)/$(coreboot_dir)/*"
+	rm -rf "$(build)/$(coreboot_dir)/*"
+	@echo "Removing coreboot board related artifacts $(board_build)"
+	rm -rf "$(board_build)"
 	$(call overwrite_canary_if_coreboot_git)
 
 real.gitclean_keep_packages_and_build:

modules/coreboot

@@ -150,7 +150,6 @@ endif
 
 $(coreboot_module)_configure := \
 	mkdir -p "$(build)/$(coreboot_dir)"; \
-	rm -rf $(build)/$(coreboot_dir)/*; \
 	$(call install_config,$(pwd)/$(CONFIG_COREBOOT_CONFIG),$(build)/$(coreboot_dir)/.config); \
 	sed -i '/^CONFIG_LOCALVERSION/d' $(build)/$(coreboot_dir)/.config; \
 	echo 'CONFIG_LOCALVERSION=$(CONFIG_COREBOOT_LOCALVERSION)' >> $(build)/$(coreboot_dir)/.config; \