Update config-4.6 and config-4.5 to point to stable branches; fix config-master

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>

diff --git a/configs/config-4.5 b/configs/config-4.5
index 4163b68e61220dff966684fcd5d403df326e516a..8db9a9de4ac07f06af7a2b23f17101f40f5b5f19 100644 (file)
--- 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 e8b2a09866a55c2c343dec2ab7c165f9c9ad11c1..b003a30801e7684c1f52ca367f48c885fecb7268 100644 (file)
--- 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 bd26ce3151157a3337ab5bd78657999b320c180c..8d8ad7eeebadc86e5d8c309d13a8ac0d9dce51e4 100644 (file)
--- 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 79813c4cad16353826d8e94e8af917feeeeaa83a..614f522ba8dfa5debe9dbc15a91d80e51c288dd8 100644 (file)
--- 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"