mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-28 01:03:35 +08:00
Merge pull request #889 from PX4/romfs_clean
Do not copy hidden or backup files to ROMFS
This commit is contained in:
@@ -43,6 +43,7 @@ from __future__ import print_function
|
|||||||
import argparse
|
import argparse
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
|
||||||
# Parse commandline arguments
|
# Parse commandline arguments
|
||||||
@@ -56,7 +57,7 @@ def main():
|
|||||||
for (root, dirs, files) in os.walk(args.folder):
|
for (root, dirs, files) in os.walk(args.folder):
|
||||||
for file in files:
|
for file in files:
|
||||||
# only prune text files
|
# only prune text files
|
||||||
if ".zip" in file or ".bin" in file:
|
if ".zip" in file or ".bin" or ".swp" in file:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
file_path = os.path.join(root, file)
|
file_path = os.path.join(root, file)
|
||||||
@@ -64,7 +65,7 @@ def main():
|
|||||||
# read file line by line
|
# read file line by line
|
||||||
pruned_content = ""
|
pruned_content = ""
|
||||||
with open(file_path, "r") as f:
|
with open(file_path, "r") as f:
|
||||||
for line in f:
|
for line in f:
|
||||||
|
|
||||||
# handle mixer files differently than startup files
|
# handle mixer files differently than startup files
|
||||||
if file_path.endswith(".mix"):
|
if file_path.endswith(".mix"):
|
||||||
|
|||||||
@@ -371,6 +371,8 @@ $(ROMFS_IMG): $(ROMFS_SCRATCH) $(ROMFS_DEPS) $(GLOBAL_DEPS)
|
|||||||
$(ROMFS_SCRATCH): $(ROMFS_DEPS) $(GLOBAL_DEPS)
|
$(ROMFS_SCRATCH): $(ROMFS_DEPS) $(GLOBAL_DEPS)
|
||||||
$(Q) $(MKDIR) -p $(ROMFS_SCRATCH)
|
$(Q) $(MKDIR) -p $(ROMFS_SCRATCH)
|
||||||
$(Q) $(COPYDIR) $(ROMFS_ROOT)/* $(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),)
|
ifneq ($(ROMFS_EXTRA_FILES),)
|
||||||
$(Q) $(MKDIR) -p $(ROMFS_SCRATCH)/extras
|
$(Q) $(MKDIR) -p $(ROMFS_SCRATCH)/extras
|
||||||
$(Q) $(COPY) $(ROMFS_EXTRA_FILES) $(ROMFS_SCRATCH)/extras
|
$(Q) $(COPY) $(ROMFS_EXTRA_FILES) $(ROMFS_SCRATCH)/extras
|
||||||
|
|||||||
Reference in New Issue
Block a user