bug fix for DXF IMAGENAME

slaclab · Nov 20, 2024 · cb8a0d3 · cb8a0d3
1 parent 539b17e
commit cb8a0d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/system_shared.mk b/system_shared.mk
@@ -55,7 +55,7 @@ ifeq ($(GIT_STATUS),)
    ifeq ($(RECONFIG_STATIC_HASH), 0)
       export IMAGENAME = $(PROJECT)-$(PRJ_VERSION)-$(BUILD_TIME)-$(USER)-$(GIT_HASH_SHORT)
    else
-      export IMAGENAME = $(PROJECT)-$(PRJ_VERSION)-$(BUILD_TIME)-$(USER)-$(GIT_HASH_SHORT)$(RECONFIG_STATIC_HASH)
+      export IMAGENAME = $(PROJECT)-$(PRJ_VERSION)-$(BUILD_TIME)-$(USER)-$(GIT_HASH_SHORT)_$(RECONFIG_STATIC_HASH)
    endif
 else
    export GIT_HASH_MSG   = dirty (uncommitted code)
@@ -70,7 +70,7 @@ else
    ifeq ($(RECONFIG_STATIC_HASH), 0)
       export IMAGENAME = $(PROJECT)-$(PRJ_VERSION)-$(BUILD_TIME)-$(USER)-dirty
    else
-      export IMAGENAME = $(PROJECT)-$(PRJ_VERSION)-$(BUILD_TIME)-$(USER)-dirty$(RECONFIG_STATIC_HASH)
+      export IMAGENAME = $(PROJECT)-$(PRJ_VERSION)-$(BUILD_TIME)-$(USER)-dirty_$(RECONFIG_STATIC_HASH)
    endif
 endif
 

diff --git a/system_vivado.mk b/system_vivado.mk
@@ -89,7 +89,7 @@ export RECONFIG_CHECKPOINT = 0
 export RECONFIG_STATIC_HASH = 0
 else
 export RECONFIG_STATIC_FILE = $(notdir $(RECONFIG_CHECKPOINT))
-export RECONFIG_STATIC_HASH = -$(shell echo '$(RECONFIG_STATIC_FILE)' | awk -F'-' '{print $$5}' )
+export RECONFIG_STATIC_HASH = $(shell echo '$(RECONFIG_STATIC_FILE)' | awk -F'-' '{print $$5}' )
 endif
 
 ifndef RECONFIG_ENDPOINT