aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLaszlo Ersek <lersek@redhat.com>2019-03-06 13:12:23 +0100
committerLaszlo Ersek <lersek@redhat.com>2019-04-17 15:38:35 +0200
commit65a109ab4b1a6fe2e78c6be47d195dcb1ab89e9b (patch)
treeb68b4675516dd624ebfad11511b18b0f4371ae9a /tests
parenteeba63fc7fface36f438bcbc0d3b02e7dcb59983 (diff)
downloadqemu-65a109ab4b1a6fe2e78c6be47d195dcb1ab89e9b.zip
qemu-65a109ab4b1a6fe2e78c6be47d195dcb1ab89e9b.tar.gz
qemu-65a109ab4b1a6fe2e78c6be47d195dcb1ab89e9b.tar.bz2
roms: lift "edk2-funcs.sh" from "tests/uefi-test-tools/build.sh"
Extract the dense logic for architecture and toolchain massaging from "tests/uefi-test-tools/build.sh", to a set of small functions. We'll reuse these functions for building full platform firmware images. Signed-off-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Tested-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/uefi-test-tools/build.sh97
1 files changed, 6 insertions, 91 deletions
diff --git a/tests/uefi-test-tools/build.sh b/tests/uefi-test-tools/build.sh
index 155cb75..e2b52c8 100755
--- a/tests/uefi-test-tools/build.sh
+++ b/tests/uefi-test-tools/build.sh
@@ -38,97 +38,12 @@ if [ $ret -ne 0 ]; then
exit $ret
fi
-# Map the QEMU system emulation target to the following types of architecture
-# identifiers:
-# - edk2,
-# - gcc cross-compilation.
-# Cover only those targets that are supported by the UEFI spec and edk2.
-case "$emulation_target" in
- (arm)
- edk2_arch=ARM
- gcc_arch=arm
- ;;
- (aarch64)
- edk2_arch=AARCH64
- gcc_arch=aarch64
- ;;
- (i386)
- edk2_arch=IA32
- gcc_arch=i686
- ;;
- (x86_64)
- edk2_arch=X64
- gcc_arch=x86_64
- ;;
- (*)
- printf '%s: unknown/unsupported QEMU system emulation target "%s"\n' \
- "$program_name" "$emulation_target" >&2
- exit 1
- ;;
-esac
-
-# Check if cross-compilation is needed.
-host_arch=$(uname -m)
-if [ "$gcc_arch" == "$host_arch" ] ||
- ( [ "$gcc_arch" == i686 ] && [ "$host_arch" == x86_64 ] ); then
- cross_prefix=
-else
- cross_prefix=${gcc_arch}-linux-gnu-
-fi
-
-# Expose cross_prefix (which is possibly empty) to the edk2 tools. While at it,
-# determine the suitable edk2 toolchain as well.
-# - For ARM and AARCH64, edk2 only offers the GCC5 toolchain tag, which covers
-# the gcc-5+ releases.
-# - For IA32 and X64, edk2 offers the GCC44 through GCC49 toolchain tags, in
-# addition to GCC5. Unfortunately, the mapping between the toolchain tags and
-# the actual gcc releases isn't entirely trivial. Run "git-blame" on
-# "OvmfPkg/build.sh" in edk2 for more information.
-# And, because the above is too simple, we have to assign cross_prefix to an
-# edk2 build variable that is specific to both the toolchain tag and the target
-# architecture.
-case "$edk2_arch" in
- (ARM)
- edk2_toolchain=GCC5
- export GCC5_ARM_PREFIX=$cross_prefix
- ;;
- (AARCH64)
- edk2_toolchain=GCC5
- export GCC5_AARCH64_PREFIX=$cross_prefix
- ;;
- (IA32|X64)
- gcc_version=$("${cross_prefix}gcc" -v 2>&1 | tail -1 | awk '{print $3}')
- case "$gcc_version" in
- ([1-3].*|4.[0-3].*)
- printf '%s: unsupported gcc version "%s"\n' \
- "$program_name" "$gcc_version" >&2
- exit 1
- ;;
- (4.4.*)
- edk2_toolchain=GCC44
- ;;
- (4.5.*)
- edk2_toolchain=GCC45
- ;;
- (4.6.*)
- edk2_toolchain=GCC46
- ;;
- (4.7.*)
- edk2_toolchain=GCC47
- ;;
- (4.8.*)
- edk2_toolchain=GCC48
- ;;
- (4.9.*|6.[0-2].*)
- edk2_toolchain=GCC49
- ;;
- (*)
- edk2_toolchain=GCC5
- ;;
- esac
- eval "export ${edk2_toolchain}_BIN=\$cross_prefix"
- ;;
-esac
+# Fetch some option arguments, and set the cross-compilation environment (if
+# any), for the edk2 "build" utility.
+source "$edk2_dir/../edk2-funcs.sh"
+edk2_arch=$(qemu_edk2_get_arch "$emulation_target")
+edk2_toolchain=$(qemu_edk2_get_toolchain "$emulation_target")
+qemu_edk2_set_cross_env "$emulation_target"
# Build the UEFI binary
mkdir -p log