fix build issues

Dewb · Jan 14, 2024 · 179358e · 179358e
1 parent 02aa263
commit 179358e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/firmware/ansible.mk b/firmware/ansible.mk
@@ -46,7 +46,7 @@ SOURCES = \
 	$(wildcard mock_hardware/modules/ansible/*.c) \
 
 # Add the git commit id to a file for use when printing out the version
-ansible/src/gitversion.c: $(shell find ../.git/modules/firmware/$(TARGET_NAME) -type f,d)
+ansible/src/gitversion.c: $(shell find ../.git/modules/firmware/$(TARGET_NAME)/refs) ../.git/modules/firmware/$(TARGET_NAME)/packed-refs ../.git/modules/firmware/$(TARGET_NAME)/HEAD
 	echo "const char *git_version = \"$(GIT_VERSION)\";" > $@
 
 include common.mk
diff --git a/firmware/common.mk b/firmware/common.mk
@@ -4,7 +4,7 @@ RACK_DIR ?= ../../..
 TARGET_DIR := ../res/firmware/
 BUILD_DIR := ../build/firmware/$(TARGET_NAME)
 
-GIT_VERSION = $(shell cut -d '-' -f 1 <<< $(shell cd $(TARGET_NAME); git describe --tags | cut -c 1-)) $(shell cd $(TARGET_NAME); git describe --always --dirty --exclude '*' | tr '[a-z]' '[A-Z]')
+GIT_VERSION := $(shell cut -d '-' -f 1 <<< $(shell cd $(TARGET_NAME); git describe --tags | cut -c 1-)) $(shell cd $(TARGET_NAME); git describe --always --dirty --exclude '*' | tr '[a-z]' '[A-Z]')
 
 FLAGS += \
 	-DDEBUG \

diff --git a/firmware/earthsea.mk b/firmware/earthsea.mk
@@ -27,6 +27,6 @@ SOURCES = \
 	$(wildcard mock_hardware/common/*.c) \
 	$(wildcard mock_hardware/modules/trilogy/*.c) \
 
-FLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+FLAGS += -DGIT_VERSION="\"$(GIT_VERSION)\""
 
 include common.mk
diff --git a/firmware/meadowphysics.mk b/firmware/meadowphysics.mk
@@ -22,6 +22,7 @@ SOURCES = \
 	$(wildcard mock_hardware/common/*.c) \
 	$(wildcard mock_hardware/modules/trilogy/*.c) \
 
-FLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+FLAGS += -DGIT_VERSION="\"$(GIT_VERSION)\""
+
 
 include common.mk
diff --git a/firmware/teletype.mk b/firmware/teletype.mk
@@ -51,7 +51,7 @@ $(TARGET_NAME)/src/scanner.c: $(TARGET_NAME)/src/scanner.rl
 	$(RAGEL) -C -G2 $(TARGET_NAME)/src/scanner.rl -o $(TARGET_NAME)/src/scanner.c
 
 # Add the git commit id to a file for use when printing out the version
-$(TARGET_NAME)/module/gitversion.c: $(shell find ../.git/modules/firmware/$(TARGET_NAME) -type f,d)
+$(TARGET_NAME)/module/gitversion.c: $(shell find ../.git/modules/firmware/$(TARGET_NAME)/refs) ../.git/modules/firmware/$(TARGET_NAME)/packed-refs ../.git/modules/firmware/$(TARGET_NAME)/HEAD
 	echo "const char *git_version = \"$(GIT_VERSION)\";" > $@
 
 include common.mk
diff --git a/firmware/whitewhale.mk b/firmware/whitewhale.mk
@@ -20,6 +20,6 @@ SOURCES = \
 	$(wildcard mock_hardware/common/*.c) \
 	$(wildcard mock_hardware/modules/trilogy/*.c) \
 
-FLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+FLAGS += -DGIT_VERSION="\"$(GIT_VERSION)\""
 
 include common.mk