From 3dbd74d03295f9fc357a88fa2160c75119908bfd Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Mon, 8 Jun 2020 18:15:05 -1000 Subject: [PATCH] imagebuilder: Remove json_info_files/ before build The folder `json_info_files` contains multiple JSON files which describe created firmware images. The folder is not removed between builds as the ImageBuilder does not use `image.mk`. Not removing the JSON files result in a merged `profiles.json` file containing entries for outdated or non-existing images. This commit adds the `json_info_files/` cleanup step to the ImageBuilder Makefile. Signed-off-by: Paul Spooren (cherry picked from commit 941ec28b355ea690b5682d2bf8175aa513379997) --- target/imagebuilder/files/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 835dd98ca5..2bdb2b5bde 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -168,6 +168,7 @@ prepare_rootfs: FORCE build_image: FORCE @echo @echo Building images... + rm -rf $(BUILD_DIR)/json_info_files/ $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 EXTRA_IMAGE_NAME="$(EXTRA_IMAGE_NAME)" \ $(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)")