bump edk2 version to edk2-stable202411 for CI jobs (#441)

* Use edk2-stable202411 for CI jobs * correct name of patch file * correct drtm build patch name * minor correction --------- Co-authored-by: cherat01 <[email protected]>
ARM-software · Feb 28, 2025 · 351ece0 · 351ece0
1 parent 6a20e83
commit 351ece0
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 69 deletions.
diff --git a/.github/workflows/bsa-acs_build_check.yml b/.github/workflows/bsa-acs_build_check.yml
@@ -22,7 +22,7 @@ jobs:
         run: |
           git clone --recursive https://github.com/tianocore/edk2
           cd edk2
-          git checkout 836942fbadb629050b866a8052e6af755bcdf623
+          git checkout edk2-stable202411
           cd ..
           git clone https://github.com/tianocore/edk2-libc edk2/edk2-libc
 
@@ -34,7 +34,7 @@ jobs:
       - name: Apply edk2 BSA patch for ACPI target
         run: |
           cd edk2
-          git apply ShellPkg/Application/bsa-acs/patches/edk2-202208-bsa-acpi.diff
+          git apply ShellPkg/Application/bsa-acs/patches/edk2_bsa_acpi.patch
 
       - name: Download Arm GCC cross-compiler
         run: |
@@ -70,7 +70,7 @@ jobs:
         run: |
           git clone --recursive https://github.com/tianocore/edk2
           cd edk2
-          git checkout 836942fbadb629050b866a8052e6af755bcdf623
+          git checkout edk2-stable202411
           cd ..
           git clone https://github.com/tianocore/edk2-libc edk2/edk2-libc
 
@@ -82,7 +82,7 @@ jobs:
       - name: Apply edk2 DRTM patch for ACPI target
         run: |
           cd edk2
-          git apply ShellPkg/Application/bsa-acs/patches/edk2-202208-drtm-acpi.diff
+          git apply ShellPkg/Application/bsa-acs/patches/edk2_drtm.patch
 
       - name: Download Arm GCC cross-compiler
         run: |
@@ -118,7 +118,7 @@ jobs:
         run: |
           git clone --recursive https://github.com/tianocore/edk2
           cd edk2
-          git checkout 836942fbadb629050b866a8052e6af755bcdf623
+          git checkout edk2-stable202411
           cd ..
           git clone https://github.com/tianocore/edk2-libc edk2/edk2-libc
 
@@ -135,7 +135,7 @@ jobs:
       - name: Apply edk2 sbsa patch
         run: |
           cd edk2
-          git apply ShellPkg/Application/sbsa-acs/patches/edk2-sbsa.diff
+          git apply ShellPkg/Application/sbsa-acs/patches/edk2_sbsa.patch
 
       - name: Download Arm GCC cross-compiler
         run: |
@@ -172,7 +172,7 @@ jobs:
         run: |
           git clone --recursive https://github.com/tianocore/edk2
           cd edk2
-          git checkout 836942fbadb629050b866a8052e6af755bcdf623
+          git checkout edk2-stable202411
           cd ..
           git clone https://github.com/tianocore/edk2-libc edk2/edk2-libc
 
@@ -184,7 +184,7 @@ jobs:
       - name: Apply edk2 BSA patch for DT target
         run: |
           cd edk2
-          git apply ShellPkg/Application/bsa-acs/patches/edk2-202208-bsa-dt.diff
+          git apply ShellPkg/Application/bsa-acs/patches/edk2_bsa_dt.patch
 
       - name: Download Arm GCC cross-compiler
         run: |

diff --git a/.github/workflows/bsa-acs_daily_build.yml b/.github/workflows/bsa-acs_daily_build.yml
@@ -18,7 +18,7 @@ jobs:
         run: |
           git clone --recursive https://github.com/tianocore/edk2
           cd edk2
-          git checkout 836942fbadb629050b866a8052e6af755bcdf623
+          git checkout edk2-stable202411
           cd ..
           git clone https://github.com/tianocore/edk2-libc edk2/edk2-libc
 
@@ -30,7 +30,7 @@ jobs:
       - name: Apply edk2 BSA patch for ACPI target
         run: |
           cd edk2
-          git apply ShellPkg/Application/bsa-acs/patches/edk2-202208-bsa-acpi.diff
+          git apply ShellPkg/Application/bsa-acs/patches/edk2_bsa_acpi.patch
 
       - name: Download Arm GCC cross-compiler
         run: |
@@ -66,7 +66,7 @@ jobs:
         run: |
           git clone --recursive https://github.com/tianocore/edk2
           cd edk2
-          git checkout 836942fbadb629050b866a8052e6af755bcdf623
+          git checkout edk2-stable202411
           cd ..
           git clone https://github.com/tianocore/edk2-libc edk2/edk2-libc
 
@@ -78,7 +78,7 @@ jobs:
       - name: Apply edk2 BSA patch for DT target
         run: |
           cd edk2
-          git apply ShellPkg/Application/bsa-acs/patches/edk2-202208-bsa-dt.diff
+          git apply ShellPkg/Application/bsa-acs/patches/edk2_bsa_dt.patch
 
       - name: Download Arm GCC cross-compiler
         run: |

diff --git a/patches/edk2-202208-bsa-acpi.diff b/patches/edk2-202208-bsa-acpi.diff
diff --git a/patches/edk2-202208-drtm-acpi.diff b/patches/edk2-202208-drtm-acpi.diff
diff --git a/patches/edk2_bsa_acpi.patch b/patches/edk2_bsa_acpi.patch
@@ -0,0 +1,21 @@
+diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
+index 7e985f8..3c66d1a 100644
+--- a/ShellPkg/ShellPkg.dsc
++++ b/ShellPkg/ShellPkg.dsc
+@@ -66,6 +66,8 @@
+   ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
+
+   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
++  BsaValLib|ShellPkg/Application/bsa-acs/val/BsaValLib.inf
++  BsaPalLib|ShellPkg/Application/bsa-acs/pal/uefi_acpi/BsaPalLib.inf
+
+ [PcdsFixedAtBuild]
+   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF
+@@ -93,6 +95,7 @@
+   ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+   ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+   ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
++  ShellPkg/Application/bsa-acs/uefi_app/BsaAcs.inf
+
+   ShellPkg/Application/Shell/Shell.inf {
+     <PcdsFixedAtBuild>
diff --git a/patches/edk2-202208-bsa-dt.diff → patches/edk2_bsa_dt.patch b/patches/edk2-202208-bsa-dt.diff → patches/edk2_bsa_dt.patch
@@ -1,5 +1,5 @@
 diff --git a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c b/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c
-index f0a8b9fe62..e41e0de3e0 100644
+index f0a8b9f..e41e0de 100644
 --- a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c
 +++ b/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.c
 @@ -90,8 +90,8 @@ UefiHiiServicesLibConstructor (
@@ -14,24 +14,24 @@ index f0a8b9fe62..e41e0de3e0 100644
    //
    // Retrieve the pointer to the optional UEFI HII Font Protocol
 diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
-index 38fde3dc71..559c2217d3 100644
+index 7e985f8..6ea22f8 100644
 --- a/ShellPkg/ShellPkg.dsc
 +++ b/ShellPkg/ShellPkg.dsc
-@@ -22,6 +22,9 @@
- !include MdePkg/MdeLibs.dsc.inc
+@@ -66,6 +66,9 @@
+   ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
 
- [LibraryClasses.common]
+   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
 +  FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf
 +  BsaValLib|ShellPkg/Application/bsa-acs/val/BsaValLib.inf
 +  BsaPalLib|ShellPkg/Application/bsa-acs/pal/uefi_dt/BsaPalLib.inf
-   UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
-   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
-   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
-@@ -87,6 +90,7 @@
-   # Build all the libraries when building this package.
-   # This helps developers test changes and how they affect the package.
-   #
+
+ [PcdsFixedAtBuild]
+   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF
+@@ -93,6 +96,7 @@
+   ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+   ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+   ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
 +  ShellPkg/Application/bsa-acs/uefi_app/BsaAcs.inf
-   ShellPkg/Library/UefiShellLib/UefiShellLib.inf
-   ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf
-   ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf
+
+   ShellPkg/Application/Shell/Shell.inf {
+     <PcdsFixedAtBuild>
diff --git a/patches/edk2_drtm.patch b/patches/edk2_drtm.patch
@@ -0,0 +1,21 @@
+diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
+index 7e985f8..237d348 100644
+--- a/ShellPkg/ShellPkg.dsc
++++ b/ShellPkg/ShellPkg.dsc
+@@ -66,6 +66,8 @@
+   ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
+
+   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
++  DrtmValLib|ShellPkg/Application/bsa-acs/val/DrtmValLib.inf
++  DrtmPalLib|ShellPkg/Application/bsa-acs/pal/uefi_acpi/DrtmPalLib.inf
+
+ [PcdsFixedAtBuild]
+   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0xFF
+@@ -93,6 +95,7 @@
+   ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
+   ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
+   ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf
++  ShellPkg/Application/bsa-acs/drtm/uefi_app/DrtmAcs.inf
+
+   ShellPkg/Application/Shell/Shell.inf {
+     <PcdsFixedAtBuild>