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,URIBL_BLOCKED, 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 19940C432BE for ; Thu, 26 Aug 2021 15:33:59 +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 4CFC360F25 for ; Thu, 26 Aug 2021 15:33:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4CFC360F25 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 8674983151; Thu, 26 Aug 2021 17:33:54 +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="vGrJOOsp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8BF8E82F26; Thu, 26 Aug 2021 17:33:50 +0200 (CEST) Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) (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 34C2A82F26 for ; Thu, 26 Aug 2021 17:33:45 +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-x1034.google.com with SMTP id om1-20020a17090b3a8100b0017941c44ce4so6837211pjb.3 for ; Thu, 26 Aug 2021 08:33:45 -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=U2kE4AlSEFIu1318UuA1ApN8s9avR1QjaUZLfY+p4u4=; b=vGrJOOspiJDfP+QqDDJVloJ6uyn3fFHX41fzjFyjOtPA74nwkJml4cPDDevhsa4NAq zxr8TCWunJApen5o185qlJaXEmzM4PkrlapSdtd+QuUS1/RdSp4Em8Zpv8L6Q8MoyT3E UWcVOkXRwRbQXZokHGm2qnkSsuVdVoSHAAKtX5T+lCrwDC70B7uk/wiJu1TQN0R021Ni 5+LwV+0TnjPfFof+pIsI7bqTg0z9we3SHzQFPaCjON+4nzLbkE6q8UwyUIsCPEjPNs0Q 5OiM/uxPmUQ2YnN3yZ8VJrM5i/7H5f0BIBrR8bnXZv4N6Tejfu4WrbLgyYNeVySR//HE zUWQ== 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=U2kE4AlSEFIu1318UuA1ApN8s9avR1QjaUZLfY+p4u4=; b=JvPPaagAF+w+HVJs+Vz7dLIbTthldGYx2KFEl0E/99Iv099nK9prOdHmiNvXal9Z2b 1vt3hNgnLsxGik3hagtkpdItMEi6Jq+AdYSh6eXt1+EUv4bs/N+5FSag0YdUaNFXKRyv mkq6F/w/BjsToC5uCS+AYiY74gDXV9jJQjNfPw1KBvs/xu26Pvj6RVO/WvSzPdWdRKms xrnSEFI0nYxFL8wXoyT+poEWqY81sEt51U5TYHUDkzCF89WG9/p1+lnTJbJ9qvLT+4Lp t0JM2XkYd5iGSp4eV/M2xsUkhSNBRi44PPOsfCk/5o3O8h+E4TkEpcUwg0GFUJ6h+QUY 4w+w== X-Gm-Message-State: AOAM532mHjUXW30Xn8QDEk4lrZeWt6syxRxzbOvfjC2SSb6LXw6le6YL bMk4HkTmiFssYSSQRXPiIUU= X-Google-Smtp-Source: ABdhPJywS0zblJf/stT6BnXAqs9qUn4/Kr1XIVTvdp8cSaychqZec7o2SBqYy0dPbbkaxtSpa8Srvw== X-Received: by 2002:a17:902:7401:b0:131:2333:1a34 with SMTP id g1-20020a170902740100b0013123331a34mr4277406pll.58.1629992023331; Thu, 26 Aug 2021 08:33:43 -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 n15sm3497518pff.149.2021.08.26.08.33.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Aug 2021 08:33:42 -0700 (PDT) From: Bin Meng To: Tom Rini , u-boot@lists.denx.de Subject: [PATCH v2 1/4] tools: docker: Bump up QEMU version to 6.1.0 Date: Thu, 26 Aug 2021 23:33:32 +0800 Message-Id: <20210826153335.27964-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. Let's manually apply the bug fix on top of the v6.1.0 release tag at the time being. [1] http://patchwork.ozlabs.org/project/qemu-devel/patch/20210823020813.25192-2-bmeng.cn@gmail.com/ Signed-off-by: Bin Meng --- Changes in v2: - Use QEMU official git repo, and 'git am' the bug fix manually tools/docker/Dockerfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 0195456dfe..4d7c3c6679 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 \ @@ -166,7 +167,12 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ RUN git clone git://git.qemu.org/qemu.git /tmp/qemu && \ cd /tmp/qemu && \ git submodule update --init dtc && \ - git checkout v4.2.0 && \ + git checkout v6.1.0 && \ + # 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-bmeng.cn@gmail.com/mbox/ | 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" && \ make -j$(nproc) all install && \ rm -rf /tmp/qemu -- 2.25.1