Merge pull request #280 from slaclab/pre-release

Release Candidate v4.6.2

LICENSE.txt

@@ -1,5 +1,5 @@
 
-Copyright (c) 2022, The Board of Trustees of the Leland Stanford Junior 
+Copyright (c) 2023, The Board of Trustees of the Leland Stanford Junior 
 University, through SLAC National Accelerator Laboratory (subject to receipt 
 of any required approvals from the U.S. Dept. of Energy). All rights reserved. 
 Redistribution and use in source and binary forms, with or without 

README.md

@@ -9,12 +9,6 @@ A Makefile/TCL `hybrid` Firmware build system
 
 [Support Homepage](https://confluence.slac.stanford.edu/display/ppareg/Build+System%3A+Vivado+Support)
 
-# MicroblazeBasicCore
-
-`MicroblazeBasicCore` is a simple Microblaze implementation (BRAM cache).
-
-Example: https://github.com/slaclab/surf/tree/main/xilinx/general/microblaze/bd
-
 # List of user defined TCL scripts
 
 User defined TCL scripts are located in the target's vivado directory.

scripts/releaseNotes.py

@@ -27,6 +27,7 @@ def getReleaseNotes(locRepo, remRepo, oldTag, newTag):
     # Grouping of recors
     records = odict({'Bug': [],
                      'Enhancement': [],
+                     'Documentation': [],
                      'Interface-change': [],
                      'Unlabeled': []})
 
@@ -95,7 +96,7 @@ def getReleaseNotes(locRepo, remRepo, oldTag, newTag):
             # Add both to details list and sectioned summary list
             found = False
             if entry['Labels'] is not None:
-                for label in ['Bug', 'Enhancement', 'Interface-change']:
+                for label in records.keys():
 
                     if label.lower() in entry['Labels']:
                         records[label].append(entry)
@@ -111,7 +112,7 @@ def getReleaseNotes(locRepo, remRepo, oldTag, newTag):
     md = f'# Pull Requests Since {oldTag}\n'
 
     # Summary list is sectioned
-    for label in ['Interface-change', 'Bug', 'Enhancement', 'Unlabeled']:
+    for label in ['Interface-change', 'Bug', 'Enhancement', 'Documentation', 'Unlabeled']:
         subLab = ""
 
         # Sort by changes

system_shared.mk

@@ -43,8 +43,7 @@ BUILD_TIME := $(shell date +%Y%m%d%H%M%S)
 export BUILD_STRING = $(PROJECT): Vivado v$(VIVADO_VERSION), $(BUILD_SYS_NAME) ($(BUILD_SVR_TYPE)), Built $(BUILD_DATE) by $(BUILD_USER)
 
 # Check the GIT status
-$(shell git update-index --refresh)
-export GIT_STATUS = $(shell git diff-index --name-only HEAD)
+export GIT_STATUS = $(shell git update-index --refresh | sed -e 's/: needs update//g')
 
 # Check for non-dirty git clone
 ifeq ($(GIT_STATUS),)