From patchwork Wed Jun 15 16:21:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Dunlap X-Patchwork-Id: 9178943 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CD018604DB for ; Wed, 15 Jun 2016 16:25:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF53B20223 for ; Wed, 15 Jun 2016 16:25:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B453827DA4; Wed, 15 Jun 2016 16:25:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4E79327D4A for ; Wed, 15 Jun 2016 16:25:27 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDDb2-0007wH-38; Wed, 15 Jun 2016 16:23:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bDDb1-0007vv-BE for xen-devel@lists.xenproject.org; Wed, 15 Jun 2016 16:23:15 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id C3/C8-23871-2F081675; Wed, 15 Jun 2016 16:23:14 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeJIrShJLcpLzFFi42JxWrohUvdTQ2K 4wZevghbft0xmcmD0OPzhCksAYxRrZl5SfkUCa0bzxwfsBd8lKvpmvGFvYHwh1sXIySEh4C9x Zs08VhCbTUBPYt7xryxdjBwcIgIqErf3GoCEmQWiJCb3NDCB2MICeRINZ9aDlbAIqEq8O5kPE uYV8JDovz6NEWKinMT54z+ZQWxOAU+JndfPgk0XAqqZf+suC4StKrH4wVF2iF5BiZMzn7BArJ KQOPjiBTPEHG6J26enMk9g5JuFpGwWkrIFjEyrGDWKU4vKUot0DQ30kooy0zNKchMzc4A8Y73 c1OLixPTUnMSkYr3k/NxNjMCAqmdgYNzBuK3L+RCjJAeTkiivaGViuBBfUn5KZUZicUZ8UWlO avEhRhkODiUJ3hn1QDnBotT01Iq0zBxgaMOkJTh4lER4X4CkeYsLEnOLM9MhUqcYFaXEefeAJ ARAEhmleXBtsHi6xCgrJczLyMDAIMRTkFqUm1mCKv+KUZyDUUmYlwcYnUI8mXklcNNfAS1mAl psMz0eZHFJIkJKqoExj6Fly8G2CfL+78r+Twha++RQ5eb/qlJyX9x7Sj7929D8cn2D847mJdm eDfM4ligv+ryyodx2TrrlQ3vf5lhZh98/qn6F/vhl/VmaYZeh4Bb/bjuu5xlvtPy0rzx3fXfi hMWc93/4M16k9LJdNu+6eS5Ouk/M+pP02r2v9Vyc5y0U28bpafVciaU4I9FQi7moOBEAEjq2j 6ICAAA= X-Env-Sender: prvs=96798de7a=George.Dunlap@citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1466007789!44989980!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10291 invoked from network); 15 Jun 2016 16:23:14 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-13.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 15 Jun 2016 16:23:14 -0000 X-IronPort-AV: E=Sophos;i="5.26,476,1459814400"; d="scan'208";a="360652987" From: George Dunlap To: Date: Wed, 15 Jun 2016 17:21:49 +0100 Message-ID: <1466007710-28934-4-git-send-email-george.dunlap@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1466007710-28934-1-git-send-email-george.dunlap@citrix.com> References: <1466007710-28934-1-git-send-email-george.dunlap@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Stefano Stabellini , George Dunlap Subject: [Xen-devel] [PATCH raisin v2 3/4] Update config-4.6 and config-4.5 to point to stable branches; fix config-master X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Point xen, qemu, and qemu-trad to stable-4.5 and -4.6 branches. And point the default libvirt to point to the libvirt 1.3.3 maintenance branch, rather than xen-tested-master. Also update OVMF revision for 4.6 to a version that builds with modern gccs. Point config-master libvirt to libvirt's "master" rather than xenbits' xen-tested-master, to avoid having to switch to xenbits repo. Finally, fix config-master by pointing ovmf and seabios to the correct branch (master, not xen-tested-master). Singed-off-by: George Dunlap Acked-by: Stefano Stabellini --- v2: - Use libvirt-master rather than xen-tested-master for config-master - Fix seabios and ovmf revisions for config-master CC: Stefano Stabellini --- configs/config-4.5 | 6 +++--- configs/config-4.6 | 8 ++++---- configs/config-master | 6 +++--- configs/config-url-git | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configs/config-4.5 b/configs/config-4.5 index 4163b68..8db9a9d 100644 --- a/configs/config-4.5 +++ b/configs/config-4.5 @@ -1,8 +1,8 @@ XEN_REVISION="origin/stable-4.5" -QEMU_REVISION="master" -QEMU_TRADITIONAL_REVISION="master" +QEMU_REVISION="origin/stable-4.5" +QEMU_TRADITIONAL_REVISION="origin/stable-4.5" SEABIOS_REVISION="rel-1.7.5" GRUB_REVISION="master" -LIBVIRT_REVISION="origin/xen-tested-master" +LIBVIRT_REVISION="origin/v1.3.3-maint" OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd" LINUX_REVISION="master" diff --git a/configs/config-4.6 b/configs/config-4.6 index e8b2a09..b003a30 100644 --- a/configs/config-4.6 +++ b/configs/config-4.6 @@ -1,8 +1,8 @@ XEN_REVISION="origin/stable-4.6" -QEMU_REVISION="master" -QEMU_TRADITIONAL_REVISION="master" +QEMU_REVISION="origin/stable-4.6" +QEMU_TRADITIONAL_REVISION="origin/stable-4.6" SEABIOS_REVISION="rel-1.8.2" GRUB_REVISION="master" -LIBVIRT_REVISION="origin/xen-tested-master" -OVMF_REVISION="cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd" +LIBVIRT_REVISION="origin/v1.3.3-maint" +OVMF_REVISION="52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d" LINUX_REVISION="master" diff --git a/configs/config-master b/configs/config-master index bd26ce3..8d8ad7e 100644 --- a/configs/config-master +++ b/configs/config-master @@ -1,8 +1,8 @@ XEN_REVISION="master" QEMU_REVISION="master" QEMU_TRADITIONAL_REVISION="master" -SEABIOS_REVISION="origin/xen-tested-master" +SEABIOS_REVISION="master" +OVMF_REVISION="master" GRUB_REVISION="master" -LIBVIRT_REVISION="origin/xen-tested-master" -OVMF_REVISION="origin/xen-tested-master" +LIBVIRT_REVISION="master" LINUX_REVISION="master" diff --git a/configs/config-url-git b/configs/config-url-git index 79813c4..614f522 100644 --- a/configs/config-url-git +++ b/configs/config-url-git @@ -3,6 +3,6 @@ QEMU_URL="git://xenbits.xen.org/qemu-xen.git" QEMU_TRADITIONAL_URL="git://xenbits.xen.org/qemu-xen-traditional.git" SEABIOS_URL="git://xenbits.xen.org/seabios.git" GRUB_URL="git://git.savannah.gnu.org/grub.git" -LIBVIRT_URL="git://xenbits.xen.org/libvirt.git" +LIBVIRT_URL="git://libvirt.org/libvirt.git" OVMF_URL="git://xenbits.xen.org/ovmf.git" LINUX_URL="git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"