From 1f187371d002fb321a175233afddb50b2b6c3607 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 16 May 2021 14:42:37 +0200 Subject: [PATCH] Makefile: remove cpe-updates on clean Commit fd7312940aef (Makefile: add new missing-cpe target) added the rule to generate a set of files to update the NVD. For an in-tree build, 'make clean' remove the output directory, so those files are removed. But for an out-of-tree build, the output directory is not removed, so those files still linger around after a clean. Explicitly remove them on clean, to cater for both cases. Signed-off-by: Yann E. MORIN Cc: Thomas Petazzoni Cc: Matthew Weber Reviewed-by: Matthew Weber Reviewed-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 75ef7f5eb5..c3305f46e9 100644 --- a/Makefile +++ b/Makefile @@ -229,6 +229,8 @@ LEGAL_MANIFEST_CSV_HOST = $(LEGAL_INFO_DIR)/host-manifest.csv LEGAL_WARNINGS = $(LEGAL_INFO_DIR)/.warnings LEGAL_REPORT = $(LEGAL_INFO_DIR)/README +CPE_UPDATES_DIR = $(BASE_DIR)/cpe-updates + BR2_CONFIG = $(CONFIG_DIR)/.config # Pull in the user's configuration file @@ -947,11 +949,11 @@ pkg-stats: .PHONY: missing-cpe missing-cpe: - $(Q)mkdir -p $(O)/cpe-updates + $(Q)mkdir -p $(CPE_UPDATES_DIR) $(Q)cd "$(CONFIG_DIR)" ; \ $(TOPDIR)/support/scripts/gen-missing-cpe \ --nvd-path $(DL_DIR)/buildroot-nvd \ - --output $(O)/cpe-updates + --output $(CPE_UPDATES_DIR) else # ifeq ($(BR2_HAVE_DOT_CONFIG),y) @@ -1087,7 +1089,7 @@ printvars: clean: rm -rf $(BASE_TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) $(HOST_DIR_SYMLINK) \ $(BUILD_DIR) $(BASE_DIR)/staging \ - $(LEGAL_INFO_DIR) $(GRAPHS_DIR) $(PER_PACKAGE_DIR) + $(LEGAL_INFO_DIR) $(GRAPHS_DIR) $(PER_PACKAGE_DIR) $(CPE_UPDATES_DIR) .PHONY: distclean distclean: clean -- 2.30.2