Merge branch 'microsoft:dev/202405' into dev/202405

microsoft · Jan 20, 2025 · a1712f3 · a1712f3
2 parents 016c207 + 0a2c88b
commit a1712f3
Show file tree

Hide file tree

Showing 44 changed files with 3,636 additions and 2,744 deletions.
diff --git a/.azurepipelines/MuDevOpsWrapper.yml b/.azurepipelines/MuDevOpsWrapper.yml
@@ -19,7 +19,7 @@ resources:
       type: github
       endpoint: microsoft
       name: microsoft/mu_devops
-      ref: refs/tags/v12.2.0
+      ref: refs/tags/v12.4.0
 
 parameters:
 - name: do_ci_build

diff --git a/.github/release-draft-config-n-1-dev.yml b/.github/release-draft-config-n-1-dev.yml
@@ -28,7 +28,7 @@ template: |
 
   $CHANGES
 
-  **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
+  **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...dev-v$RESOLVED_VERSION
 
 categories:
   - title: '⚠️ Breaking Changes'

diff --git a/.github/release-draft-config-n-1.yml b/.github/release-draft-config-n-1.yml
@@ -29,7 +29,7 @@ template: |
 
   $CHANGES
 
-  **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
+  **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...dev-v$RESOLVED_VERSION
 
 categories:
   - title: '⚠️ Breaking Changes'

diff --git a/.github/release-draft-config-n-dev.yml b/.github/release-draft-config-n-dev.yml
@@ -28,7 +28,7 @@ template: |
 
   $CHANGES
 
-  **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
+  **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...dev-v$RESOLVED_VERSION
 
 categories:
   - title: '⚠️ Breaking Changes'

diff --git a/.github/release-draft-config-n.yml b/.github/release-draft-config-n.yml
@@ -29,7 +29,7 @@ template: |
 
   $CHANGES
 
-  **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
+  **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...dev-v$RESOLVED_VERSION
 
 categories:
   - title: '⚠️ Breaking Changes'

diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml
@@ -29,5 +29,5 @@ jobs:
 
     if: |
       github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'uefibot'
-    uses: microsoft/mu_devops/.github/workflows/AutoApprover.yml@v12.2.0
+    uses: microsoft/mu_devops/.github/workflows/AutoApprover.yml@v12.4.0
     secrets: inherit
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -32,5 +32,5 @@ jobs:
 
     if: |
       github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'uefibot'
-    uses: microsoft/mu_devops/.github/workflows/AutoMerger.yml@v12.2.0
+    uses: microsoft/mu_devops/.github/workflows/AutoMerger.yml@v12.4.0
     secrets: inherit
diff --git a/.github/workflows/issue-assignment.yml b/.github/workflows/issue-assignment.yml
@@ -23,4 +23,4 @@ jobs:
       contents: read
       issues: write
 
-    uses: microsoft/mu_devops/.github/workflows/IssueAssignment.yml@v12.2.0
+    uses: microsoft/mu_devops/.github/workflows/IssueAssignment.yml@v12.4.0
diff --git a/.github/workflows/label-issues.yml b/.github/workflows/label-issues.yml
@@ -36,4 +36,4 @@ jobs:
       contents: read
       pull-requests: write
 
-    uses: microsoft/mu_devops/.github/workflows/Labeler.yml@v12.2.0
+    uses: microsoft/mu_devops/.github/workflows/Labeler.yml@v12.4.0
diff --git a/.github/workflows/label-sync.yml b/.github/workflows/label-sync.yml
@@ -28,4 +28,4 @@ jobs:
     permissions:
       issues: write
 
-    uses: microsoft/mu_devops/.github/workflows/LabelSyncer.yml@v12.2.0
+    uses: microsoft/mu_devops/.github/workflows/LabelSyncer.yml@v12.4.0
diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml
@@ -21,19 +21,19 @@
 name: Update Release Draft
 
 on:
-  push:
-    branches:
-      - dev/202405
+  workflow_run:
+    workflows: ["Backport Commits to Release Branch"]
+    branches: [dev/202405]
+    types:
+      - completed
 
 jobs:
-  dev_draft:
+  draft:
     name: Draft Releases
 
     permissions:
       contents: write
       pull-requests: write
 
-    # The "release_drafter_update_for_release_branches" branch is temporarily being used to test release
-    # drafter changes on that branch in Mu Basecore before merging them into the main branch.
-    uses: microsoft/mu_devops/.github/workflows/ReleaseDrafter.yml@release_drafter_update_for_release_branches
+    uses: microsoft/mu_devops/.github/workflows/[email protected]
     secrets: inherit
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -29,4 +29,4 @@ jobs:
       issues: write
       pull-requests: write
 
-    uses: microsoft/mu_devops/.github/workflows/Stale.yml@v12.2.0
+    uses: microsoft/mu_devops/.github/workflows/Stale.yml@v12.4.0
diff --git a/.github/workflows/triage-issues.yml b/.github/workflows/triage-issues.yml
@@ -23,4 +23,4 @@ jobs:
     permissions:
       issues: write
 
-    uses: microsoft/mu_devops/.github/workflows/IssueTriager.yml@v12.2.0
+    uses: microsoft/mu_devops/.github/workflows/IssueTriager.yml@v12.4.0
diff --git a/BaseTools/Edk2ToolsBuild.py b/BaseTools/Edk2ToolsBuild.py
@@ -190,6 +190,10 @@ def Go(self):
                 shell_env.insert_path(shell_env.get_shell_var("EDK_TOOLS_BIN"))
 
             # Actually build the tools.
+            # MU_CHANGE [BEGIN] - Run nmake clean for GenStm
+            ret = RunCmd('nmake.exe', 'clean',
+                        workingdir=shell_env.get_shell_var("EDK_TOOLS_PATH"))
+            # MU_CHANGE [END] - Run nmake clean for GenStm
             output_stream = edk2_logging.create_output_stream()
             ret = RunCmd('nmake.exe', None,
                          workingdir=shell_env.get_shell_var("EDK_TOOLS_PATH"))

diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile
@@ -48,6 +48,7 @@ include Makefiles/header.makefile
 all: makerootdir subdirs
 	@echo Finished building BaseTools C Tools with HOST_ARCH=$(HOST_ARCH)
 
+# MU_CHANGE [BEGIN] - Add the GenStm application
 LIBRARIES = Common
 VFRAUTOGEN = VfrCompile/VfrLexer.h
 APPLICATIONS = \
@@ -62,7 +63,9 @@ APPLICATIONS = \
   LzmaCompress \
   TianoCompress \
   VolInfo \
-  DevicePath
+  DevicePath \
+  GenStm
+# MU_CHANGE [END] - Add the GenStm application
 
 SUBDIRS := $(LIBRARIES) $(APPLICATIONS)
 

diff --git a/BaseTools/Source/C/GenStm/GNUmakefile b/BaseTools/Source/C/GenStm/GNUmakefile
@@ -0,0 +1,18 @@
+## @file
+# GNU/Linux makefile for 'GenStm' module build.
+#
+# Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>
+# SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+# MU_CHANGE [WHOLE FILE] - Add the GenStm application
+#
+#
+MAKEROOT ?= ..
+
+APPNAME = GenStm
+
+LIBS = -lCommon
+
+OBJECTS = GenStm.o
+
+include $(MAKEROOT)/Makefiles/app.makefile