xen: upgrade to Xen 4.14 as default and advance the git recipe version

Release announcement for Xen 4.14:
https://lists.xenproject.org/archives/html/xen-devel/2020-07/msg01263.html

Make the 4.14 recipe the default preference and advance the git recipe
onto the current 4.15 development branch. Retire the patches for the
earlier versions.

Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/recipes-extended/xen/xen-tools_git.bb b/recipes-extended/xen/xen-tools_git.bb
index 679feb11..71aeeed8 100644
--- a/recipes-extended/xen/xen-tools_git.bb
+++ b/recipes-extended/xen/xen-tools_git.bb
@@ -1,21 +1,21 @@
-SRCREV ?= "9f7e8bac4ca279b3bfccb5f3730fb2e5398c95ab"
+SRCREV ?= "8c4532f19d6925538fb0c938f7de9a97da8c5c3b"
 
-XEN_REL ?= "4.13"
-XEN_BRANCH ?= "stable-${XEN_REL}"
+XEN_REL ?= "4.15"
+XEN_BRANCH ?= "master"
 
 SRC_URI = " \
     git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
-    file://0001-python-pygrub-pass-DISTUTILS-xen.4.12.patch \
-    file://0001-xen-build-temporarily-inhibit-Werror.patch \
-    file://xen-tools-kdd-stop-using-0-arrays-to-access-packet-contents.patch \
-    file://xen-tools-kdd-fix-build-again.patch \
+    file://0001-python-pygrub-pass-DISTUTILS-xen-4.14.patch \
+    file://0001-xen-build-temporarily-inhibit-Werror-4.14.patch \
     "
 
-LIC_FILES_CHKSUM ?= "file://COPYING;md5=4295d895d4b5ce9d070263d52f030e49"
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
 
 PV = "${XEN_REL}+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 
+DEFAULT_PREFERENCE ??= "-1"
+
 require xen.inc
 require xen-tools.inc