diff --git a/.github/workflows/custom-board-build/action.yaml b/.github/workflows/custom-board-build/action.yaml index e7d4783232..c94c2a9381 100644 --- a/.github/workflows/custom-board-build/action.yaml +++ b/.github/workflows/custom-board-build/action.yaml @@ -200,6 +200,7 @@ runs: if ac 'srec'; then TARGETS+=("build/rusefi.srec"); fi if ac 'bundles' || ac 'bundle'; then TARGETS+=("../artifacts/rusefi_bundle_${SHORT_BOARD_NAME}.zip"); fi if ac 'bundles' || ac 'autoupdate'; then TARGETS+=("../artifacts/rusefi_bundle_${SHORT_BOARD_NAME}_autoupdate.zip"); fi + if ac 'obfuscated'; then TARGETS+=("../artifacts/rusefi_bundle_${SHORT_BOARD_NAME}_obfuscated.zip"); fi bash bin/compile.sh $BOARD_META_PATH ${TARGETS[@]} - name: Upload Bundle diff --git a/firmware/bundle.mk b/firmware/bundle.mk index d84a3f9177..e89f9feb8f 100644 --- a/firmware/bundle.mk +++ b/firmware/bundle.mk @@ -154,25 +154,30 @@ else endif @touch $@ +$(FOLDER)/rusefi-obfuscated.bin: $(BUILDDIR)/$(PROJECT).bin + [ -z "$(POST_BUILD_SCRIPT)" ] || bash $(POST_BUILD_SCRIPT) $(BUILDDIR)/$(PROJECT).bin $(FOLDER)/rusefi-obfuscated.bin + $(ST_DRIVERS): | $(DRIVERS_FOLDER) wget https://rusefi.com/build_server/st_files/silent_st_drivers2.exe -P $(dir $@) $(DELIVER) $(ARTIFACTS) $(FOLDER) $(CONSOLE_FOLDER) $(DRIVERS_FOLDER) $(CACERTS_FOLDER): mkdir -p $@ -$(ARTIFACTS)/$(BUNDLE_FULL_NAME).zip: $(BUNDLE_FILES) | $(ARTIFACTS) post-build +$(ARTIFACTS)/$(BUNDLE_FULL_NAME).zip: $(BUNDLE_FILES) | $(ARTIFACTS) zip -r $@ $(BUNDLE_FILES) +$(ARTIFACTS)/$(BUNDLE_FULL_NAME)_obfuscated.zip: $(BUNDLE_FILES) | $(ARTIFACTS) + zip -r $@ $(filter-out $(BOUTS) $(OUTBIN),$(BUNDLE_FILES)) $(FOLDER)/rusefi-obfuscated.bin + # The autopdate zip doesn't have a folder with the bundle contents -$(ARTIFACTS)/$(BUNDLE_FULL_NAME)_autoupdate.zip: $(UPDATE_BUNDLE_FILES) | $(ARTIFACTS) post-build +$(ARTIFACTS)/$(BUNDLE_FULL_NAME)_autoupdate.zip: $(UPDATE_BUNDLE_FILES) | $(ARTIFACTS) cd $(FOLDER) && zip -r ../$@ $(subst $(FOLDER)/,,$(UPDATE_BUNDLE_FILES)) -.PHONY: bundle post-build +.PHONY: bundle obfuscated-bundle bundle: $(ARTIFACTS)/$(BUNDLE_FULL_NAME)_autoupdate.zip $(ARTIFACTS)/$(BUNDLE_FULL_NAME).zip all -post-build: | $(BUNDLE_FILES) $(UPDATE_BUNDLE_FILES) - [ -z "$(POST_BUILD_SCRIPT)" ] || bash $(POST_BUILD_SCRIPT) +obfuscated-bundle: $(ARTIFACTS)/$(BUNDLE_FULL_NAME)_obfuscated.zip CLEAN_BUNDLE_HOOK: @echo Cleaning Bundle