xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Stefano Stabellini <sstabellini@kernel.org>
To: George Dunlap <george.dunlap@citrix.com>
Cc: xen-devel@lists.xenproject.org,
	Stefano Stabellini <sstabellini@kernel.org>
Subject: Re: [PATCH raisin v2 3/4] Update config-4.6 and config-4.5 to point to stable branches; fix config-master
Date: Wed, 15 Jun 2016 18:07:36 +0100 (BST)	[thread overview]
Message-ID: <alpine.DEB.2.10.1606151807280.18449@sstabellini-ThinkPad-X260> (raw)
In-Reply-To: <1466007710-28934-4-git-send-email-george.dunlap@citrix.com>

On Wed, 15 Jun 2016, George Dunlap wrote:
> 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 <george.dunlap@citrix.com>

Acked-by: Stefano Stabellini <sstabellini@kernel.org>


> v2:
>  - Use libvirt-master rather than xen-tested-master for config-master
>  - Fix seabios and ovmf revisions for config-master
> 
> CC: Stefano Stabellini <sstabellini@kernel.org>
> ---
>  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"
> -- 
> 2.1.4
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

  reply	other threads:[~2016-06-15 17:07 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-15 16:21 [PATCH raisin v2 0/4] Raisin: Fixes for 4.6 and master, update to 4.7 George Dunlap
2016-06-15 16:21 ` [PATCH raisin v2 1/4] components/xen: Actually disable rombios George Dunlap
2016-06-15 16:21 ` [PATCH raisin v2 2/4] config: Separate config urls into a separate file George Dunlap
2016-06-15 16:21 ` [PATCH raisin v2 3/4] Update config-4.6 and config-4.5 to point to stable branches; fix config-master George Dunlap
2016-06-15 17:07   ` Stefano Stabellini [this message]
2016-06-15 16:21 ` [PATCH raisin v2 4/4] Update to 4.7, update qemu and qemu_traditional recipes George Dunlap
2016-06-15 17:13   ` Stefano Stabellini
2016-06-15 17:18     ` George Dunlap
2016-06-16  9:51       ` Stefano Stabellini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=alpine.DEB.2.10.1606151807280.18449@sstabellini-ThinkPad-X260 \
    --to=sstabellini@kernel.org \
    --cc=george.dunlap@citrix.com \
    --cc=xen-devel@lists.xenproject.org \
    --subject='Re: [PATCH raisin v2 3/4] Update config-4.6 and config-4.5 to point to stable branches; fix config-master' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).