From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Gerd Hoffmann" <kraxel@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Ani Sinha" <ani@anisinha.ca>,
"Igor Mammedov" <imammedo@redhat.com>
Subject: [PULL 5/6] edk2: replace build scripts
Date: Mon, 20 Mar 2023 10:38:46 +0100 [thread overview]
Message-ID: <20230320093847.539751-6-kraxel@redhat.com> (raw)
In-Reply-To: <20230320093847.539751-1-kraxel@redhat.com>
Remove Makefile.edk2 and the edk2*.sh scripts and replace them
with a python script (which already handles fedora rpm builds)
and a config file for it.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
roms/edk2-build.py | 380 +++++++++++++++++++++++++++++++++++++++++
roms/Makefile | 29 +---
roms/Makefile.edk2 | 178 -------------------
roms/edk2-build.config | 124 ++++++++++++++
roms/edk2-build.sh | 55 ------
roms/edk2-funcs.sh | 273 -----------------------------
6 files changed, 511 insertions(+), 528 deletions(-)
create mode 100755 roms/edk2-build.py
delete mode 100644 roms/Makefile.edk2
create mode 100644 roms/edk2-build.config
delete mode 100755 roms/edk2-build.sh
delete mode 100644 roms/edk2-funcs.sh
diff --git a/roms/edk2-build.py b/roms/edk2-build.py
new file mode 100755
index 000000000000..870893f7c8e3
--- /dev/null
+++ b/roms/edk2-build.py
@@ -0,0 +1,380 @@
+#!/usr/bin/python3
+"""
+build helper script for edk2, see
+https://gitlab.com/kraxel/edk2-build-config
+
+"""
+import os
+import sys
+import shutil
+import argparse
+import subprocess
+import configparser
+
+rebase_prefix = ""
+version_override = None
+release_date = None
+
+# pylint: disable=unused-variable
+def check_rebase():
+ """ detect 'git rebase -x edk2-build.py master' testbuilds """
+ global rebase_prefix
+ global version_override
+ gitdir = '.git'
+
+ if os.path.isfile(gitdir):
+ with open(gitdir, 'r', encoding = 'utf-8') as f:
+ (unused, gitdir) = f.read().split()
+
+ if not os.path.exists(f'{gitdir}/rebase-merge/msgnum'):
+ return
+ with open(f'{gitdir}/rebase-merge/msgnum', 'r', encoding = 'utf-8') as f:
+ msgnum = int(f.read())
+ with open(f'{gitdir}/rebase-merge/end', 'r', encoding = 'utf-8') as f:
+ end = int(f.read())
+ with open(f'{gitdir}/rebase-merge/head-name', 'r', encoding = 'utf-8') as f:
+ head = f.read().strip().split('/')
+
+ rebase_prefix = f'[ {int(msgnum/2)} / {int(end/2)} - {head[-1]} ] '
+ if msgnum != end and not version_override:
+ # fixed version speeds up builds
+ version_override = "test-build-patch-series"
+
+def get_coredir(cfg):
+ if cfg.has_option('global', 'core'):
+ return os.path.abspath(cfg['global']['core'])
+ return os.getcwd()
+
+def get_version(cfg):
+ coredir = get_coredir(cfg)
+ if version_override:
+ version = version_override
+ print('')
+ print(f'### version [override]: {version}')
+ return version
+ if os.environ.get('RPM_PACKAGE_NAME'):
+ version = os.environ.get('RPM_PACKAGE_NAME')
+ version += '-' + os.environ.get('RPM_PACKAGE_VERSION')
+ version += '-' + os.environ.get('RPM_PACKAGE_RELEASE')
+ print('')
+ print(f'### version [rpmbuild]: {version}')
+ return version
+ if os.path.exists(coredir + '/.git'):
+ cmdline = [ 'git', 'describe', '--tags', '--abbrev=8',
+ '--match=edk2-stable*' ]
+ result = subprocess.run(cmdline, cwd = coredir,
+ stdout = subprocess.PIPE,
+ check = True)
+ version = result.stdout.decode().strip()
+ print('')
+ print(f'### version [git]: {version}')
+ return version
+ return None
+
+def pcd_string(name, value):
+ return f'{name}=L{value}\\0'
+
+def pcd_version(cfg):
+ version = get_version(cfg)
+ if version is None:
+ return []
+ return [ '--pcd', pcd_string('PcdFirmwareVersionString', version) ]
+
+def pcd_release_date():
+ if release_date is None:
+ return []
+ return [ '--pcd', pcd_string('PcdFirmwareReleaseDateString', release_date) ]
+
+def build_message(line, line2 = None):
+ if os.environ.get('TERM') in [ 'xterm', 'xterm-256color' ]:
+ # setxterm title
+ start = '\x1b]2;'
+ end = '\x07'
+ print(f'{start}{rebase_prefix}{line}{end}', end = '')
+
+ print('')
+ print('###')
+ print(f'### {rebase_prefix}{line}')
+ if line2:
+ print(f'### {line2}')
+ print('###', flush = True)
+
+def build_run(cmdline, name, section, silent = False):
+ print(cmdline, flush = True)
+ if silent:
+ print('### building in silent mode ...', flush = True)
+ result = subprocess.run(cmdline, check = False,
+ stdout = subprocess.PIPE,
+ stderr = subprocess.STDOUT)
+
+ logfile = f'{section}.log'
+ print(f'### writing log to {logfile} ...')
+ with open(logfile, 'wb') as f:
+ f.write(result.stdout)
+
+ if result.returncode:
+ print('### BUILD FAILURE')
+ print('### output')
+ print(result.stdout.decode())
+ print(f'### exit code: {result.returncode}')
+ else:
+ print('### OK')
+ else:
+ result = subprocess.run(cmdline, check = False)
+ if result.returncode:
+ print(f'ERROR: {cmdline[0]} exited with {result.returncode}'
+ f' while building {name}')
+ sys.exit(result.returncode)
+
+def build_copy(plat, tgt, dstdir, copy):
+ srcdir = f'Build/{plat}/{tgt}_GCC5'
+ names = copy.split()
+ srcfile = names[0]
+ if len(names) > 1:
+ dstfile = names[1]
+ else:
+ dstfile = os.path.basename(srcfile)
+ print(f'# copy: {srcdir} / {srcfile} => {dstdir} / {dstfile}')
+
+ src = srcdir + '/' + srcfile
+ dst = dstdir + '/' + dstfile
+ os.makedirs(os.path.dirname(dst), exist_ok = True)
+ shutil.copy(src, dst)
+
+def pad_file(dstdir, pad):
+ args = pad.split()
+ if len(args) < 2:
+ raise RuntimeError(f'missing arg for pad ({args})')
+ name = args[0]
+ size = args[1]
+ cmdline = [
+ 'truncate',
+ '--size', size,
+ dstdir + '/' + name,
+ ]
+ print(f'# padding: {dstdir} / {name} => {size}')
+ subprocess.run(cmdline, check = True)
+
+# pylint: disable=too-many-branches
+def build_one(cfg, build, jobs = None, silent = False):
+ cmdline = [ 'build' ]
+ cmdline += [ '-t', 'GCC5' ]
+ cmdline += [ '-p', cfg[build]['conf'] ]
+
+ if (cfg[build]['conf'].startswith('OvmfPkg/') or
+ cfg[build]['conf'].startswith('ArmVirtPkg/')):
+ cmdline += pcd_version(cfg)
+ cmdline += pcd_release_date()
+
+ if jobs:
+ cmdline += [ '-n', jobs ]
+ for arch in cfg[build]['arch'].split():
+ cmdline += [ '-a', arch ]
+ if 'opts' in cfg[build]:
+ for name in cfg[build]['opts'].split():
+ section = 'opts.' + name
+ for opt in cfg[section]:
+ 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]:
+ tgts = cfg[build]['tgts'].split()
+ else:
+ tgts = [ 'DEBUG' ]
+ for tgt in tgts:
+ desc = None
+ if 'desc' in cfg[build]:
+ desc = cfg[build]['desc']
+ build_message(f'building: {cfg[build]["conf"]} ({cfg[build]["arch"]}, {tgt})',
+ f'description: {desc}')
+ build_run(cmdline + [ '-b', tgt ],
+ cfg[build]['conf'],
+ build + '.' + tgt,
+ silent)
+
+ if 'plat' in cfg[build]:
+ # copy files
+ for cpy in cfg[build]:
+ if not cpy.startswith('cpy'):
+ continue
+ build_copy(cfg[build]['plat'],
+ tgt,
+ cfg[build]['dest'],
+ cfg[build][cpy])
+ # pad builds
+ for pad in cfg[build]:
+ if not pad.startswith('pad'):
+ continue
+ pad_file(cfg[build]['dest'],
+ cfg[build][pad])
+
+def build_basetools(silent = False):
+ build_message('building: BaseTools')
+ basedir = os.environ['EDK_TOOLS_PATH']
+ cmdline = [ 'make', '-C', basedir ]
+ build_run(cmdline, 'BaseTools', 'build.basetools', silent)
+
+def binary_exists(name):
+ for pdir in os.environ['PATH'].split(':'):
+ if os.path.exists(pdir + '/' + name):
+ return True
+ return False
+
+def prepare_env(cfg):
+ """ mimic Conf/BuildEnv.sh """
+ workspace = os.getcwd()
+ packages = [ workspace, ]
+ path = os.environ['PATH'].split(':')
+ dirs = [
+ 'BaseTools/Bin/Linux-x86_64',
+ 'BaseTools/BinWrappers/PosixLike'
+ ]
+
+ if cfg.has_option('global', 'pkgs'):
+ for pkgdir in cfg['global']['pkgs'].split():
+ packages.append(os.path.abspath(pkgdir))
+ coredir = get_coredir(cfg)
+ if coredir != workspace:
+ packages.append(coredir)
+
+ # add basetools to path
+ for pdir in dirs:
+ p = coredir + '/' + pdir
+ if not os.path.exists(p):
+ continue
+ if p in path:
+ continue
+ path.insert(0, p)
+
+ # run edksetup if needed
+ toolsdef = coredir + '/Conf/tools_def.txt'
+ if not os.path.exists(toolsdef):
+ os.makedirs(os.path.dirname(toolsdef), exist_ok = True)
+ build_message('running BaseTools/BuildEnv')
+ cmdline = [ 'bash', 'BaseTools/BuildEnv' ]
+ subprocess.run(cmdline, cwd = coredir, check = True)
+
+ # set variables
+ os.environ['PATH'] = ':'.join(path)
+ os.environ['PACKAGES_PATH'] = ':'.join(packages)
+ os.environ['WORKSPACE'] = workspace
+ os.environ['EDK_TOOLS_PATH'] = coredir + '/BaseTools'
+ os.environ['CONF_PATH'] = coredir + '/Conf'
+ os.environ['PYTHON_COMMAND'] = '/usr/bin/python3'
+ os.environ['PYTHONHASHSEED'] = '1'
+
+ # for cross builds
+ if binary_exists('arm-linux-gnu-gcc'):
+ os.environ['GCC5_ARM_PREFIX'] = 'arm-linux-gnu-'
+ if binary_exists('loongarch64-linux-gnu-gcc'):
+ os.environ['GCC5_LOONGARCH64_PREFIX'] = 'loongarch64-linux-gnu-'
+
+ hostarch = os.uname().machine
+ if binary_exists('aarch64-linux-gnu-gcc') and hostarch != 'aarch64':
+ os.environ['GCC5_AARCH64_PREFIX'] = 'aarch64-linux-gnu-'
+ if binary_exists('riscv64-linux-gnu-gcc') and hostarch != 'riscv64':
+ os.environ['GCC5_RISCV64_PREFIX'] = 'riscv64-linux-gnu-'
+ if binary_exists('x86_64-linux-gnu-gcc') and hostarch != 'x86_64':
+ os.environ['GCC5_IA32_PREFIX'] = 'x86_64-linux-gnu-'
+ os.environ['GCC5_X64_PREFIX'] = 'x86_64-linux-gnu-'
+ os.environ['GCC5_BIN'] = 'x86_64-linux-gnu-'
+
+def build_list(cfg):
+ for build in cfg.sections():
+ if not build.startswith('build.'):
+ continue
+ name = build.lstrip('build.')
+ desc = 'no description'
+ if 'desc' in cfg[build]:
+ desc = cfg[build]['desc']
+ print(f'# {name:20s} - {desc}')
+
+def main():
+ parser = argparse.ArgumentParser(prog = 'edk2-build',
+ description = 'edk2 build helper script')
+ parser.add_argument('-c', '--config', dest = 'configfile',
+ type = str, default = '.edk2.builds', metavar = 'FILE',
+ help = 'read configuration from FILE (default: .edk2.builds)')
+ parser.add_argument('-C', '--directory', dest = 'directory', type = str,
+ help = 'change to DIR before building', metavar = 'DIR')
+ parser.add_argument('-j', '--jobs', dest = 'jobs', type = str,
+ help = 'allow up to JOBS parallel build jobs',
+ metavar = 'JOBS')
+ parser.add_argument('-m', '--match', dest = 'match', type = str,
+ help = 'only run builds matching INCLUDE (substring)',
+ metavar = 'INCLUDE')
+ parser.add_argument('-x', '--exclude', dest = 'exclude', type = str,
+ help = 'skip builds matching EXCLUDE (substring)',
+ metavar = 'EXCLUDE')
+ parser.add_argument('-l', '--list', dest = 'list',
+ action = 'store_true', default = False,
+ help = 'list build configs available')
+ parser.add_argument('--silent', dest = 'silent',
+ action = 'store_true', default = False,
+ help = 'write build output to logfiles, '
+ 'write to console only on errors')
+ parser.add_argument('--core', dest = 'core', type = str, metavar = 'DIR',
+ help = 'location of the core edk2 repository '
+ '(i.e. where BuildTools are located)')
+ parser.add_argument('--pkg', '--package', dest = 'pkgs',
+ type = str, action = 'append', metavar = 'DIR',
+ help = 'location(s) of additional packages '
+ '(can be specified multiple times)')
+ parser.add_argument('--version-override', dest = 'version_override',
+ type = str, metavar = 'VERSION',
+ help = 'set firmware build version')
+ parser.add_argument('--release-date', dest = 'release_date',
+ type = str, metavar = 'DATE',
+ help = 'set firmware build release date (in MM/DD/YYYY format)')
+ options = parser.parse_args()
+
+ if options.directory:
+ os.chdir(options.directory)
+
+ if not os.path.exists(options.configfile):
+ print('config file "{options.configfile}" not found')
+ return 1
+
+ cfg = configparser.ConfigParser()
+ cfg.optionxform = str
+ cfg.read(options.configfile)
+
+ if options.list:
+ build_list(cfg)
+ return
+
+ if not cfg.has_section('global'):
+ cfg.add_section('global')
+ if options.core:
+ cfg.set('global', 'core', options.core)
+ if options.pkgs:
+ cfg.set('global', 'pkgs', ' '.join(options.pkgs))
+
+ global version_override
+ global release_date
+ check_rebase()
+ if options.version_override:
+ version_override = options.version_override
+ if options.release_date:
+ release_date = options.release_date
+
+ prepare_env(cfg)
+ build_basetools(options.silent)
+ for build in cfg.sections():
+ if not build.startswith('build.'):
+ continue
+ if options.match and options.match not in build:
+ print(f'# skipping "{build}" (not matching "{options.match}")')
+ continue
+ if options.exclude and options.exclude in build:
+ print(f'# skipping "{build}" (matching "{options.exclude}")')
+ continue
+ build_one(cfg, build, options.jobs, options.silent)
+
+ return 0
+
+if __name__ == '__main__':
+ sys.exit(main())
diff --git a/roms/Makefile b/roms/Makefile
index 955f92286de0..6859685290bf 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -126,25 +126,6 @@ build-efi-roms: build-pxe-roms
CROSS_COMPILE=$(x86_64_cross_prefix) \
$(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets))
-# Build scripts can pass compiler/linker flags to the EDK2
-# build tools via the EDK2_BASETOOLS_OPTFLAGS (CFLAGS) and
-# EDK2_BASETOOLS_LDFLAGS (LDFLAGS) environment variables.
-#
-# Example:
-#
-# make -C roms \
-# EDK2_BASETOOLS_OPTFLAGS='...' \
-# EDK2_BASETOOLS_LDFLAGS='...' \
-# efirom
-#
-edk2-basetools:
- cd edk2/BaseTools && git submodule update --init --force \
- Source/C/BrotliCompress/brotli
- $(MAKE) -C edk2/BaseTools \
- PYTHON_COMMAND=$${EDK2_PYTHON_COMMAND:-python3} \
- EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \
- EXTRA_LDFLAGS='$(EDK2_BASETOOLS_LDFLAGS)'
-
slof:
$(MAKE) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu
cp SLOF/boot_rom.bin ../pc-bios/slof.bin
@@ -165,8 +146,12 @@ skiboot:
$(MAKE) -C skiboot CROSS=$(powerpc64_cross_prefix)
cp skiboot/skiboot.lid ../pc-bios/skiboot.lid
-efi: edk2-basetools
- $(MAKE) -f Makefile.edk2
+efi:
+ python3 edk2-build.py --config edk2-build.config \
+ --version-override "edk2-stable202302-for-qemu" \
+ --release-date "03/01/2023"
+ rm -f ../pc-bios/edk2-*.fd.bz2
+ bzip2 --verbose ../pc-bios/edk2-*.fd
opensbi32-generic:
$(MAKE) -C opensbi \
@@ -200,7 +185,7 @@ clean:
rm -rf u-boot/build-e500
$(MAKE) -C u-boot-sam460ex distclean
$(MAKE) -C skiboot clean
- $(MAKE) -f Makefile.edk2 clean
+ rm -rf Build
$(MAKE) -C opensbi clean
$(MAKE) -C qboot clean
$(MAKE) -C vbootrom clean
diff --git a/roms/Makefile.edk2 b/roms/Makefile.edk2
deleted file mode 100644
index 485f2244b159..000000000000
--- a/roms/Makefile.edk2
+++ /dev/null
@@ -1,178 +0,0 @@
-# Makefile for building firmware binaries and variable store templates for a
-# number of virtual platforms in edk2.
-#
-# Copyright (C) 2019 Red Hat, Inc.
-#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License that accompanies this
-# distribution. The full text of the license may be found at
-# <http://opensource.org/licenses/bsd-license.php>.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
-# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-SHELL = /bin/bash
-
-target = RELEASE
-toolchain = $(shell source ./edk2-funcs.sh && qemu_edk2_get_toolchain $(1))
-
-licenses := \
- edk2/License.txt \
- edk2/License-History.txt \
- edk2/OvmfPkg/License.txt \
- edk2/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3/COPYING.txt \
- edk2/CryptoPkg/Library/OpensslLib/openssl/LICENSE
-
-# The "edk2-arm-vars.fd" varstore template is suitable for aarch64 as well.
-# Similarly, the "edk2-i386-vars.fd" varstore template is suitable for x86_64
-# as well, independently of "secure" too.
-flashdevs := \
- aarch64-code \
- arm-code \
- i386-code \
- i386-secure-code \
- x86_64-code \
- x86_64-secure-code \
- x86_64-microvm \
- \
- arm-vars \
- i386-vars
-
-all: $(foreach flashdev,$(flashdevs),../pc-bios/edk2-$(flashdev).fd.bz2) \
- ../pc-bios/edk2-licenses.txt
-
-../pc-bios/edk2-%.fd.bz2: ../pc-bios/edk2-%.fd
- bzip2 -9 -c $< > $@
-
-# When the build completes, we need not keep the uncompressed flash device
-# files.
-.INTERMEDIATE: $(foreach flashdev,$(flashdevs),../pc-bios/edk2-$(flashdev).fd)
-
-# Fetch edk2 submodule's submodules. If it is not in a git tree, assume
-# we're building from a tarball and that they've already been fetched by
-# make-release/tarball scripts.
-submodules:
- if test -e edk2/.git; then \
- cd edk2 && git submodule update --init --force -- \
- ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 \
- BaseTools/Source/C/BrotliCompress/brotli \
- CryptoPkg/Library/OpensslLib/openssl \
- MdeModulePkg/Library/BrotliCustomDecompressLib/brotli \
- ; \
- fi
-
-# See notes on the ".NOTPARALLEL" target and the "+" indicator in
-# "tests/uefi-test-tools/Makefile".
-.NOTPARALLEL:
-
-../pc-bios/edk2-aarch64-code.fd: submodules
- +./edk2-build.sh \
- aarch64 \
- --arch=AARCH64 \
- --platform=ArmVirtPkg/ArmVirtQemu.dsc \
- -D NETWORK_IP6_ENABLE \
- -D NETWORK_HTTP_BOOT_ENABLE \
- -D NETWORK_TLS_ENABLE \
- -D TPM2_ENABLE \
- -D TPM2_CONFIG_ENABLE
- cp edk2/Build/ArmVirtQemu-AARCH64/$(target)_$(call toolchain,aarch64)/FV/QEMU_EFI.fd \
- $@
- truncate --size=64M $@
-
-../pc-bios/edk2-arm-code.fd: submodules
- +./edk2-build.sh \
- arm \
- --arch=ARM \
- --platform=ArmVirtPkg/ArmVirtQemu.dsc \
- -D NETWORK_IP6_ENABLE \
- -D NETWORK_HTTP_BOOT_ENABLE \
- -D NETWORK_TLS_ENABLE \
- -D TPM2_ENABLE \
- -D TPM2_CONFIG_ENABLE
- cp edk2/Build/ArmVirtQemu-ARM/$(target)_$(call toolchain,arm)/FV/QEMU_EFI.fd \
- $@
- truncate --size=64M $@
-
-../pc-bios/edk2-i386-code.fd: submodules
- +./edk2-build.sh \
- i386 \
- --arch=IA32 \
- --platform=OvmfPkg/OvmfPkgIa32.dsc \
- -D NETWORK_IP6_ENABLE \
- -D NETWORK_HTTP_BOOT_ENABLE \
- -D NETWORK_TLS_ENABLE \
- -D TPM_ENABLE \
- -D TPM_CONFIG_ENABLE
- cp edk2/Build/OvmfIa32/$(target)_$(call toolchain,i386)/FV/OVMF_CODE.fd $@
-
-../pc-bios/edk2-i386-secure-code.fd: submodules
- +./edk2-build.sh \
- i386 \
- --arch=IA32 \
- --platform=OvmfPkg/OvmfPkgIa32.dsc \
- -D NETWORK_IP6_ENABLE \
- -D NETWORK_HTTP_BOOT_ENABLE \
- -D NETWORK_TLS_ENABLE \
- -D TPM_ENABLE \
- -D TPM_CONFIG_ENABLE \
- -D SECURE_BOOT_ENABLE \
- -D SMM_REQUIRE
- cp edk2/Build/OvmfIa32/$(target)_$(call toolchain,i386)/FV/OVMF_CODE.fd $@
-
-../pc-bios/edk2-x86_64-code.fd: submodules
- +./edk2-build.sh \
- x86_64 \
- --arch=X64 \
- --platform=OvmfPkg/OvmfPkgX64.dsc \
- -D NETWORK_IP6_ENABLE \
- -D NETWORK_HTTP_BOOT_ENABLE \
- -D NETWORK_TLS_ENABLE \
- -D TPM_ENABLE \
- -D TPM_CONFIG_ENABLE
- cp edk2/Build/OvmfX64/$(target)_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@
-
-../pc-bios/edk2-x86_64-secure-code.fd: submodules
- +./edk2-build.sh \
- x86_64 \
- --arch=IA32 \
- --arch=X64 \
- --platform=OvmfPkg/OvmfPkgIa32X64.dsc \
- -D NETWORK_IP6_ENABLE \
- -D NETWORK_HTTP_BOOT_ENABLE \
- -D NETWORK_TLS_ENABLE \
- -D TPM_ENABLE \
- -D TPM_CONFIG_ENABLE \
- -D SECURE_BOOT_ENABLE \
- -D SMM_REQUIRE
- cp edk2/Build/Ovmf3264/$(target)_$(call toolchain,x86_64)/FV/OVMF_CODE.fd $@
-
-../pc-bios/edk2-x86_64-microvm.fd: submodules
- +./edk2-build.sh \
- x86_64 \
- --arch=X64 \
- --platform=OvmfPkg/Microvm/MicrovmX64.dsc \
- -D NETWORK_IP6_ENABLE \
- -D NETWORK_HTTP_BOOT_ENABLE \
- -D NETWORK_TLS_ENABLE
- cp edk2/Build/MicrovmX64/$(target)_$(call toolchain,x86_64)/FV/MICROVM.fd $@
-
-../pc-bios/edk2-arm-vars.fd: ../pc-bios/edk2-arm-code.fd
- cp edk2/Build/ArmVirtQemu-ARM/$(target)_$(call toolchain,arm)/FV/QEMU_VARS.fd \
- $@
- truncate --size=64M $@
-
-../pc-bios/edk2-i386-vars.fd: ../pc-bios/edk2-i386-code.fd
- cp edk2/Build/OvmfIa32/$(target)_$(call toolchain,i386)/FV/OVMF_VARS.fd $@
-
-# The license file accumulates several individual licenses from under edk2,
-# prefixing each individual license with a header (generated by "tail") that
-# states its pathname.
-../pc-bios/edk2-licenses.txt: submodules
- tail -n $(shell cat $(licenses) | wc -l) $(licenses) > $@
- dos2unix $@
-
-clean:
- rm -rf edk2/Build
- cd edk2/Conf && \
- rm -rf .cache BuildEnv.sh build_rule.txt target.txt \
- tools_def.txt
diff --git a/roms/edk2-build.config b/roms/edk2-build.config
new file mode 100644
index 000000000000..66ef9ffcb91f
--- /dev/null
+++ b/roms/edk2-build.config
@@ -0,0 +1,124 @@
+[global]
+core = edk2
+
+####################################################################################
+# options
+
+[opts.common]
+NETWORK_HTTP_BOOT_ENABLE = TRUE
+NETWORK_IP6_ENABLE = TRUE
+NETWORK_TLS_ENABLE = TRUE
+NETWORK_ISCSI_ENABLE = TRUE
+NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE
+TPM2_ENABLE = TRUE
+TPM2_CONFIG_ENABLE = TRUE
+TPM1_ENABLE = TRUE
+CAVIUM_ERRATUM_27456 = TRUE
+
+[opts.ovmf.sb.smm]
+SECURE_BOOT_ENABLE = TRUE
+SMM_REQUIRE = TRUE
+
+[opts.armvirt.silent]
+DEBUG_PRINT_ERROR_LEVEL = 0x80000000
+
+[pcds.nx.broken.grub]
+# grub.efi uses EfiLoaderData for code
+PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD1
+
+####################################################################################
+# i386
+
+[build.ovmf.i386]
+desc = ovmf build (32-bit)
+conf = OvmfPkg/OvmfPkgIa32.dsc
+arch = IA32
+opts = common
+plat = OvmfIa32
+dest = ../pc-bios
+cpy1 = FV/OVMF_CODE.fd edk2-i386-code.fd
+cpy2 = FV/OVMF_VARS.fd edk2-i386-vars.fd
+
+[build.ovmf.i386.secure]
+desc = ovmf build (32-bit, secure boot)
+conf = OvmfPkg/OvmfPkgIa32.dsc
+arch = IA32
+opts = common
+ ovmf.sb.smm
+plat = OvmfIa32
+dest = ../pc-bios
+cpy1 = FV/OVMF_CODE.fd edk2-i386-secure-code.fd
+
+####################################################################################
+# x86_64
+
+[build.ovmf.x86_64]
+desc = ovmf build (64-bit)
+conf = OvmfPkg/OvmfPkgX64.dsc
+arch = X64
+opts = common
+plat = OvmfX64
+dest = ../pc-bios
+cpy1 = FV/OVMF_CODE.fd edk2-x86_64-code.fd
+
+[build.ovmf.x86_64.secure]
+desc = ovmf build (64-bit, secure boot)
+conf = OvmfPkg/OvmfPkgIa32X64.dsc
+arch = IA32 X64
+opts = common
+ ovmf.sb.smm
+plat = Ovmf3264
+dest = ../pc-bios
+cpy1 = FV/OVMF_CODE.fd edk2-x86_64-secure-code.fd
+
+[build.ovmf.microvm]
+desc = ovmf build for microvm
+conf = OvmfPkg/Microvm/MicrovmX64.dsc
+arch = X64
+opts = common
+plat = MicrovmX64
+dest = ../pc-bios
+cpy1 = FV/MICROVM.fd edk2-x86_64-microvm.fd
+
+####################################################################################
+# arm
+
+[build.armvirt.arm]
+desc = ArmVirt build, 32-bit (arm v7)
+conf = ArmVirtPkg/ArmVirtQemu.dsc
+arch = ARM
+opts = common
+ armvirt.silent
+pcds = nx.broken.grub
+plat = ArmVirtQemu-ARM
+dest = ../pc-bios
+cpy1 = FV/QEMU_EFI.fd edk2-arm-code.fd
+cpy2 = FV/QEMU_VARS.fd edk2-arm-vars.fd
+pad1 = edk2-arm-code.fd 64m
+pad2 = edk2-arm-vars.fd 64m
+
+####################################################################################
+# aarch64
+
+[build.armvirt.aa64]
+desc = ArmVirt build, 64-bit (arm v8)
+conf = ArmVirtPkg/ArmVirtQemu.dsc
+arch = AARCH64
+opts = common
+ armvirt.silent
+pcds = nx.broken.grub
+plat = ArmVirtQemu-AARCH64
+dest = ../pc-bios
+cpy1 = FV/QEMU_EFI.fd edk2-aarch64-code.fd
+pad1 = edk2-aarch64-code.fd 64m
+
+####################################################################################
+# riscv64
+
+[build.riscv.qemu]
+conf = OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc
+arch = RISCV64
+plat = RiscVVirtQemu
+dest = ../pc-bios
+cpy1 = FV/RISCV_VIRT.fd edk2-riscv.fd
+pad1 = edk2-riscv.fd 32m
diff --git a/roms/edk2-build.sh b/roms/edk2-build.sh
deleted file mode 100755
index ea79dc27a269..000000000000
--- a/roms/edk2-build.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# Wrapper shell script for building a virtual platform firmware in edk2.
-#
-# Copyright (C) 2019 Red Hat, Inc.
-#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License that accompanies this
-# distribution. The full text of the license may be found at
-# <http://opensource.org/licenses/bsd-license.php>.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
-# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-set -e -u -C
-
-# Save the command line arguments. We need to reset $# to 0 before sourcing
-# "edksetup.sh", as it will inherit $@.
-emulation_target=$1
-shift
-num_args=0
-args=()
-for arg in "$@"; do
- args[num_args++]="$arg"
-done
-shift $num_args
-
-cd edk2
-
-export PYTHON_COMMAND=${EDK2_PYTHON_COMMAND:-python3}
-
-# Source "edksetup.sh" carefully.
-set +e +u +C
-source ./edksetup.sh
-ret=$?
-set -e -u -C
-if [ $ret -ne 0 ]; then
- exit $ret
-fi
-
-# Fetch some option arguments, and set the cross-compilation environment (if
-# any), for the edk2 "build" utility.
-source ../edk2-funcs.sh
-edk2_toolchain=$(qemu_edk2_get_toolchain "$emulation_target")
-MAKEFLAGS=$(qemu_edk2_quirk_tianocore_1607 "$MAKEFLAGS")
-edk2_thread_count=$(qemu_edk2_get_thread_count "$MAKEFLAGS")
-qemu_edk2_set_cross_env "$emulation_target"
-
-# Build the platform firmware.
-build \
- --cmd-len=65536 \
- -n "$edk2_thread_count" \
- --buildtarget=RELEASE \
- --tagname="$edk2_toolchain" \
- "${args[@]}"
diff --git a/roms/edk2-funcs.sh b/roms/edk2-funcs.sh
deleted file mode 100644
index cd6e4f2c82d2..000000000000
--- a/roms/edk2-funcs.sh
+++ /dev/null
@@ -1,273 +0,0 @@
-# Shell script that defines functions for determining some environmental
-# characteristics for the edk2 "build" utility.
-#
-# This script is meant to be sourced, in a bash environment.
-#
-# Copyright (C) 2019 Red Hat, Inc.
-#
-# This program and the accompanying materials are licensed and made available
-# under the terms and conditions of the BSD License that accompanies this
-# distribution. The full text of the license may be found at
-# <http://opensource.org/licenses/bsd-license.php>.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT
-# WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-
-
-# Verify whether the QEMU system emulation target is supported by the UEFI spec
-# and edk2. Print a message to the standard error, and return with nonzero
-# status, if verification fails.
-#
-# Parameters:
-# $1: QEMU system emulation target
-qemu_edk2_verify_arch()
-{
- local emulation_target="$1"
- local program_name=$(basename -- "$0")
-
- case "$emulation_target" in
- (arm|aarch64|i386|x86_64)
- ;;
- (*)
- printf '%s: unknown/unsupported QEMU system emulation target "%s"\n' \
- "$program_name" "$emulation_target" >&2
- return 1
- ;;
- esac
-}
-
-
-# Translate the QEMU system emulation target to the edk2 architecture
-# identifier. Print the result to the standard output.
-#
-# Parameters:
-# $1: QEMU system emulation target
-qemu_edk2_get_arch()
-{
- local emulation_target="$1"
-
- if ! qemu_edk2_verify_arch "$emulation_target"; then
- return 1
- fi
-
- case "$emulation_target" in
- (arm)
- printf 'ARM\n'
- ;;
- (aarch64)
- printf 'AARCH64\n'
- ;;
- (i386)
- printf 'IA32\n'
- ;;
- (x86_64)
- printf 'X64\n'
- ;;
- esac
-}
-
-
-# Translate the QEMU system emulation target to the gcc cross-compilation
-# architecture identifier. Print the result to the standard output.
-#
-# Parameters:
-# $1: QEMU system emulation target
-qemu_edk2_get_gcc_arch()
-{
- local emulation_target="$1"
-
- if ! qemu_edk2_verify_arch "$emulation_target"; then
- return 1
- fi
-
- case "$emulation_target" in
- (arm|aarch64|x86_64)
- printf '%s\n' "$emulation_target"
- ;;
- (i386)
- printf 'i686\n'
- ;;
- esac
-}
-
-
-# Determine the gcc cross-compiler prefix (if any) for use with the edk2
-# toolchain. Print the result to the standard output.
-#
-# Parameters:
-# $1: QEMU system emulation target
-qemu_edk2_get_cross_prefix()
-{
- local emulation_target="$1"
- local gcc_arch
- local host_arch
-
- if ! gcc_arch=$(qemu_edk2_get_gcc_arch "$emulation_target"); then
- return 1
- fi
-
- host_arch=$(uname -m)
-
- if [ "$gcc_arch" == "$host_arch" ] ||
- ( [ "$gcc_arch" == i686 ] && [ "$host_arch" == x86_64 ] ); then
- # no cross-compiler needed
- :
- elif ( [ -e /etc/debian_version ] && [ "$gcc_arch" == arm ] ); then
- # force soft-float cross-compiler on Debian
- printf 'arm-linux-gnueabi-'
- else
- printf '%s-linux-gnu-\n' "$gcc_arch"
- fi
-}
-
-
-# Determine the edk2 toolchain tag for the QEMU system emulation target. Print
-# the result to the standard output. Print a message to the standard error, and
-# return with nonzero status, if the (conditional) gcc version check fails.
-#
-# Parameters:
-# $1: QEMU system emulation target
-qemu_edk2_get_toolchain()
-{
- local emulation_target="$1"
- local program_name=$(basename -- "$0")
- local cross_prefix
- local gcc_version
-
- if ! qemu_edk2_verify_arch "$emulation_target"; then
- return 1
- fi
-
- case "$emulation_target" in
- (arm|aarch64)
- printf 'GCC5\n'
- ;;
-
- (i386|x86_64)
- if ! cross_prefix=$(qemu_edk2_get_cross_prefix "$emulation_target"); then
- return 1
- fi
-
- gcc_version=$("${cross_prefix}gcc" -v 2>&1 | tail -1 | awk '{print $3}')
- # Run "git-blame" on "OvmfPkg/build.sh" in edk2 for more information on
- # the mapping below.
- case "$gcc_version" in
- ([1-3].*|4.[0-7].*)
- printf '%s: unsupported gcc version "%s"\n' \
- "$program_name" "$gcc_version" >&2
- return 1
- ;;
- (4.8.*)
- printf 'GCC48\n'
- ;;
- (4.9.*|6.[0-2].*)
- printf 'GCC49\n'
- ;;
- (*)
- printf 'GCC5\n'
- ;;
- esac
- ;;
- esac
-}
-
-
-# Determine the name of the environment variable that exposes the
-# cross-compiler prefix to the edk2 "build" utility. Print the result to the
-# standard output.
-#
-# Parameters:
-# $1: QEMU system emulation target
-qemu_edk2_get_cross_prefix_var()
-{
- local emulation_target="$1"
- local edk2_toolchain
- local edk2_arch
-
- if ! edk2_toolchain=$(qemu_edk2_get_toolchain "$emulation_target"); then
- return 1
- fi
-
- case "$emulation_target" in
- (arm|aarch64)
- if ! edk2_arch=$(qemu_edk2_get_arch "$emulation_target"); then
- return 1
- fi
- printf '%s_%s_PREFIX\n' "$edk2_toolchain" "$edk2_arch"
- ;;
- (i386|x86_64)
- printf '%s_BIN\n' "$edk2_toolchain"
- ;;
- esac
-}
-
-
-# Set and export the environment variable(s) necessary for cross-compilation,
-# whenever needed by the edk2 "build" utility.
-#
-# Parameters:
-# $1: QEMU system emulation target
-qemu_edk2_set_cross_env()
-{
- local emulation_target="$1"
- local cross_prefix
- local cross_prefix_var
-
- if ! cross_prefix=$(qemu_edk2_get_cross_prefix "$emulation_target"); then
- return 1
- fi
-
- if [ -z "$cross_prefix" ]; then
- # Nothing to do.
- return 0
- fi
-
- if ! cross_prefix_var=$(qemu_edk2_get_cross_prefix_var \
- "$emulation_target"); then
- return 1
- fi
-
- eval "export $cross_prefix_var=\$cross_prefix"
-}
-
-
-# Determine the "-n" option argument (that is, the number of modules to build
-# in parallel) for the edk2 "build" utility. Print the result to the standard
-# output.
-#
-# Parameters:
-# $1: the value of the MAKEFLAGS variable
-qemu_edk2_get_thread_count()
-{
- local makeflags="$1"
-
- if [[ "$makeflags" == *--jobserver-auth=* ]] ||
- [[ "$makeflags" == *--jobserver-fds=* ]]; then
- # If there is a job server, allow the edk2 "build" utility to parallelize
- # as many module builds as there are logical CPUs in the system. The "make"
- # instances forked by "build" are supposed to limit themselves through the
- # job server. The zero value below causes the edk2 "build" utility to fetch
- # the logical CPU count with Python's multiprocessing.cpu_count() method.
- printf '0\n'
- else
- # Build a single module at a time.
- printf '1\n'
- fi
-}
-
-
-# Work around <https://bugzilla.tianocore.org/show_bug.cgi?id=1607> by
-# filtering jobserver-related flags out of MAKEFLAGS. Print the result to the
-# standard output.
-#
-# Parameters:
-# $1: the value of the MAKEFLAGS variable
-qemu_edk2_quirk_tianocore_1607()
-{
- local makeflags="$1"
-
- printf %s "$makeflags" \
- | LC_ALL=C sed --regexp-extended \
- --expression='s/--jobserver-(auth|fds)=[0-9]+,[0-9]+//' \
- --expression='s/-j([0-9]+)?//'
-}
--
2.39.2
next prev parent reply other threads:[~2023-03-20 9:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-20 9:38 [PULL 0/6] Edk2 stable202302 20230320 patches Gerd Hoffmann
2023-03-20 9:38 ` [PULL 1/6] acpi: enable tests/data/acpi updates Gerd Hoffmann
2023-03-21 8:22 ` Ani Sinha
2023-03-20 9:38 ` [PULL 2/6] bios-tables-test: use 128M numa nodes on aarch64 Gerd Hoffmann
2023-03-21 8:22 ` Ani Sinha
2023-03-21 8:44 ` Michael S. Tsirkin
2023-03-20 9:38 ` [PULL 3/6] acpi: disable tests/data/acpi updates Gerd Hoffmann
2023-03-20 9:38 ` [PULL 4/6] edk2: update submodule to edk2-stable202302 Gerd Hoffmann
2023-03-20 9:38 ` Gerd Hoffmann [this message]
2023-04-07 21:32 ` [PULL 5/6] edk2: replace build scripts Olaf Hering
2023-03-20 9:38 ` [PULL 6/6] edk2: update firmware binaries Gerd Hoffmann
2023-03-20 17:51 ` [PULL 0/6] Edk2 stable202302 20230320 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230320093847.539751-6-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=ani@anisinha.ca \
--cc=imammedo@redhat.com \
--cc=mst@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.