daniel/massdrop-shift-qmk-compiler
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reapply patches after update and apply patches when needed

Browse Source
This commit is contained in:
Daniel_I_Am 2022-05-05 23:39:48 +02:00
parent 51bc9237e7
commit 43e925ef91
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -18,9 +18,10 @@ help:
@grep -E '^[-a-zA-Z0-9_\.\/]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[32m%-15s\033[0m %s\n", $$1, $$2}' @grep -E '^[-a-zA-Z0-9_\.\/]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[32m%-15s\033[0m %s\n", $$1, $$2}'
.PHONY: update .PHONY: update
update: qmk_firmware qmk_firmware/patches_applied ## Update qmk_firmware update: qmk_firmware ## Update qmk_firmware
@git -C qmk_firmware fetch @git -C qmk_firmware fetch
@git -C qmk_firmware checkout $(QMK_FIRMWARE_COMMIT) @git -C qmk_firmware checkout $(QMK_FIRMWARE_COMMIT)
$(MAKE) qmk_firmware/patches_applied
.PHONY: write .PHONY: write
write: mdloader builds/$(WRITE_TARGET).bin ## Write a layout to the keyboard, pass WRITE_TARGET as variable to control the particular layout write: mdloader builds/$(WRITE_TARGET).bin ## Write a layout to the keyboard, pass WRITE_TARGET as variable to control the particular layout
@ -35,8 +36,8 @@ qmk_firmware:
@git -C qmk_firmware checkout $(QMK_FIRMWARE_COMMIT) @git -C qmk_firmware checkout $(QMK_FIRMWARE_COMMIT)
$(MAKE) qmk_firmware/patches_applied $(MAKE) qmk_firmware/patches_applied
qmk_firmware/patches_applied: qmk_patches.diff qmk_firmware/patches_applied: qmk_patches.diff qmk_firmware/.git/HEAD
@sudo git -C qmk_firmware clean -dffx @git -C qmk_firmware clean -dffx 2>/dev/null || true
@git -C qmk_firmware reset --hard HEAD @git -C qmk_firmware reset --hard HEAD
@git -C qmk_firmware apply ../qmk_patches.diff @git -C qmk_firmware apply ../qmk_patches.diff
@touch qmk_firmware/patches_applied @touch qmk_firmware/patches_applied