[PATCH 1/2] CI: Update to QEMU 8.0.3
Move up to the latest tagged release of QEMU
Signed-off-by: Tom Rini trini@konsulko.com --- tools/docker/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index aa54e2689fb5..733099684be6 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -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 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,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
Move to the latest "Jammy" tag from Ubuntu.
Signed-off-by: Tom Rini trini@konsulko.com --- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- tools/docker/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 76982ec3e52e..22185be1a890 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -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. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7ffb8f5dfdc..89e69fe20d3c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 733099684be6..c3fd49ba9469 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-20230308 +FROM ubuntu:jammy-20230624 MAINTAINER Tom Rini trini@konsulko.com LABEL Description=" This image is for building U-Boot inside a container"
Hi Tom,
On Wed, 12 Jul 2023 at 20:04, Tom Rini trini@konsulko.com wrote:
Move to the latest "Jammy" tag from Ubuntu.
Signed-off-by: Tom Rini trini@konsulko.com
.azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- tools/docker/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
Is this just so we keep up to date?
Regards, SImon
On Thu, Jul 13, 2023 at 02:51:44PM -0600, Simon Glass wrote:
Hi Tom,
On Wed, 12 Jul 2023 at 20:04, Tom Rini trini@konsulko.com wrote:
Move to the latest "Jammy" tag from Ubuntu.
Signed-off-by: Tom Rini trini@konsulko.com
.azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- tools/docker/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
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.
On Thu, Jul 13, 2023 at 10:04 AM Tom Rini trini@konsulko.com wrote:
Move up to the latest tagged release of QEMU
I have the same patch in my local tree :)
Signed-off-by: Tom Rini trini@konsulko.com
tools/docker/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index aa54e2689fb5..733099684be6 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -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 u-boot@denx.de && \
# manually apply the bug fix for QEMU 6.1.0 Xilinx Zynq UART emulation codeswget -O - http://patchwork.ozlabs.org/project/qemu-devel/patch/20210823020813.25192-2-bmeng.cn@gmail.com/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
make -j$(nproc) all install && \ rm -rf /tmp/qemu
Regards, Bin
On Thu, Jul 13, 2023 at 10:51:15AM +0800, Bin Meng wrote:
On Thu, Jul 13, 2023 at 10:04 AM Tom Rini trini@konsulko.com wrote:
Move up to the latest tagged release of QEMU
I have the same patch in my local tree :)
Signed-off-by: Tom Rini trini@konsulko.com
tools/docker/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index aa54e2689fb5..733099684be6 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -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 u-boot@denx.de && \
# manually apply the bug fix for QEMU 6.1.0 Xilinx Zynq UART emulation codeswget -O - http://patchwork.ozlabs.org/project/qemu-devel/patch/20210823020813.25192-2-bmeng.cn@gmail.com/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?
On Thu, Jul 13, 2023 at 11:04 AM Tom Rini trini@konsulko.com wrote:
On Thu, Jul 13, 2023 at 10:51:15AM +0800, Bin Meng wrote:
On Thu, Jul 13, 2023 at 10:04 AM Tom Rini trini@konsulko.com wrote:
Move up to the latest tagged release of QEMU
I have the same patch in my local tree :)
Signed-off-by: Tom Rini trini@konsulko.com
tools/docker/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index aa54e2689fb5..733099684be6 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -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 u-boot@denx.de && \
# manually apply the bug fix for QEMU 6.1.0 Xilinx Zynq UART emulation codeswget -O - http://patchwork.ozlabs.org/project/qemu-devel/patch/20210823020813.25192-2-bmeng.cn@gmail.com/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?
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
Move up to the latest tagged release of QEMU
Signed-off-by: Tom Rini trini@konsulko.com --- Changes in v2: - Drop --enable-slirp, per Bin --- tools/docker/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index aa54e2689fb5..f72cba0b8cc4 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -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 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,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
On Thu, Jul 13, 2023 at 10:16 PM Tom Rini trini@konsulko.com wrote:
Move up to the latest tagged release of QEMU
Signed-off-by: Tom Rini trini@konsulko.com
Changes in v2:
- Drop --enable-slirp, per Bin
tools/docker/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
On Thu, Jul 13, 2023 at 10:16:28AM -0400, Tom Rini wrote:
Move up to the latest tagged release of QEMU
Signed-off-by: Tom Rini trini@konsulko.com Reviewed-by: Bin Meng bmeng.cn@gmail.com
Applied to u-boot/master, thanks!
participants (3)
-
Bin Meng -
Simon Glass -
Tom Rini