[PATCH 1/2] Dockerfile: Add m68k-softmmu to qemu
Given efforts to add an m68k target to CI, build qemu for it.
Signed-off-by: Tom Rini trini@konsulko.com --- Cc: Marek Vasut marek.vasut+renesas@mailbox.org --- tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index fdcb0c7f3d29..2d94ed9fbacf 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -182,7 +182,7 @@ RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \ git config user.email u-boot@denx.de && \ # manually apply the bug fix for QEMU 6.1.0 Xilinx Zynq UART emulation codes wget -O - http://patchwork.ozlabs.org/project/qemu-devel/patch/20210823020813.25192-2-... | git am && \ - ./configure --prefix=/opt/qemu --target-list="aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu,ppc-softmmu,riscv32-softmmu,riscv64-softmmu,sh4-softmmu,x86_64-softmmu,xtensa-softmmu" && \ + ./configure --prefix=/opt/qemu --target-list="aarch64-softmmu,arm-softmmu,i386-softmmu,m68k-softmmu,mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu,ppc-softmmu,riscv32-softmmu,riscv64-softmmu,sh4-softmmu,x86_64-softmmu,xtensa-softmmu" && \ make -j$(nproc) all install && \ rm -rf /tmp/qemu
Update to using the latest "Jammy" tag as our base.
Signed-off-by: Tom Rini trini@konsulko.com --- tools/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 2d94ed9fbacf..bd02531be249 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -2,7 +2,7 @@ # This Dockerfile is used to build an image containing basic stuff to be used # to build U-Boot and run our test suites.
-FROM ubuntu:jammy-20230126 +FROM ubuntu:jammy-20230308 MAINTAINER Tom Rini trini@konsulko.com LABEL Description=" This image is for building U-Boot inside a container"
On Tue, Mar 21, 2023 at 03:31:43PM -0400, Tom Rini wrote:
Update to using the latest "Jammy" tag as our base.
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/next, thanks!
On 3/21/23 20:31, Tom Rini wrote:
Given efforts to add an m68k target to CI, build qemu for it.
Signed-off-by: Tom Rini trini@konsulko.com
Cc: Marek Vasut marek.vasut+renesas@mailbox.org
Reviewed-by: Marek Vasut marek.vasut+renesas@mailbox.org
+CC Angelo too.
On Tue, Mar 21, 2023 at 03:31:42PM -0400, Tom Rini wrote:
Given efforts to add an m68k target to CI, build qemu for it.
Signed-off-by: Tom Rini trini@konsulko.com Reviewed-by: Marek Vasut marek.vasut+renesas@mailbox.org
Applied to u-boot/next, thanks!
participants (2)
-
Marek Vasut -
Tom Rini