From b282f33cf83a18cc73365b897a912a16021d5475 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 12 Nov 2017 18:45:46 +0100 Subject: [PATCH] fs: remove TARGET_DIR_WARNING_FILE late Remove it just before generating the filesystem image. This way, removing-and-recreating the file encloses the actual image generation as tightly as possible. Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- fs/common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/common.mk b/fs/common.mk index 378907e9ed..d4d5c183a5 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -70,7 +70,6 @@ $$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES) @$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)") $$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),$$(call $$(hook))$$(sep)) rm -f $$(FAKEROOT_SCRIPT) - rm -f $$(TARGET_DIR_WARNING_FILE) rm -f $$(USERS_TABLE) echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT) echo "set -e" >> $$(FAKEROOT_SCRIPT) @@ -100,6 +99,7 @@ endif $$(foreach hook,$$(ROOTFS_POST_CMD_HOOKS),\ $$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep)) chmod a+x $$(FAKEROOT_SCRIPT) + rm -f $$(TARGET_DIR_WARNING_FILE) PATH=$$(BR_PATH) $$(HOST_DIR)/bin/fakeroot -- $$(FAKEROOT_SCRIPT) $$(INSTALL) -m 0644 support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE) -@rm -f $$(FAKEROOT_SCRIPT) $$(FULL_DEVICE_TABLE) -- 2.30.2