diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2022-03-15 13:08:35 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2022-03-15 13:08:35 +0000 |
| commit | 1af26ce67082727aeb109708f2c75d5fc5364e23 (patch) | |
| tree | 4bfcfa09e90d6cc0d64b005651da1f6990409b3e /.gitlab-ci.d | |
| parent | ac621d40b58fcf9a058680a2a114718a0710abcc (diff) | |
| parent | 9b437cd0f95398198852f25d7847a605370f984d (diff) | |
Merge tag 'edk2-20220315-pull-request' of git://git.kraxel.org/qemu into staging
edk2: update to stable202202
# gpg: Signature made Tue 15 Mar 2022 08:34:38 GMT
# gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* tag 'edk2-20220315-pull-request' of git://git.kraxel.org/qemu:
MAINTAINERS: take edk2
edk2/docker: use ubuntu 18.04
edk2/docker: install python3
tests/acpi: disallow virt memory hotplug changes
tests/acpi: update expected data files
edk2: update binaries to stable202202
edk2: add microvm build
edk2: .git can be a file
edk2: switch to release builds
edk2: update submodule to stable202202
tests/acpi: allow virt memory hotplug changes
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to '.gitlab-ci.d')
| -rw-r--r-- | .gitlab-ci.d/edk2/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.d/edk2/Dockerfile b/.gitlab-ci.d/edk2/Dockerfile index 13029310f6..bbe50ff832 100644 --- a/.gitlab-ci.d/edk2/Dockerfile +++ b/.gitlab-ci.d/edk2/Dockerfile @@ -1,7 +1,7 @@ # # Docker image to cross-compile EDK2 firmware binaries # -FROM ubuntu:16.04 +FROM ubuntu:18.04 MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org> @@ -20,7 +20,7 @@ RUN apt update \ iasl \ make \ nasm \ - python \ + python3 \ uuid-dev \ && \ \ |