From f4bc5c60ba716946537d411b2c58f5ae7a4e578d Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Mon, 15 Feb 2016 13:26:20 -0200 Subject: [PATCH] mk: px4: replace cp -f with cp -f is only needed for rm because it fails when the file being removed doesn't exist. cp doesn't need it. --- mk/px4_targets.mk | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/mk/px4_targets.mk b/mk/px4_targets.mk index 1f5c2b1228..649c2edca5 100644 --- a/mk/px4_targets.mk +++ b/mk/px4_targets.mk @@ -83,29 +83,29 @@ module_mk: px4-v1: $(BUILDROOT)/make.flags CHECK_MODULES $(MAVLINK_HEADERS) $(PX4_ROOT)/Archives/px4fmu-v1.export $(SKETCHCPP) module_mk px4-io-v1 $(RULEHDR) - $(v) cp -f $(PX4_V1_CONFIG_FILE) $(PX4_ROOT)/makefiles/nuttx/ + $(v) cp $(PX4_V1_CONFIG_FILE) $(PX4_ROOT)/makefiles/nuttx/ $(v) $(PX4_MAKE) px4fmu-v1_APM $(v) arm-none-eabi-size $(PX4_ROOT)/Build/px4fmu-v1_APM.build/firmware.elf - $(v) cp -f $(PX4_ROOT)/Images/px4fmu-v1_APM.px4 $(SKETCH)-v1.px4 + $(v) cp $(PX4_ROOT)/Images/px4fmu-v1_APM.px4 $(SKETCH)-v1.px4 $(v) $(SKETCHBOOK)/Tools/scripts/add_git_hashes.py $(HASHADDER_FLAGS) "$(SKETCH)-v1.px4" "$(SKETCH)-v1.px4" $(v) echo "PX4 $(SKETCH) Firmware is in $(SKETCH)-v1.px4" px4-v2: $(BUILDROOT)/make.flags CHECK_MODULES $(MAVLINK_HEADERS) $(PX4_ROOT)/Archives/px4fmu-v2.export $(SKETCHCPP) module_mk px4-io-v2 $(RULEHDR) - $(v) cp -f $(PX4_V2_CONFIG_FILE) $(PX4_ROOT)/makefiles/nuttx/ + $(v) cp $(PX4_V2_CONFIG_FILE) $(PX4_ROOT)/makefiles/nuttx/ $(PX4_MAKE) px4fmu-v2_APM $(v) arm-none-eabi-size $(PX4_ROOT)/Build/px4fmu-v2_APM.build/firmware.elf - $(v) cp -f $(PX4_ROOT)/Images/px4fmu-v2_APM.px4 $(SKETCH)-v2.px4 + $(v) cp $(PX4_ROOT)/Images/px4fmu-v2_APM.px4 $(SKETCH)-v2.px4 $(v) $(SKETCHBOOK)/Tools/scripts/add_git_hashes.py $(HASHADDER_FLAGS) "$(SKETCH)-v2.px4" "$(SKETCH)-v2.px4" $(v) echo "PX4 $(SKETCH) Firmware is in $(SKETCH)-v2.px4" px4-v4: $(BUILDROOT)/make.flags CHECK_MODULES $(MAVLINK_HEADERS) $(PX4_ROOT)/Archives/px4fmu-v4.export $(SKETCHCPP) module_mk $(RULEHDR) - $(v) cp -f $(PX4_V4_CONFIG_FILE) $(PX4_ROOT)/makefiles/nuttx/ + $(v) cp $(PX4_V4_CONFIG_FILE) $(PX4_ROOT)/makefiles/nuttx/ $(PX4_MAKE) px4fmu-v4_APM $(v) arm-none-eabi-size $(PX4_ROOT)/Build/px4fmu-v4_APM.build/firmware.elf - $(v) cp -f $(PX4_ROOT)/Images/px4fmu-v4_APM.px4 $(SKETCH)-v4.px4 - $(v) cp -f $(SKETCHBOOK)/mk/PX4/bootloader/px4fmuv4_bl.bin $(MK_DIR)/PX4/ROMFS/bootloader/fmu_bl.bin + $(v) cp $(PX4_ROOT)/Images/px4fmu-v4_APM.px4 $(SKETCH)-v4.px4 + $(v) cp $(SKETCHBOOK)/mk/PX4/bootloader/px4fmuv4_bl.bin $(MK_DIR)/PX4/ROMFS/bootloader/fmu_bl.bin $(v) $(SKETCHBOOK)/Tools/scripts/add_git_hashes.py $(HASHADDER_FLAGS) "$(SKETCH)-v4.px4" "$(SKETCH)-v4.px4" $(v) echo "PX4 $(SKETCH) Firmware is in $(SKETCH)-v4.px4" @@ -144,23 +144,23 @@ px4-archives-clean: px4-io-v1: $(PX4_ROOT)/Archives/px4io-v1.export $(v)+ $(MAKE) -C $(PX4_ROOT) -f $(PX4_ROOT)/Makefile.make px4io-v1_default - $(v) cp -f $(PX4_ROOT)/Images/px4io-v1_default.bin px4io-v1.bin - $(v) cp -f $(PX4_ROOT)/Build/px4io-v1_default.build/firmware.elf px4io-v1.elf + $(v) cp $(PX4_ROOT)/Images/px4io-v1_default.bin px4io-v1.bin + $(v) cp $(PX4_ROOT)/Build/px4io-v1_default.build/firmware.elf px4io-v1.elf $(v) mkdir -p $(MK_DIR)/PX4/ROMFS/px4io/ - $(v) cp -f px4io-v1.bin $(MK_DIR)/PX4/ROMFS/px4io/px4io.bin + $(v) cp px4io-v1.bin $(MK_DIR)/PX4/ROMFS/px4io/px4io.bin $(v) mkdir -p $(MK_DIR)/PX4/ROMFS/bootloader/ - $(v) cp -f $(SKETCHBOOK)/mk/PX4/bootloader/px4fmu_bl.bin $(MK_DIR)/PX4/ROMFS/bootloader/fmu_bl.bin + $(v) cp $(SKETCHBOOK)/mk/PX4/bootloader/px4fmu_bl.bin $(MK_DIR)/PX4/ROMFS/bootloader/fmu_bl.bin $(v) echo "PX4IOv1 Firmware is in px4io-v1.bin" px4-io-v2: $(PX4_ROOT)/Archives/px4io-v2.export $(v)+ $(MAKE) -C $(PX4_ROOT) -f $(PX4_ROOT)/Makefile.make px4io-v2_default - $(v) cp -f $(PX4_ROOT)/Images/px4io-v2_default.bin px4io-v2.bin - $(v) cp -f $(PX4_ROOT)/Build/px4io-v2_default.build/firmware.elf px4io-v2.elf + $(v) cp $(PX4_ROOT)/Images/px4io-v2_default.bin px4io-v2.bin + $(v) cp $(PX4_ROOT)/Build/px4io-v2_default.build/firmware.elf px4io-v2.elf $(v) mkdir -p $(MK_DIR)/PX4/ROMFS/px4io/ - $(v) cp -f px4io-v2.bin $(MK_DIR)/PX4/ROMFS/px4io/px4io.bin + $(v) cp px4io-v2.bin $(MK_DIR)/PX4/ROMFS/px4io/px4io.bin $(v) mkdir -p $(MK_DIR)/PX4/ROMFS/bootloader/ - $(v) cp -f $(SKETCHBOOK)/mk/PX4/bootloader/px4fmuv2_bl.bin $(MK_DIR)/PX4/ROMFS/bootloader/fmu_bl.bin + $(v) cp $(SKETCHBOOK)/mk/PX4/bootloader/px4fmuv2_bl.bin $(MK_DIR)/PX4/ROMFS/bootloader/fmu_bl.bin $(v) echo "PX4IOv2 Firmware is in px4io-v2.bin" px4-io: px4-io-v1 px4-io-v2