rpms/edk2
5
0
Fork 0
Code Issues Pull Requests Releases Activity

update build script and configs

Browse Source
This commit is contained in:
Gerd Hoffmann 2023-01-06 13:05:30 +01:00
parent 9a31e1adf0
commit 139b9bbb03
3 changed files with 83 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
edk2-build.fedora
View File

@ -36,6 +36,14 @@ DEBUG_PRINT_ERROR_LEVEL = 0x8040004F
DEBUG_PRINT_ERROR_LEVEL = 0x80000000 DEBUG_PRINT_ERROR_LEVEL = 0x80000000
[pcds.nx.strict]
PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD5
[pcds.nx.broken.grub]
# grub.efi uses EfiLoaderData for code
PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD1
##################################################################### #####################################################################
# stateful ovmf builds (with vars in flash) # stateful ovmf builds (with vars in flash)
@ -43,7 +51,8 @@ DEBUG_PRINT_ERROR_LEVEL = 0x80000000
desc = ovmf build (64-bit, 2MB) desc = ovmf build (64-bit, 2MB)
conf = OvmfPkg/OvmfPkgX64.dsc conf = OvmfPkg/OvmfPkgX64.dsc
arch = X64 arch = X64
opts = ovmf.common ovmf.2m opts = ovmf.common
ovmf.2m
plat = OvmfX64 plat = OvmfX64
dest = Fedora/ovmf dest = Fedora/ovmf
cpy1 = FV/OVMF_CODE.fd cpy1 = FV/OVMF_CODE.fd
@ -54,7 +63,8 @@ cpy3 = X64/Shell.efi
desc = ovmf build (64-bit, 4MB) desc = ovmf build (64-bit, 4MB)
conf = OvmfPkg/OvmfPkgX64.dsc conf = OvmfPkg/OvmfPkgX64.dsc
arch = X64 arch = X64
opts = ovmf.common ovmf.4m opts = ovmf.common
ovmf.4m
plat = OvmfX64 plat = OvmfX64
dest = Fedora/ovmf-4m dest = Fedora/ovmf-4m
cpy1 = FV/OVMF_CODE.fd cpy1 = FV/OVMF_CODE.fd
@ -64,7 +74,9 @@ cpy2 = FV/OVMF_VARS.fd
desc = ovmf build (32/64-bit, 2MB, q35 only, needs smm, secure boot) desc = ovmf build (32/64-bit, 2MB, q35 only, needs smm, secure boot)
conf = OvmfPkg/OvmfPkgIa32X64.dsc conf = OvmfPkg/OvmfPkgIa32X64.dsc
arch = IA32 X64 arch = IA32 X64
opts = ovmf.common ovmf.2m ovmf.sb.smm opts = ovmf.common
ovmf.2m
ovmf.sb.smm
plat = Ovmf3264 plat = Ovmf3264
dest = Fedora/ovmf dest = Fedora/ovmf
cpy1 = FV/OVMF_CODE.fd OVMF_CODE.secboot.fd cpy1 = FV/OVMF_CODE.fd OVMF_CODE.secboot.fd
@ -74,7 +86,9 @@ cpy2 = X64/EnrollDefaultKeys.efi
desc = ovmf build (32/64-bit, 4MB, q35 only, needs smm, secure boot) desc = ovmf build (32/64-bit, 4MB, q35 only, needs smm, secure boot)
conf = OvmfPkg/OvmfPkgIa32X64.dsc conf = OvmfPkg/OvmfPkgIa32X64.dsc
arch = IA32 X64 arch = IA32 X64
opts = ovmf.common ovmf.4m ovmf.sb.smm opts = ovmf.common
ovmf.4m
ovmf.sb.smm
plat = Ovmf3264 plat = Ovmf3264
dest = Fedora/ovmf-4m dest = Fedora/ovmf-4m
cpy1 = FV/OVMF_CODE.fd OVMF_CODE.secboot.fd cpy1 = FV/OVMF_CODE.fd OVMF_CODE.secboot.fd
@ -87,7 +101,8 @@ cpy1 = FV/OVMF_CODE.fd OVMF_CODE.secboot.fd
desc = ovmf build for qemu microvm (2MB) desc = ovmf build for qemu microvm (2MB)
conf = OvmfPkg/Microvm/MicrovmX64.dsc conf = OvmfPkg/Microvm/MicrovmX64.dsc
arch = X64 arch = X64
opts = ovmf.common ovmf.2m opts = ovmf.common
ovmf.2m
plat = MicrovmX64 plat = MicrovmX64
dest = Fedora/ovmf dest = Fedora/ovmf
cpy1 = FV/MICROVM.fd cpy1 = FV/MICROVM.fd
@ -96,7 +111,8 @@ cpy1 = FV/MICROVM.fd
desc = ovmf build for AmdSev (2MB) desc = ovmf build for AmdSev (2MB)
conf = OvmfPkg/AmdSev/AmdSevX64.dsc conf = OvmfPkg/AmdSev/AmdSevX64.dsc
arch = X64 arch = X64
opts = ovmf.common ovmf.2m opts = ovmf.common
ovmf.2m
plat = AmdSev plat = AmdSev
dest = Fedora/ovmf dest = Fedora/ovmf
cpy1 = FV/OVMF.fd OVMF.amdsev.fd cpy1 = FV/OVMF.fd OVMF.amdsev.fd
@ -118,7 +134,9 @@ cpy1 = FV/OVMF.fd OVMF.inteltdx.fd
desc = ArmVirt build for qemu, 64-bit (arm v8), verbose desc = ArmVirt build for qemu, 64-bit (arm v8), verbose
conf = ArmVirtPkg/ArmVirtQemu.dsc conf = ArmVirtPkg/ArmVirtQemu.dsc
arch = AARCH64 arch = AARCH64
opts = ovmf.common armvirt.verbose opts = ovmf.common
armvirt.verbose
pcds = nx.broken.grub
plat = ArmVirtQemu-AARCH64 plat = ArmVirtQemu-AARCH64
dest = Fedora/aarch64 dest = Fedora/aarch64
cpy1 = FV/QEMU_EFI.fd cpy1 = FV/QEMU_EFI.fd
@ -132,7 +150,9 @@ pad4 = vars-template-pflash.raw 64m
desc = ArmVirt build for qemu, 64-bit (arm v8), silent desc = ArmVirt build for qemu, 64-bit (arm v8), silent
conf = ArmVirtPkg/ArmVirtQemu.dsc conf = ArmVirtPkg/ArmVirtQemu.dsc
arch = AARCH64 arch = AARCH64
opts = ovmf.common armvirt.silent opts = ovmf.common
armvirt.silent
pcds = nx.broken.grub
plat = ArmVirtQemu-AARCH64 plat = ArmVirtQemu-AARCH64
dest = Fedora/aarch64 dest = Fedora/aarch64
cpy1 = FV/QEMU_EFI.fd QEMU_EFI.silent.fd cpy1 = FV/QEMU_EFI.fd QEMU_EFI.silent.fd
@ -147,7 +167,8 @@ pad2 = QEMU_EFI-silent-pflash.raw 64m
desc = ovmf build (32-bit, 2MB) desc = ovmf build (32-bit, 2MB)
conf = OvmfPkg/OvmfPkgIa32.dsc conf = OvmfPkg/OvmfPkgIa32.dsc
arch = IA32 arch = IA32
opts = ovmf.common ovmf.2m opts = ovmf.common
ovmf.2m
plat = OvmfIa32 plat = OvmfIa32
dest = Fedora/ovmf-ia32 dest = Fedora/ovmf-ia32
cpy1 = FV/OVMF_CODE.fd cpy1 = FV/OVMF_CODE.fd
@ -158,7 +179,9 @@ cpy3 = IA32/Shell.efi
desc = ovmf build (32-bit, 2MB, q35 only, needs smm, secure boot) desc = ovmf build (32-bit, 2MB, q35 only, needs smm, secure boot)
conf = OvmfPkg/OvmfPkgIa32.dsc conf = OvmfPkg/OvmfPkgIa32.dsc
arch = IA32 arch = IA32
opts = ovmf.common ovmf.2m ovmf.sb.smm opts = ovmf.common
ovmf.2m
ovmf.sb.smm
plat = OvmfIa32 plat = OvmfIa32
dest = Fedora/ovmf-ia32 dest = Fedora/ovmf-ia32
cpy1 = FV/OVMF_CODE.fd OVMF_CODE.secboot.fd cpy1 = FV/OVMF_CODE.fd OVMF_CODE.secboot.fd
@ -169,6 +192,7 @@ desc = ArmVirt build for qemu, 32-bit (arm v7)
conf = ArmVirtPkg/ArmVirtQemu.dsc conf = ArmVirtPkg/ArmVirtQemu.dsc
arch = ARM arch = ARM
opts = ovmf.common opts = ovmf.common
pcds = nx.broken.grub
plat = ArmVirtQemu-ARM plat = ArmVirtQemu-ARM
dest = Fedora/arm dest = Fedora/arm
cpy1 = FV/QEMU_EFI.fd cpy1 = FV/QEMU_EFI.fd
@ -186,7 +210,34 @@ pad4 = vars-template-pflash.raw 64m
desc = ovmf build (64-bit, stateless secure boot) desc = ovmf build (64-bit, stateless secure boot)
conf = OvmfPkg/OvmfPkgX64.dsc conf = OvmfPkg/OvmfPkgX64.dsc
arch = X64 arch = X64
opts = ovmf.common ovmf.4m ovmf.sb.stateless opts = ovmf.common
ovmf.4m
ovmf.sb.stateless
plat = OvmfX64 plat = OvmfX64
dest = Fedora/experimental dest = Fedora/experimental
cpy1 = FV/OVMF.fd OVMF.stateless.fd cpy1 = FV/OVMF.fd OVMF.stateless.fd
[build.ovmf.strict.nx]
desc = ovmf build (32/64-bit, 4MB, q35 only, needs smm, secure boot, strict nx)
conf = OvmfPkg/OvmfPkgIa32X64.dsc
arch = IA32 X64
opts = ovmf.common
ovmf.4m
ovmf.sb.smm
pcds = nx.strict
plat = Ovmf3264
dest = Fedora/experimental
cpy1 = FV/OVMF_CODE.fd OVMF_CODE.4m.secboot.strictnx.fd
[build.armvirt.aa64.strict.nx]
desc = ArmVirt build for qemu, 64-bit (arm v8), verbose
conf = ArmVirtPkg/ArmVirtQemu.dsc
arch = AARCH64
opts = ovmf.common
armvirt.verbose
pcds = nx.strict
plat = ArmVirtQemu-AARCH64
dest = Fedora/experimental
cpy1 = FV/QEMU_EFI.fd QEMU_EFI.strictnx.fd
cpy3 = FV/QEMU_EFI.fd QEMU_EFI-strictnx-pflash.raw
pad3 = QEMU_EFI-strictnx-pflash.raw 64m

16
edk2-build.py
View File

@ -51,13 +51,8 @@ def get_version(cfg):
return version return version
if os.path.exists(coredir + '/.git'): if os.path.exists(coredir + '/.git'):
cmdline = [ 'git', 'describe', '--tags', '--abbrev=8', '--match=edk2-stable*' ] cmdline = [ 'git', 'describe', '--tags', '--abbrev=8', '--match=edk2-stable*' ]
result = subprocess.run(cmdline, capture_output = True, cwd = coredir) result = subprocess.run(cmdline, stdout = subprocess.PIPE, cwd = coredir)
version = result.stdout.decode().strip() version = result.stdout.decode().strip()
#cmdline = [ 'git', 'branch', '--show-current']
#result = subprocess.run(cmdline, capture_output = True, cwd = coredir)
#branch = result.stdout.decode().strip()
#if branch != "master":
# version += f' ({branch})'
print('') print('')
print(f'### version [git]: {version}') print(f'### version [git]: {version}')
return version return version
@ -136,7 +131,12 @@ def build_one(cfg, build, jobs = None):
for name in cfg[build]['opts'].split(): for name in cfg[build]['opts'].split():
section = 'opts.' + name section = 'opts.' + name
for opt in cfg[section]: for opt in cfg[section]:
cmdline += [ '-D', opt.upper() + '=' + cfg[section][opt] ] cmdline += [ '-D', opt + '=' + cfg[section][opt] ]
if 'pcds' in cfg[build]:
for name in cfg[build]['pcds'].split():
section = 'pcds.' + name
for pcd in cfg[section]:
cmdline += [ '--pcd', pcd + '=' + cfg[section][pcd] ]
if 'tgts' in cfg[build]: if 'tgts' in cfg[build]:
tgts = cfg[build]['tgts'].split() tgts = cfg[build]['tgts'].split()
else: else:
@ -246,6 +246,7 @@ def main():
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
cfg = configparser.ConfigParser() cfg = configparser.ConfigParser()
cfg.optionxform = str
cfg.read(options.configfile) cfg.read(options.configfile)
if options.list: if options.list:
@ -257,6 +258,7 @@ def main():
if options.core: if options.core:
cfg.set('global', 'core', options.core) cfg.set('global', 'core', options.core)
global version_override
check_rebase() check_rebase()
if options.version_override: if options.version_override:
version_override = options.version_override version_override = options.version_override

18
edk2-build.rhel-9
View File

@ -34,7 +34,8 @@ DEBUG_PRINT_ERROR_LEVEL = 0x80000000
desc = ovmf build (64-bit, 4MB) desc = ovmf build (64-bit, 4MB)
conf = OvmfPkg/OvmfPkgX64.dsc conf = OvmfPkg/OvmfPkgX64.dsc
arch = X64 arch = X64
opts = ovmf.common ovmf.4m opts = ovmf.common
ovmf.4m
plat = OvmfX64 plat = OvmfX64
dest = RHEL-9/ovmf dest = RHEL-9/ovmf
cpy1 = FV/OVMF_CODE.fd OVMF_CODE.fd cpy1 = FV/OVMF_CODE.fd OVMF_CODE.fd
@ -45,7 +46,8 @@ cpy3 = X64/Shell.efi
desc = ovmf build (32/64-bit, 4MB, q35 only, needs smm, secure boot) desc = ovmf build (32/64-bit, 4MB, q35 only, needs smm, secure boot)
conf = OvmfPkg/OvmfPkgIa32X64.dsc conf = OvmfPkg/OvmfPkgIa32X64.dsc
arch = IA32 X64 arch = IA32 X64
opts = ovmf.common ovmf.4m ovmf.sb.smm opts = ovmf.common ovmf.4m
ovmf.sb.smm
plat = Ovmf3264 plat = Ovmf3264
dest = RHEL-9/ovmf dest = RHEL-9/ovmf
cpy1 = FV/OVMF_CODE.fd OVMF_CODE.secboot.fd cpy1 = FV/OVMF_CODE.fd OVMF_CODE.secboot.fd
@ -59,7 +61,8 @@ cpy2 = X64/EnrollDefaultKeys.efi
desc = ovmf build for AmdSev (4MB) desc = ovmf build for AmdSev (4MB)
conf = OvmfPkg/AmdSev/AmdSevX64.dsc conf = OvmfPkg/AmdSev/AmdSevX64.dsc
arch = X64 arch = X64
opts = ovmf.common ovmf.4m opts = ovmf.common
ovmf.4m
plat = AmdSev plat = AmdSev
dest = RHEL-9/ovmf dest = RHEL-9/ovmf
cpy1 = FV/OVMF.fd OVMF.amdsev.fd cpy1 = FV/OVMF.fd OVMF.amdsev.fd
@ -68,7 +71,8 @@ cpy1 = FV/OVMF.fd OVMF.amdsev.fd
desc = ovmf build for IntelTdx (4MB) desc = ovmf build for IntelTdx (4MB)
conf = OvmfPkg/IntelTdx/IntelTdxX64.dsc conf = OvmfPkg/IntelTdx/IntelTdxX64.dsc
arch = X64 arch = X64
opts = ovmf.common ovmf.4m opts = ovmf.common
ovmf.4m
plat = IntelTdx plat = IntelTdx
dest = RHEL-9/ovmf dest = RHEL-9/ovmf
cpy1 = FV/OVMF.fd OVMF.inteltdx.fd cpy1 = FV/OVMF.fd OVMF.inteltdx.fd
@ -81,7 +85,8 @@ cpy1 = FV/OVMF.fd OVMF.inteltdx.fd
desc = ArmVirt build for qemu, 64-bit (arm v8), verbose desc = ArmVirt build for qemu, 64-bit (arm v8), verbose
conf = ArmVirtPkg/ArmVirtQemu.dsc conf = ArmVirtPkg/ArmVirtQemu.dsc
arch = AARCH64 arch = AARCH64
opts = ovmf.common armvirt.verbose opts = ovmf.common
armvirt.verbose
plat = ArmVirtQemu-AARCH64 plat = ArmVirtQemu-AARCH64
dest = RHEL-9/aarch64 dest = RHEL-9/aarch64
cpy1 = FV/QEMU_EFI.fd cpy1 = FV/QEMU_EFI.fd
@ -95,7 +100,8 @@ pad4 = vars-template-pflash.raw 64m
desc = ArmVirt build for qemu, 64-bit (arm v8), silent desc = ArmVirt build for qemu, 64-bit (arm v8), silent
conf = ArmVirtPkg/ArmVirtQemu.dsc conf = ArmVirtPkg/ArmVirtQemu.dsc
arch = AARCH64 arch = AARCH64
opts = ovmf.common armvirt.silent opts = ovmf.common
armvirt.silent
plat = ArmVirtQemu-AARCH64 plat = ArmVirtQemu-AARCH64
dest = RHEL-9/aarch64 dest = RHEL-9/aarch64
cpy1 = FV/QEMU_EFI.fd QEMU_EFI.silent.fd cpy1 = FV/QEMU_EFI.fd QEMU_EFI.silent.fd