From de87d6df69fd797fd3dfb8ac41d2c75e468dffc0 Mon Sep 17 00:00:00 2001 From: Thomas Gubler Date: Fri, 2 May 2014 14:23:22 +0200 Subject: do not copy hidden files to ROMFS --- makefiles/firmware.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'makefiles/firmware.mk') diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk index 1b646d9e0..69c975acd 100644 --- a/makefiles/firmware.mk +++ b/makefiles/firmware.mk @@ -113,7 +113,7 @@ endif $(info % GIT_DESC = $(GIT_DESC)) # -# Set a default target so that included makefiles or errors here don't +# Set a default target so that included makefiles or errors here don't # cause confusion. # # XXX We could do something cute here with $(DEFAULT_GOAL) if it's not one @@ -177,7 +177,7 @@ GLOBAL_DEPS += $(MAKEFILE_LIST) # # Extra things we should clean # -EXTRA_CLEANS = +EXTRA_CLEANS = # @@ -371,6 +371,8 @@ $(ROMFS_IMG): $(ROMFS_SCRATCH) $(ROMFS_DEPS) $(GLOBAL_DEPS) $(ROMFS_SCRATCH): $(ROMFS_DEPS) $(GLOBAL_DEPS) $(Q) $(MKDIR) -p $(ROMFS_SCRATCH) $(Q) $(COPYDIR) $(ROMFS_ROOT)/* $(ROMFS_SCRATCH) +# delete all files in ROMFS_SCRATCH which start with a . + $(Q) $(RM) $(ROMFS_SCRATCH)/*/.[!.]* $(ROMFS_SCRATCH)/*/*~ ifneq ($(ROMFS_EXTRA_FILES),) $(Q) $(MKDIR) -p $(ROMFS_SCRATCH)/extras $(Q) $(COPY) $(ROMFS_EXTRA_FILES) $(ROMFS_SCRATCH)/extras -- cgit v1.2.3 From 3424a65e3229a0bc5a1d78979356436392def264 Mon Sep 17 00:00:00 2001 From: Thomas Gubler Date: Fri, 2 May 2014 14:28:47 +0200 Subject: update comment in makefile --- makefiles/firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makefiles/firmware.mk') diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk index 69c975acd..60602e76f 100644 --- a/makefiles/firmware.mk +++ b/makefiles/firmware.mk @@ -371,7 +371,7 @@ $(ROMFS_IMG): $(ROMFS_SCRATCH) $(ROMFS_DEPS) $(GLOBAL_DEPS) $(ROMFS_SCRATCH): $(ROMFS_DEPS) $(GLOBAL_DEPS) $(Q) $(MKDIR) -p $(ROMFS_SCRATCH) $(Q) $(COPYDIR) $(ROMFS_ROOT)/* $(ROMFS_SCRATCH) -# delete all files in ROMFS_SCRATCH which start with a . +# delete all files in ROMFS_SCRATCH which start with a . or end with a ~ $(Q) $(RM) $(ROMFS_SCRATCH)/*/.[!.]* $(ROMFS_SCRATCH)/*/*~ ifneq ($(ROMFS_EXTRA_FILES),) $(Q) $(MKDIR) -p $(ROMFS_SCRATCH)/extras -- cgit v1.2.3