diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-10 19:01:23 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-03-10 19:01:23 +0100 |
| commit | 368c2390cf98980e317171d2a44622f1b6ec9c33 (patch) | |
| tree | 3005326aa810faacd8b7900249e273826efb49aa /makefiles | |
| parent | b4cec8593e80eb80d9640a0e63cab03c63c825d0 (diff) | |
| parent | 94c40b6fa44df7d9756a4f318f6bce1de9bedd89 (diff) | |
| download | px4-firmware-368c2390cf98980e317171d2a44622f1b6ec9c33.tar.gz px4-firmware-368c2390cf98980e317171d2a44622f1b6ec9c33.tar.bz2 px4-firmware-368c2390cf98980e317171d2a44622f1b6ec9c33.zip | |
Merge pull request #673 from PX4/romfs_prune
ROMFS: ignore comments and newlines in startup files, text in mixer files
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/firmware.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/makefiles/firmware.mk b/makefiles/firmware.mk index cb20d9cd1..1b646d9e0 100644 --- a/makefiles/firmware.mk +++ b/makefiles/firmware.mk @@ -355,6 +355,9 @@ ROMFS_OBJ = $(ROMFS_CSRC:.c=.o) LIBS += $(ROMFS_OBJ) LINK_DEPS += $(ROMFS_OBJ) +# Remove all comments from startup and mixer files +ROMFS_PRUNER = $(PX4_BASE)/Tools/px_romfs_pruner.py + # Turn the ROMFS image into an object file $(ROMFS_OBJ): $(ROMFS_IMG) $(GLOBAL_DEPS) $(call BIN_TO_OBJ,$<,$@,romfs_img) @@ -372,6 +375,7 @@ ifneq ($(ROMFS_EXTRA_FILES),) $(Q) $(MKDIR) -p $(ROMFS_SCRATCH)/extras $(Q) $(COPY) $(ROMFS_EXTRA_FILES) $(ROMFS_SCRATCH)/extras endif + $(Q) $(PYTHON) -u $(ROMFS_PRUNER) --folder $(ROMFS_SCRATCH) EXTRA_CLEANS += $(ROMGS_OBJ) $(ROMFS_IMG) |