Merge pull request #889 from PX4/romfs_clean

Do not copy hidden or backup files to ROMFS
This commit is contained in:
Lorenz Meier 2014-05-02 06:09:57 -07:00
commit 5bbb76231f
2 changed files with 19 additions and 16 deletions

View File

@ -43,6 +43,7 @@ from __future__ import print_function
import argparse
import os
def main():
# Parse commandline arguments
@ -56,7 +57,7 @@ def main():
for (root, dirs, files) in os.walk(args.folder):
for file in files:
# only prune text files
if ".zip" in file or ".bin" in file:
if ".zip" in file or ".bin" or ".swp" in file:
continue
file_path = os.path.join(root, file)

View File

@ -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 . or end 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