Fix Pedal bootstub version

Author: legonigel

board/pedal/Makefile

@@ -30,11 +30,13 @@ recover: obj/bootstub.bin obj/$(PROJ_NAME).bin
 	$(DFU_UTIL) -d 0483:df11 -a 0 -s 0x08004000 -D obj/$(PROJ_NAME).bin
 	$(DFU_UTIL) -d 0483:df11 -a 0 -s 0x08000000:leave -D obj/bootstub.bin
 
+include ../../common/version.mk
+
 obj/main.o: main.c ../*.h
 	mkdir -p obj
 	$(CC) $(CFLAGS) -o $@ -c $<
 
-obj/bootstub.o: ../bootstub.c ../*.h
+obj/bootstub.o: ../bootstub.c ../*.h obj/gitversion.h
 	mkdir -p obj
 	$(CC) $(CFLAGS) -o $@ -c $<
 

common/version.mk

@@ -1,18 +1,20 @@
 ifeq ($(RELEASE),1)
-  BUILD_TYPE = "RELEASE"
+	BUILD_TYPE = "RELEASE"
 else
-  BUILD_TYPE = "DEBUG"
+	BUILD_TYPE = "DEBUG"
 endif
 
-ifneq ($(wildcard ../.git/HEAD),)
-obj/gitversion.h: ../VERSION ../.git/HEAD ../.git/index
-	echo "const uint8_t gitversion[] = \"$(shell cat ../VERSION)-$(BUILDER)-$(shell git rev-parse --short=8 HEAD)-$(BUILD_TYPE)\";" > $@
+SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+
+ifneq ($(wildcard $(SELF_DIR)/../.git/HEAD),)
+obj/gitversion.h: $(SELF_DIR)/../VERSION $(SELF_DIR)/../.git/HEAD $(SELF_DIR)/../.git/index
+	echo "const uint8_t gitversion[] = \"$(shell cat $(SELF_DIR)/../VERSION)-$(BUILDER)-$(shell git rev-parse --short=8 HEAD)-$(BUILD_TYPE)\";" > $@
 else
-ifneq ($(wildcard ../../.git/modules/panda/HEAD),)
-obj/gitversion.h: ../VERSION ../../.git/modules/panda/HEAD ../../.git/modules/panda/index
-	echo "const uint8_t gitversion[] = \"$(shell cat ../VERSION)-$(BUILDER)-$(shell git rev-parse --short=8 HEAD)-$(BUILD_TYPE)\";" > $@
+ifneq ($(wildcard $(SELF_DIR)/../../.git/modules/panda/HEAD),)
+obj/gitversion.h: $(SELF_DIR)/../VERSION $(SELF_DIR)/../../.git/modules/panda/HEAD $(SELF_DIR)/../../.git/modules/panda/index
+	echo "const uint8_t gitversion[] = \"$(shell cat $(SELF_DIR)/../VERSION)-$(BUILDER)-$(shell git rev-parse --short=8 HEAD)-$(BUILD_TYPE)\";" > $@
 else
-obj/gitversion.h: ../VERSION
-	echo "const uint8_t gitversion[] = \"$(shell cat ../VERSION)-$(BUILDER)-unknown-$(BUILD_TYPE)\";" > $@
+obj/gitversion.h: $(SELF_DIR)/../VERSION
+	echo "const uint8_t gitversion[] = \"$(shell cat $(SELF_DIR)/../VERSION)-$(BUILDER)-unknown-$(BUILD_TYPE)\";" > $@
 endif
 endif