fix dh_auto_clean

parent 5a59361e
Pipeline #44471 passed with stage
in 6 minutes and 23 seconds
modify the Makefiles so that 'make clean' cleans everything that was built
Index: firmware-tomu/booster/Makefile
===================================================================
--- firmware-tomu.orig/booster/Makefile
+++ firmware-tomu/booster/Makefile
@@ -76,6 +76,7 @@ $(OBJ_DIR)/%.o: %.S
$(CLEAN):
$(QUIET) rm -f $(wildcard $(OBJ_DIR)/*.d)
$(QUIET) rm -f $(wildcard $(OBJ_DIR)/*.o)
- $(QUIET) rm -f $(TARGET) $(PACKAGE).bin $(PACKAGE).symbol
+ $(QUIET) rm -rf $(OBJ_DIR)
+ $(QUIET) rm -f $(TARGET) $(PACKAGE).bin $(PACKAGE).ihex
include $(wildcard $(OBJ_DIR)/*.d)
Index: firmware-tomu/toboot/Makefile
===================================================================
--- firmware-tomu.orig/toboot/Makefile
+++ firmware-tomu/toboot/Makefile
@@ -98,9 +98,9 @@ $(OBJ_DIR)/%.o: %.S
clean:
$(QUIET) echo " RM $(subst /,$(PATH_SEP),$(wildcard $(OBJ_DIR)/*.d))"
-$(QUIET) $(RM) $(subst /,$(PATH_SEP),$(wildcard $(OBJ_DIR)/*.d))
- $(QUIET) echo " RM $(subst /,$(PATH_SEP),$(wildcard $(OBJ_DIR)/*.d))"
- -$(QUIET) $(RM) $(subst /,$(PATH_SEP),$(wildcard $(OBJ_DIR)/*.o))
- $(QUIET) echo " RM $(TARGET) $(PACKAGE).bin $(PACKAGE).symbol $(PACKAGE).ihex"
- -$(QUIET) $(RM) $(TARGET) $(PACKAGE).bin $(PACKAGE).symbol $(PACKAGE).ihex
+ $(QUIET) echo " RM $(subst /,$(PATH_SEP),$(wildcard $(OBJ_DIR)/*.o)) $(OBJ_DIR)"
+ -$(QUIET) $(RM) $(subst /,$(PATH_SEP),$(wildcard $(OBJ_DIR)/*.o)) $(OBJ_DIR)
+ $(QUIET) echo " RM $(TARGET) $(PACKAGE).bin $(PACKAGE).dfu $(PACKAGE).ihex"
+ -$(QUIET) $(RM) $(TARGET) $(PACKAGE).bin $(PACKAGE).dfu $(PACKAGE).ihex
include $(wildcard $(OBJ_DIR)/*.d)
0001_Makefile_GIT_VERSION.patch
0002_Makefile_CLEAN.patch
......@@ -11,11 +11,8 @@ override_dh_auto_build:
override_dh_auto_clean:
cd toboot && $(MAKE) clean
$(RM) toboot/toboot.dfu
cd booster && $(MAKE) clean
$(RM) booster/make-booster
$(RM) booster/booster.ihex
$(RM) booster/toboot-booster.dfu
$(RM) booster/make-booster booster/toboot-booster.dfu
override_dh_fixperms:
dh_fixperms
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment