From 62c1bbedc448102c620a81eea546fcb9499b8000 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 10:09:33 +0000 Subject: [PATCH 1/3] build(deps): bump zsa_firmware from `e777bc9` to `0b6f7f9` Bumps [zsa_firmware](https://github.com/zsa/qmk_firmware) from `e777bc9` to `0b6f7f9`. - [Release notes](https://github.com/zsa/qmk_firmware/releases) - [Commits](https://github.com/zsa/qmk_firmware/compare/e777bc9d1ac1ba32d205d061fc2051c3a3d7f138...0b6f7f996cbd9f2eddde5413baf937cd70efb5d1) --- updated-dependencies: - dependency-name: zsa_firmware dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- zsa_firmware | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsa_firmware b/zsa_firmware index e777bc9d1a..0b6f7f996c 160000 --- a/zsa_firmware +++ b/zsa_firmware @@ -1 +1 @@ -Subproject commit e777bc9d1ac1ba32d205d061fc2051c3a3d7f138 +Subproject commit 0b6f7f996cbd9f2eddde5413baf937cd70efb5d1 From 1c856f65a6a7b91020d5b8e6c40a18c80179711d Mon Sep 17 00:00:00 2001 From: francisco souza <108725+fsouza@users.noreply.github.com> Date: Fri, 15 Nov 2024 01:06:11 -0500 Subject: [PATCH 2/3] Makefile: try to fix the build --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 821fa298e7..95bfae2eef 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ qmk_setup: make -C zsa_firmware git-submodules cd zsa_firmware && qmk setup $(QMK_REPO) -b $(QMK_BRANCH) -y -zsa_firmware/keyboards/moonlander/keymaps/mcoding: mcoding qmk_setup +zsa_firmware/keyboards/zsa/moonlander/keymaps/mcoding: mcoding qmk_setup rm -rf "$@" cp -r "$<" "$@" From 0530847330ee328156244c58d2988d6c6b373f61 Mon Sep 17 00:00:00 2001 From: francisco souza <108725+fsouza@users.noreply.github.com> Date: Fri, 15 Nov 2024 01:10:55 -0500 Subject: [PATCH 3/3] Makefile: update build instructions --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 95bfae2eef..970359dea9 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ QMK_REPO ?= zsa/qmk_firmware QMK_BRANCH ?= firmware22 .PHONY: build -build: zsa_firmware/keyboards/moonlander/keymaps/mcoding zsa_firmware/.build/moonlander_mcoding.bin +build: zsa_firmware/keyboards/zsa/moonlander/keymaps/mcoding zsa_firmware/.build/moonlander_mcoding.bin .PHONY: qmk_setup qmk_setup: @@ -14,4 +14,4 @@ zsa_firmware/keyboards/zsa/moonlander/keymaps/mcoding: mcoding qmk_setup cp -r "$<" "$@" zsa_firmware/.build/moonlander_mcoding.bin: mcoding qmk_setup - make -C zsa_firmware moonlander:mcoding + make -C zsa_firmware zsa/moonlander:mcoding