From patchwork Mon Jun 28 13:42:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 12348075 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=-24.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 54BBEC2B9F4 for ; Mon, 28 Jun 2021 13:42:57 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 12C0561883 for ; Mon, 28 Jun 2021 13:42:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 12C0561883 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.147879.272997 (Exim 4.92) (envelope-from ) id 1lxrX2-0006um-4B; Mon, 28 Jun 2021 13:42:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 147879.272997; Mon, 28 Jun 2021 13:42:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lxrX2-0006uf-17; Mon, 28 Jun 2021 13:42:36 +0000 Received: by outflank-mailman (input) for mailman id 147879; Mon, 28 Jun 2021 13:42:34 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lxrX0-0006uZ-GC for xen-devel@lists.xenproject.org; Mon, 28 Jun 2021 13:42:34 +0000 Received: from esa1.hc3370-68.iphmx.com (unknown [216.71.145.142]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 79d6af25-9e46-4954-944d-a37b6652b773; Mon, 28 Jun 2021 13:42:33 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 79d6af25-9e46-4954-944d-a37b6652b773 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1624887753; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=5GABtzq/aApw+RmaCklAMEhAkSpVLs8/ZGT9NtYDllw=; b=IrLyyvs+5M2lB2mwgDyT5AaKKizPBRcejdxVOdLJmu17g+kmmRsMAzqi WRPtFf7UY38NBP8aW78PR7aG5wdpL8jkUHiTAtjmhO3rEtuQgwgLKiDHz eWTlMC5SLLoaWcTfTvQQdHx0kGgOp+Wqrc1YplgYy180Bgu5VdCg7TOuq c=; Authentication-Results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: LOVd+2YJSp/+4OH/j3/N4E1gvEKfNex1rOR3qesyCciiE+fJtZZNMhfg3zvi3Z5+HjhH+uXgdA qrw89qXWLp3Ym16c+AotBa1ExQaeQxJQ9hzN0xTakk9of4kuGV5oOXRbNzj2+fRKQA5OWE9jcV eb00YJALzi/16TrTTIMF97MWbf4ogMcx5bl5dNJcVaWUf0ITNfOVXBdWnjGKKd1N8ePs72iYOw 8z8C7kn+yGZkONYVGKPlfOqzeWfO9fE71V+oEjp7h66a1tl1SpR1OpF5tuPGlUMQ2CTrplyjBM 3tU= X-SBRS: 5.1 X-MesageID: 47472394 X-Ironport-Server: esa1.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED IronPort-HdrOrdr: A9a23:evEiqqB3klI8HDTlHemm55DYdb4zR+YMi2TC1yhKJiC9Ffbo8v xG/c5rsiMc5wxxZJhNo7290cq7MBHhHPxOgbX5VI3KNGKNhILBFvAH0WKI+VPd8kPFmtK1rZ 0QEJRDNA== X-IronPort-AV: E=Sophos;i="5.83,306,1616472000"; d="scan'208";a="47472394" From: Anthony PERARD To: CC: Anthony PERARD , Andrew Cooper , George Dunlap , "Ian Jackson" , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu Subject: [XEN PATCH] Config.mk: re-pin OVMF changeset and unpin qemu-xen Date: Mon, 28 Jun 2021 14:42:17 +0100 Message-ID: <20210628134217.47622-1-anthony.perard@citrix.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 qemu-xen tree have a osstest gate and doesn't need to be pinned. On the other hand, OVMF's xen repository doesn't have a gate and needs to be pinned. The "master" branch correspond now to the tag "edk2-stable202105", so pin to that commit. Fixes: a04509d34d72 ("Branching: Update version files etc. for newly unstable") Signed-off-by: Anthony PERARD Acked-by: Ian Jackson --- Config.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index 9a174c77f383..f9dce4549b7c 100644 --- a/Config.mk +++ b/Config.mk @@ -244,8 +244,8 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-traditional.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif -OVMF_UPSTREAM_REVISION ?= master -QEMU_UPSTREAM_REVISION ?= 7ea428895af2840d85c524f0bd11a38aac308308 +OVMF_UPSTREAM_REVISION ?= e1999b264f1f9d7230edf2448f757c73da567832 +QEMU_UPSTREAM_REVISION ?= master MINIOS_UPSTREAM_REVISION ?= 051b87bb9c19609976fb038f386920e1ce5454c5 SEABIOS_UPSTREAM_REVISION ?= rel-1.14.0