From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 151AAC4338F for ; Wed, 25 Aug 2021 00:05:43 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DDCF661371 for ; Wed, 25 Aug 2021 00:05:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DDCF661371 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3B36282D95; Wed, 25 Aug 2021 02:05:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Co5PW1On"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 12DAA81BC0; Wed, 25 Aug 2021 02:05:36 +0200 (CEST) Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0D8F081BC0 for ; Wed, 25 Aug 2021 02:05:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bmeng.cn@gmail.com Received: by mail-pj1-x102e.google.com with SMTP id qe12-20020a17090b4f8c00b00179321cbae7so3524558pjb.2 for ; Tue, 24 Aug 2021 17:05:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=8pDvHg71sigP8A8IhdwPq+DQYGf35Mj2z0ZZy5mzVYQ=; b=Co5PW1On4dbspK+E1lZEIc5CYuV9G5F3snffQm+v7xyge9RbTP9Uw62d1+KHgIpb74 SR4YCyix99HRxhJvxe29DR+N01Zu9Cdn1ZE5eK5w0EyN7wIVPkJa1XUm0V15HhriKEFn M18Vmon/JZrIOCbadJl0wFZGPMuemvZtGbLBi6ED4mxJB7RVLip0rpZXWXOzhNLHY2yE oZ7lZZ+LO7Vkfbzr1OtpGgK9ybLov6e9s6/x86z5J+n3Sdh4GJZ/aY0/rz23dMitZV7v rzuoYSu2518k0IxC7mR+yUVLDsgNFgKJ5rvD8hwSTkg+qs1M5X9kQh3fa1EO4JTyWamY 2QGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=8pDvHg71sigP8A8IhdwPq+DQYGf35Mj2z0ZZy5mzVYQ=; b=qYrhE4ewhAZJrmZHInk3idcqfqL6VmTpWhLWChcQ9pL18UZV0PJrAXr4DshdD3Zr/F CLQgyk7A9lfqX+TMp09SPaDYqOFQCHZUJSji8im4WuGVEx+AdkNJ6bZt+LxsICX4T976 jg/vPZOMot4f8eWTnbgvWis531G12CuUt6rKjDhgoVuuRpzCoWRu/JNZhHvhZZeZgR2Q 4KEU+CcCtKlrsDOVhb/OiE66dKbWL/A4apNA7/PQnPeuyb5kxMfv1sMXcRmvSQrlIUZx yRwWPuT3/3yM+12LBTsS6EAXj0R6LpbjP+5Hxoo8cxq0ikmEbPYUA7v7flhRuRxGjU3Z HaKQ== X-Gm-Message-State: AOAM532jihUceP3ByIvim9vds6Utc4ch0jRqJNNzXswPo0UBxkxI5fEv /WgJI83Wlw7HT6rU5x53a3I= X-Google-Smtp-Source: ABdhPJxUzD2bt1mdvk/wIsNKGCUGrfSD3B00ajVM+KOEhKIbYVv3hGhptjli83HOtGHUYxA0oGvhRA== X-Received: by 2002:a17:90a:c984:: with SMTP id w4mr7515728pjt.124.1629849929275; Tue, 24 Aug 2021 17:05:29 -0700 (PDT) Received: from i9-aorus-gtx1080.localdomain (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id u16sm23832810pgh.53.2021.08.24.17.05.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Aug 2021 17:05:28 -0700 (PDT) From: Bin Meng To: Tom Rini , u-boot@lists.denx.de Subject: [PATCH 1/4] tools: docker: Bump up QEMU version to 6.1.0 Date: Wed, 25 Aug 2021 08:05:17 +0800 Message-Id: <20210825000520.19368-1-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean At present U-Boot CI testing is still using QEMU 4.2.0 which is pretty old. Let's bump up to QEMU 6.1.0. ninja-build is added as the prerequisite required by QEMU 6.1.0. Note there is a bug in QEMU 6.1.0 Xilinx Zynq UART emulation codes. A quick fix [1] was posted on QEMU mailing list but it it too late for 6.1.0 release. Hence my custom repo is used that contains this fix on top of the v6.1.0 release tag at the time being. We should switch to QEMU official repo once the fix is merged in next release. [1] http://patchwork.ozlabs.org/project/qemu-devel/patch/20210823020813.25192-2-bmeng.cn@gmail.com/ Signed-off-by: Bin Meng --- tools/docker/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 0195456dfe..be6d7dd4dc 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -76,6 +76,7 @@ RUN apt-get update && apt-get install -y \ mount \ mtd-utils \ mtools \ + ninja-build \ openssl \ picocom \ parted \ @@ -163,10 +164,10 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ true && \ rm -rf /tmp/grub -RUN git clone git://git.qemu.org/qemu.git /tmp/qemu && \ +RUN git clone https://gitlab.com/lbmeng/qemu.git /tmp/qemu && \ cd /tmp/qemu && \ git submodule update --init dtc && \ - git checkout v4.2.0 && \ + git checkout v6.1.0-u-boot && \ ./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" && \ make -j$(nproc) all install && \ rm -rf /tmp/qemu -- 2.25.1