Fixes #505: Changes to take the latest edk2

- Currently taking to stable edk2 commit 836942fbadb629050b866a8052e6af755bcdf623 Signed-off-by: Sujana M <[email protected]>
ARM-software · Nov 5, 2024 · 9eee7a1 · 9eee7a1
1 parent 065abdb
commit 9eee7a1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/sbsa-acs_build_check.yml b/.github/workflows/sbsa-acs_build_check.yml
@@ -20,7 +20,10 @@ jobs:
 
       - name: Download edk2 and its submodules
         run: |
-          git clone --recursive --branch edk2-stable202402 https://github.com/tianocore/edk2
+          git clone --recursive https://github.com/tianocore/edk2
+          cd edk2
+          git checkout 836942fbadb629050b866a8052e6af755bcdf623
+          cd ..
           git clone https://github.com/tianocore/edk2-libc edk2/edk2-libc
 
       - name: Checkout sbsa-acs repository

diff --git a/.github/workflows/sbsa-acs_daily_build.yml b/.github/workflows/sbsa-acs_daily_build.yml
@@ -16,7 +16,10 @@ jobs:
 
       - name: Download edk2 and its submodules
         run: |
-          git clone --recursive --branch edk2-stable202402 https://github.com/tianocore/edk2
+          git clone --recursive https://github.com/tianocore/edk2
+          cd edk2
+          git checkout 836942fbadb629050b866a8052e6af755bcdf623
+          cd ..
           git clone https://github.com/tianocore/edk2-libc edk2/edk2-libc
 
       - name: Checkout sbsa-acs repository

diff --git a/patches/edk2-sbsa.diff b/patches/edk2-sbsa.diff
@@ -1,17 +1,17 @@
 diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
-index 38fde3dc71..0fc160a75d 100644
+index 5303a68959..a465e1034e 100644
 --- a/ShellPkg/ShellPkg.dsc
 +++ b/ShellPkg/ShellPkg.dsc
-@@ -63,6 +63,8 @@
+@@ -64,6 +64,8 @@
    DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf
    DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf
    ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf
 +  SbsaValLib|ShellPkg/Application/bsa-acs/val/SbsaValLib.inf
 +  SbsaPalLib|ShellPkg/Application/bsa-acs/pal/uefi_acpi/SbsaPalLib.inf
 
- [LibraryClasses.ARM,LibraryClasses.AARCH64]
-   #
-@@ -101,6 +103,7 @@
+   SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf
+
+@@ -97,6 +99,7 @@
    ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf
    ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf
    ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf