Skip to contentSkip to conversation

CI: Update to QEMU 8.0.3

PATCH Superseded Tom Rini 3 participants 10 messages Jul 13, 2023 – Jul 21, 2023

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/2 CI: Update to QEMU 8.0.3

Move up to the latest tagged release of QEMU

---
 tools/docker/Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
tools/docker/Dockerfile +3 -4
index aa54e2689fb5..733099684be6 100644
@@ -77,6 +77,7 @@ RUN apt-get update && apt-get install -y \
 	libsdl1.2-dev \
 	libsdl2-dev \
 	libseccomp-dev \
+	libslirp-dev \
 	libssl-dev \
 	libtool \
 	libudev-dev \
@@ -175,13 +176,11 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \
 
 RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \
 	cd /tmp/qemu && \
-	git checkout v6.1.0 && \
+	git checkout v8.0.3 && \
 	# config user.name and user.email to make 'git am' happy
 	git config user.name u-boot && \
 	git config user.email [email protected] && \
-	# 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/[email protected]/mbox/ | git am && \
-	./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" && \
+	./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" --enable-slirp && \
 	make -j$(nproc) all install && \
 	rm -rf /tmp/qemu
 
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 2/2 CI: Update to the latest "Jammy" tag

Move to the latest "Jammy" tag from Ubuntu.

---
 .azure-pipelines.yml    | 2 +-
 .gitlab-ci.yml          | 2 +-
 tools/docker/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
.azure-pipelines.yml +1 -1
index 76982ec3e52e..22185be1a890 100644
@@ -2,7 +2,7 @@ variables:
   windows_vm: windows-2019
   ubuntu_vm: ubuntu-22.04
   macos_vm: macOS-12
-  ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20230308-04Apr2023
+  ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20230624-12Jul2023
   # Add '-u 0' options for Azure pipelines, otherwise we get "permission
   # denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer",
   # since our $(ci_runner_image) user is not root.
.gitlab-ci.yml +1 -1
index f7ffb8f5dfdc..89e69fe20d3c 100644
@@ -10,7 +10,7 @@ default:
 
 # Grab our configured image.  The source for this is found
 # in the u-boot tree at tools/docker/Dockerfile
-image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20230308-04Apr2023
+image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20230624-12Jul2023
 
 # We run some tests in different order, to catch some failures quicker.
 stages:
tools/docker/Dockerfile +1 -1
index 733099684be6..c3fd49ba9469 100644
@@ -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-20230308
+FROM ubuntu:jammy-20230624
 MAINTAINER Tom Rini <[email protected]>
 LABEL Description=" This image is for building U-Boot inside a container"
 
Signature · 1 line
2.34.1
Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] CI: Update to the latest "Jammy" tag

Hi Tom,

Quoted 9 lines · Tom Rini

Move to the latest "Jammy" tag from Ubuntu.

---
 .azure-pipelines.yml    | 2 +-
 .gitlab-ci.yml          | 2 +-
 tools/docker/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Is this just so we keep up to date?

Regards,
SImon

author
#3 lore raw

Re: [PATCH 2/2] CI: Update to the latest "Jammy" tag

Quoted 13 lines · Simon Glass

Hi Tom,

Quoted 9 lines · Tom Rini

Move to the latest "Jammy" tag from Ubuntu.

---
 .azure-pipelines.yml    | 2 +-
 .gitlab-ci.yml          | 2 +-
 tools/docker/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
Quoted 3 lines

Is this just so we keep up to date?

Yes, and I only do these updates when I'm pushing other updates as given how we use the base images we don't need to upgrade for security reasons every time Ubuntu does a new tag.

Signature · 1 line
Tom
#4 lore raw
In reply to Tom Rini
Quoted 2 lines · Tom Rini

Move up to the latest tagged release of QEMU

I have the same patch in my local tree :)

Quoted 21 lines
---
 tools/docker/Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
tools/docker/Dockerfile +1 -0
index aa54e2689fb5..733099684be6 100644
@@ -77,6 +77,7 @@ RUN apt-get update && apt-get install -y \
        libsdl1.2-dev \
        libsdl2-dev \
        libseccomp-dev \
+       libslirp-dev \
        libssl-dev \
        libtool \
        libudev-dev \
@@ -175,13 +176,11 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \
 
 RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \

tools/docker/Dockerfile RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ · line 183

Quoted 10 lines
tools/docker/Dockerfile +2 -4
        cd /tmp/qemu && \
-       git checkout v6.1.0 && \
+       git checkout v8.0.3 && \
        # config user.name and user.email to make 'git am' happy
        git config user.name u-boot && \
        git config user.email [email protected] && \
-       # 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/[email protected]/mbox/ | git am && \
-       ./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" && \
+       ./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" --enable-slirp && \

--enable-slirp is not necessary as libslirp-dev is installed as a dependency which will be automatically figured out

tools/docker/Dockerfile RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ · line 185

Quoted 2 lines
tools/docker/Dockerfile +0 -0
        make -j$(nproc) all install && \
        rm -rf /tmp/qemu

Regards,
Bin

author
#5 lore raw
Quoted 26 lines · Bin Meng
Quoted 2 lines · Tom Rini

Move up to the latest tagged release of QEMU

I have the same patch in my local tree :)

Quoted 20 lines
---
 tools/docker/Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
tools/docker/Dockerfile +1 -0
index aa54e2689fb5..733099684be6 100644
@@ -77,6 +77,7 @@ RUN apt-get update && apt-get install -y \
        libsdl1.2-dev \
        libsdl2-dev \
        libseccomp-dev \
+       libslirp-dev \
        libssl-dev \
        libtool \
        libudev-dev \
@@ -175,13 +176,11 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \
 
Quoted 14 lines

tools/docker/Dockerfile RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ · line 183

Quoted 11 lines
tools/docker/Dockerfile +2 -4
 RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \
        cd /tmp/qemu && \
-       git checkout v6.1.0 && \
+       git checkout v8.0.3 && \
        # config user.name and user.email to make 'git am' happy
        git config user.name u-boot && \
        git config user.email [email protected] && \
-       # 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/[email protected]/mbox/ | git am && \
-       ./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" && \
+       ./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" --enable-slirp && \

--enable-slirp is not necessary as libslirp-dev is installed as a dependency which will be automatically figured out

I thought about it, and I first tripped in to "no libslirp, no user netdev, CI fails". I then spelled out we need the library and configure failed, and then ah, right, we need libslirp-dev installed. So I was thinking about being explicit about this flag as we specify the user netdev in a number of cases and this means if something changes in the future we'll get a failure here, rather than later on when testing the image. Does that make sense? Or do you still think I should drop the flag here?

Signature · 1 line
Tom
#6 lore raw
Quoted 43 lines · Tom Rini
Quoted 26 lines · Bin Meng
Quoted 2 lines · Tom Rini

Move up to the latest tagged release of QEMU

I have the same patch in my local tree :)

Quoted 20 lines
---
 tools/docker/Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
tools/docker/Dockerfile +1 -0
index aa54e2689fb5..733099684be6 100644
@@ -77,6 +77,7 @@ RUN apt-get update && apt-get install -y \
        libsdl1.2-dev \
        libsdl2-dev \
        libseccomp-dev \
+       libslirp-dev \
        libssl-dev \
        libtool \
        libudev-dev \
@@ -175,13 +176,11 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \
 
Quoted 14 lines

tools/docker/Dockerfile RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ · line 183

Quoted 11 lines
tools/docker/Dockerfile +2 -4
 RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \
        cd /tmp/qemu && \
-       git checkout v6.1.0 && \
+       git checkout v8.0.3 && \
        # config user.name and user.email to make 'git am' happy
        git config user.name u-boot && \
        git config user.email [email protected] && \
-       # 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/[email protected]/mbox/ | git am && \
-       ./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" && \
+       ./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" --enable-slirp && \

--enable-slirp is not necessary as libslirp-dev is installed as a dependency which will be automatically figured out

Quoted 9 lines

I thought about it, and I first tripped in to "no libslirp, no user netdev, CI fails". I then spelled out we need the library and configure failed, and then ah, right, we need libslirp-dev installed. So I was thinking about being explicit about this flag as we specify the user netdev in a number of cases and this means if something changes in the future we'll get a failure here, rather than later on when testing the image. Does that make sense? Or do you still think I should drop the flag here?

I think we can just drop the flag. There are some other flags we don't explicitly write down on the configure command line and we rely on the build system to automatically figure it out. As long as we maintain the dockerfile properly we will be fine.

Regards,
Bin

author
#7 lore raw

PATCH v2 1/2 CI: Update to QEMU 8.0.3

In reply to Tom Rini

Move up to the latest tagged release of QEMU

---
Changes in v2:
- Drop --enable-slirp, per Bin

---
 tools/docker/Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
tools/docker/Dockerfile +2 -3
index aa54e2689fb5..f72cba0b8cc4 100644
@@ -77,6 +77,7 @@ RUN apt-get update && apt-get install -y \
 	libsdl1.2-dev \
 	libsdl2-dev \
 	libseccomp-dev \
+	libslirp-dev \
 	libssl-dev \
 	libtool \
 	libudev-dev \
@@ -175,12 +176,10 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \
 
 RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \
 	cd /tmp/qemu && \
-	git checkout v6.1.0 && \
+	git checkout v8.0.3 && \
 	# config user.name and user.email to make 'git am' happy
 	git config user.name u-boot && \
 	git config user.email [email protected] && \
-	# 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/[email protected]/mbox/ | git am && \
 	./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
Signature · 1 line
2.34.1