037973bb0d
It turns out that forcing python2 for running the edk2 "build" utility is neither necessary nor sufficient. Forcing python2 is not sufficient for two reasons: - QEMU is moving away from python2, with python2 nearing EOL, - according to my most recent testing, the lacking dependency information in the makefiles that are generated by edk2's "build" utility can cause parallel build failures even when "build" is executed by python2. And forcing python2 is not necessary because we can still return to the original idea of filtering out jobserver-related options from MAKEFLAGS. So do that. While at it, cut short edk2's auto-detection of the python3.* minor version, by setting PYTHON_COMMAND to "python3" (which we expect to be available wherever we intend to build edk2). With this patch, the guest UEFI binaries that are used as part of the BIOS tables test, and the OVMF and ArmVirtQemu platform firmwares, will be built strictly in a single job, regardless of an outermost "-jN" make option. Alas, there appears to be no reliable way to build edk2 in an (outer make, inner make) environment, with a jobserver enabled. Cc: Eduardo Habkost <ehabkost@redhat.com> Cc: John Snow <jsnow@redhat.com> Cc: Philippe Mathieu-Daudé <philmd@redhat.com> Reported-by: John Snow <jsnow@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com> Signed-off-by: Laszlo Ersek <lersek@redhat.com> Message-Id: <20190920083808.21399-3-lersek@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
56 lines
1.5 KiB
Bash
Executable File
56 lines
1.5 KiB
Bash
Executable File
#!/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=DEBUG \
|
|
--tagname="$edk2_toolchain" \
|
|
"${args[@]}"
|