Skip to content

Commit 37dbfb6

Browse files
build-edk2: Deduplicate stuart build options
Add common_build_opt/tpm_build_opt vars so that we don't have to repeat the verbose "BLD_*_..." options.
1 parent b67ff0e commit 37dbfb6

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

build-edk2/Dockerfile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,28 @@ RUN . venv/bin/activate && pip install -r pip-requirements.txt --upgrade
3030
ENV toolchain=GCC5
3131
RUN . venv/bin/activate && python BaseTools/Edk2ToolsBuild.py -t "${toolchain}"
3232

33+
# Build options.
34+
ENV common_build_opt="BLD_*_NETWORK_HTTP_ENABLE=1"
35+
ENV tpm_build_opt="BLD_*_TPM1_ENABLE=1 BLD_*_TPM2_ENABLE=1"
36+
3337
# Build AARCH64.
3438
ENV GCC5_AARCH64_PREFIX="/usr/bin/aarch64-linux-gnu-"
3539
ENV build_target=RELEASE
36-
ENV stuart_opts="-c ArmVirtPkg/PlatformCI/QemuBuild.py -a AARCH64 Target=${build_target} TOOL_CHAIN_TAG=${toolchain} BLD_*_NETWORK_HTTP_ENABLE=1"
40+
ENV stuart_opts="-c ArmVirtPkg/PlatformCI/QemuBuild.py -a AARCH64 Target=${build_target} TOOL_CHAIN_TAG=${toolchain} ${common_build_opt}"
3741
RUN . venv/bin/activate && stuart_setup ${stuart_opts} && stuart_update ${stuart_opts} && stuart_build ${stuart_opts}
3842

3943
# Build RiscV.
4044
ENV GCC5_RISCV64_PREFIX="/opt/riscv/bin/riscv64-unknown-elf-"
4145
ENV build_target=RELEASE
42-
ENV stuart_opts="-c OvmfPkg/PlatformCI/QemuBuild.py -a RISCV64 Target=${build_target} TOOL_CHAIN_TAG=${toolchain} BLD_*_NETWORK_HTTP_ENABLE=1"
46+
ENV stuart_opts="-c OvmfPkg/PlatformCI/QemuBuild.py -a RISCV64 Target=${build_target} TOOL_CHAIN_TAG=${toolchain} ${common_build_opt}"
4347
RUN . venv/bin/activate && stuart_setup ${stuart_opts} && stuart_update ${stuart_opts} && stuart_build ${stuart_opts}
4448

4549
# Build IA32.
46-
ENV stuart_opts="-c OvmfPkg/PlatformCI/PlatformBuild.py -a IA32 Target=${build_target} TOOL_CHAIN_TAG=${toolchain} BLD_*_NETWORK_HTTP_ENABLE=1 BLD_*_TPM1_ENABLE=1 BLD_*_TPM2_ENABLE=1"
50+
ENV stuart_opts="-c OvmfPkg/PlatformCI/PlatformBuild.py -a IA32 Target=${build_target} TOOL_CHAIN_TAG=${toolchain} ${common_build_opt} ${tpm_build_opt}"
4751
RUN . venv/bin/activate && stuart_setup ${stuart_opts} && stuart_update ${stuart_opts} && stuart_build ${stuart_opts}
4852

4953
# Build X64.
50-
ENV stuart_opts="-c OvmfPkg/PlatformCI/PlatformBuild.py -a X64 Target=${build_target} TOOL_CHAIN_TAG=${toolchain} BLD_*_NETWORK_HTTP_ENABLE=1 BLD_*_TPM1_ENABLE=1 BLD_*_TPM2_ENABLE=1"
54+
ENV stuart_opts="-c OvmfPkg/PlatformCI/PlatformBuild.py -a X64 Target=${build_target} TOOL_CHAIN_TAG=${toolchain} ${common_build_opt} ${tpm_build_opt}"
5155
RUN . venv/bin/activate && stuart_setup ${stuart_opts} && stuart_update ${stuart_opts} && stuart_build ${stuart_opts}
5256

5357
# Create the output bin dir.

0 commit comments

Comments
 (0)