Skip to content

Commit

Permalink
version 1.9
Browse files Browse the repository at this point in the history
* Also update edk2_build_drivers.cmd for VS2022
  • Loading branch information
pbatard committed Sep 5, 2022
1 parent 7456b52 commit 3ac43bb
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 10 deletions.
16 changes: 14 additions & 2 deletions .github/workflows/linux_gcc_edk2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ env:
GCC5_ARM_PREFIX: arm-linux-gnueabi-
GCC5_AARCH64_PREFIX: aarch64-linux-gnu-
GCC5_RISCV64_PREFIX: riscv64-linux-gnu-
NASM_VERSION: 2.15.05

jobs:
build:
Expand All @@ -41,10 +42,10 @@ jobs:
include:
- arch: X64
short: x64
pkgs: python3-distutils nasm uuid-dev
pkgs: python3-distutils uuid-dev
- arch: IA32
short: ia32
pkgs: gcc-multilib python3-distutils nasm uuid-dev
pkgs: gcc-multilib python3-distutils uuid-dev
- arch: AARCH64
short: aa64
pkgs: gcc-aarch64-linux-gnu python3-distutils uuid-dev
Expand All @@ -58,6 +59,17 @@ jobs:
steps:
- name: Install toolchain
run: sudo apt install ${{ matrix.pkgs }}
- name: Install nasm ${{ env.NASM_VERSION }}
# https://edk2.groups.io/g/devel/topic/89637409#87359
if: matrix.arch == 'X64' || matrix.arch == 'IA32'
run: |
curl -O https://www.nasm.us/pub/nasm/releasebuilds/${{ env.NASM_VERSION }}/nasm-${{ env.NASM_VERSION }}.tar.bz2
tar -xjf nasm-${{ env.NASM_VERSION }}.tar.bz2
cd nasm-${{ env.NASM_VERSION }}
./autogen.sh
./configure --prefix=/usr/local/
make
sudo make install
- name: Fix missing Risc-V header
if: matrix.arch == 'riscv64'
run: sudo ln -s /usr/riscv64-linux-gnu/include/gnu/stubs-lp64d.h /usr/riscv64-linux-gnu/include/gnu/stubs-lp64.h
Expand Down
10 changes: 10 additions & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
For detailed information about the changes below, please see the git log or
visit: https://github.com/pbatard/efifs

v1.9 (2022.09.05)
* Work around Linux kernel's EFI stub not properly handling EFI_BUFFER_TOO_SMALL on GetInfo
* Update solution for VS2022
* Update GRUB and gnu-efi to latest

v1.8 (2021.08.20)
* Add RISCV64 compilation support
* Support SetPosition value 0xFFFFFFFFFFFFFFFF meaning SEEK_END
* Update GRUB and gnu-efi to latest

v1.7 (2020.11.18)
* Fix potential freezout due to freeing of system resources
* Fix Device Path not being displayed when logging is enabled
Expand Down
17 changes: 9 additions & 8 deletions edk2_build_drivers.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
setlocal enabledelayedexpansion

set EDK2_PATH=D:\edk2
set VS_PATH=C:\Program Files\Microsoft Visual Studio\2022\Community
set EFIFS_PATH=%~dp0
set NASM_PREFIX=%EDK2_PATH%\BaseTools\Bin\Win32\
set BUILD=RELEASE
Expand Down Expand Up @@ -44,8 +45,8 @@ if /I "%1"=="aarch64" goto aarch64

:arm
setlocal
if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsamd64_arm.bat" (
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsamd64_arm.bat"
if exist "%VS_PATH%\VC\Auxiliary\Build\vcvarsamd64_arm.bat" (
call "%VS_PATH%\VC\Auxiliary\Build\vcvarsamd64_arm.bat"
call edksetup.bat reconfig
call EfiFsPkg\set_grub_cpu.cmd ARM
call build -a ARM -b %BUILD% -t VS2019 -p EfiFsPkg/EfiFsPkg.dsc
Expand All @@ -55,8 +56,8 @@ if not "%1"=="" goto out

:aarch64
setlocal
if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" (
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
if exist "%VS_PATH%\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" (
call "%VS_PATH%\VC\Auxiliary\Build\vcvarsamd64_arm64.bat"
call edksetup.bat reconfig
call EfiFsPkg\set_grub_cpu.cmd AARCH64
call build -a AARCH64 -b %BUILD% -t VS2019 -p EfiFsPkg/EfiFsPkg.dsc
Expand All @@ -66,8 +67,8 @@ if not "%1"=="" goto out

:ia32
setlocal
if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat" (
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat"
if exist "%VS_PATH%\VC\Auxiliary\Build\vcvars32.bat" (
call "%VS_PATH%\VC\Auxiliary\Build\vcvars32.bat"
call edksetup.bat reconfig
call EfiFsPkg\set_grub_cpu.cmd IA32
call build -a IA32 -b %BUILD% -t VS2019 -p EfiFsPkg/EfiFsPkg.dsc
Expand All @@ -77,8 +78,8 @@ if not "%1"=="" goto out

:x64
setlocal
if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" (
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
if exist "%VS_PATH%\VC\Auxiliary\Build\vcvars64.bat" (
call "%VS_PATH%\VC\Auxiliary\Build\vcvars64.bat"
call edksetup.bat reconfig
call EfiFsPkg\set_grub_cpu.cmd X64
call build -a X64 -b %BUILD% -t VS2019 -p EfiFsPkg/EfiFsPkg.dsc
Expand Down

0 comments on commit 3ac43bb

Please sign in to comment.