diff options
| author | Paul Spooren <mail@aparcar.org> | 2020-06-08 18:15:05 -1000 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2020-07-13 21:24:30 +0100 |
| commit | 3dbd74d03295f9fc357a88fa2160c75119908bfd (patch) | |
| tree | a4ca3fa1e55a58cded6810b7f4e5da8c3ed23fb5 | |
| parent | 8ea6be1510af130ee458fb261372a042a1ba6490 (diff) | |
| download | upstream-3dbd74d03295f9fc357a88fa2160c75119908bfd.tar.gz upstream-3dbd74d03295f9fc357a88fa2160c75119908bfd.tar.bz2 upstream-3dbd74d03295f9fc357a88fa2160c75119908bfd.zip | |
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 <mail@aparcar.org>
(cherry picked from commit 941ec28b355ea690b5682d2bf8175aa513379997)
| -rw-r--r-- | target/imagebuilder/files/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
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)") |