Skip to content

Commit 3ac43bb

Browse files
committed
version 1.9
* Also update edk2_build_drivers.cmd for VS2022
1 parent 7456b52 commit 3ac43bb

3 files changed

Lines changed: 33 additions & 10 deletions

File tree

.github/workflows/linux_gcc_edk2.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ env:
3030
GCC5_ARM_PREFIX: arm-linux-gnueabi-
3131
GCC5_AARCH64_PREFIX: aarch64-linux-gnu-
3232
GCC5_RISCV64_PREFIX: riscv64-linux-gnu-
33+
NASM_VERSION: 2.15.05
3334

3435
jobs:
3536
build:
@@ -41,10 +42,10 @@ jobs:
4142
include:
4243
- arch: X64
4344
short: x64
44-
pkgs: python3-distutils nasm uuid-dev
45+
pkgs: python3-distutils uuid-dev
4546
- arch: IA32
4647
short: ia32
47-
pkgs: gcc-multilib python3-distutils nasm uuid-dev
48+
pkgs: gcc-multilib python3-distutils uuid-dev
4849
- arch: AARCH64
4950
short: aa64
5051
pkgs: gcc-aarch64-linux-gnu python3-distutils uuid-dev
@@ -58,6 +59,17 @@ jobs:
5859
steps:
5960
- name: Install toolchain
6061
run: sudo apt install ${{ matrix.pkgs }}
62+
- name: Install nasm ${{ env.NASM_VERSION }}
63+
# https://edk2.groups.io/g/devel/topic/89637409#87359
64+
if: matrix.arch == 'X64' || matrix.arch == 'IA32'
65+
run: |
66+
curl -O https://www.nasm.us/pub/nasm/releasebuilds/${{ env.NASM_VERSION }}/nasm-${{ env.NASM_VERSION }}.tar.bz2
67+
tar -xjf nasm-${{ env.NASM_VERSION }}.tar.bz2
68+
cd nasm-${{ env.NASM_VERSION }}
69+
./autogen.sh
70+
./configure --prefix=/usr/local/
71+
make
72+
sudo make install
6173
- name: Fix missing Risc-V header
6274
if: matrix.arch == 'riscv64'
6375
run: sudo ln -s /usr/riscv64-linux-gnu/include/gnu/stubs-lp64d.h /usr/riscv64-linux-gnu/include/gnu/stubs-lp64.h

ChangeLog.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
For detailed information about the changes below, please see the git log or
22
visit: https://github.com/pbatard/efifs
33

4+
v1.9 (2022.09.05)
5+
* Work around Linux kernel's EFI stub not properly handling EFI_BUFFER_TOO_SMALL on GetInfo
6+
* Update solution for VS2022
7+
* Update GRUB and gnu-efi to latest
8+
9+
v1.8 (2021.08.20)
10+
* Add RISCV64 compilation support
11+
* Support SetPosition value 0xFFFFFFFFFFFFFFFF meaning SEEK_END
12+
* Update GRUB and gnu-efi to latest
13+
414
v1.7 (2020.11.18)
515
* Fix potential freezout due to freeing of system resources
616
* Fix Device Path not being displayed when logging is enabled

edk2_build_drivers.cmd

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
setlocal enabledelayedexpansion
44

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

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

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

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

7879
:x64
7980
setlocal
80-
if exist "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" (
81-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
81+
if exist "%VS_PATH%\VC\Auxiliary\Build\vcvars64.bat" (
82+
call "%VS_PATH%\VC\Auxiliary\Build\vcvars64.bat"
8283
call edksetup.bat reconfig
8384
call EfiFsPkg\set_grub_cpu.cmd X64
8485
call build -a X64 -b %BUILD% -t VS2019 -p EfiFsPkg/EfiFsPkg.dsc

0 commit comments

Comments
 (0)