xen: Add recipes for stable Xen 4.16 release and update master

Add recipes for Xen 4.16 release as, according to the documentation
we shall have recipes for the latest stable major version of Xen
before the next Yocto release. Bump PREFERED_VERSION to 4.16 as well.

Take the opportunity to update SRCREV of xen recipes for master
and bump XEN_REL version to 4.17 as this is the current development
version.

Signed-off-by: Michal Orzel <michal.orzel@arm.com>
Reviewed-by: Christopher Clark <christopher.w.clark@gmail.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

5 files changed, 46 insertions, 8 deletions

diff --git a/conf/distro/include/meta-virt-default-versions.inc b/conf/distro/include/meta-virt-default-versions.inc
index 8a2db702..b2ce0210 100644
--- a/conf/distro/include/meta-virt-default-versions.inc
+++ b/conf/distro/include/meta-virt-default-versions.inc
@@ -1,4 +1,4 @@
 # Meta-virtuailization PREFERED_VERSION
 
-PREFERRED_VERSION_xen ?= "4.15+stable%"
-PREFERRED_VERSION_xen-tools ?= "4.15+stable%"
+PREFERRED_VERSION_xen ?= "4.16+stable%"
+PREFERRED_VERSION_xen-tools ?= "4.16+stable%"
diff --git a/recipes-extended/xen/xen-tools_4.16.bb b/recipes-extended/xen/xen-tools_4.16.bb
new file mode 100644
index 00000000..ae1ae8ae
--- /dev/null
+++ b/recipes-extended/xen/xen-tools_4.16.bb
@@ -0,0 +1,19 @@
+# xen 4.16.1 release sha
+SRCREV ?= "f26544492298cb82d66f9bf36e29d2f75b3133f2"
+
+XEN_REL ?= "4.16"
+XEN_BRANCH ?= "stable-${XEN_REL}"
+
+SRC_URI = " \
+    git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
+    file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \
+    "
+
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
+
+PV = "${XEN_REL}+stable${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+require xen.inc
+require xen-tools.inc
diff --git a/recipes-extended/xen/xen-tools_git.bb b/recipes-extended/xen/xen-tools_git.bb
index e733f1d6..a450a7d6 100644
--- a/recipes-extended/xen/xen-tools_git.bb
+++ b/recipes-extended/xen/xen-tools_git.bb
@@ -1,7 +1,7 @@
-# master status on 2022-03-08
-SRCREV ?= "9d4a44380d273de22d5753883cbf5581795ff24d"
+# master status on 2022-04-05
+SRCREV ?= "14dd241aad8af447680ac73e8579990e2c09c1e7"
 
-XEN_REL ?= "4.16"
+XEN_REL ?= "4.17"
 XEN_BRANCH ?= "master"
 
 SRC_URI = " \
diff --git a/recipes-extended/xen/xen_4.16.bb b/recipes-extended/xen/xen_4.16.bb
new file mode 100644
index 00000000..986484a4
--- /dev/null
+++ b/recipes-extended/xen/xen_4.16.bb
@@ -0,0 +1,19 @@
+# xen 4.16.1 release sha
+SRCREV ?= "f26544492298cb82d66f9bf36e29d2f75b3133f2"
+
+XEN_REL ?= "4.16"
+XEN_BRANCH ?= "stable-${XEN_REL}"
+
+SRC_URI = " \
+    git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
+    file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \
+    "
+
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=419739e325a50f3d7b4501338e44a4e5"
+
+PV = "${XEN_REL}+stable${SRCPV}"
+
+S = "${WORKDIR}/git"
+
+require xen.inc
+require xen-hypervisor.inc
diff --git a/recipes-extended/xen/xen_git.bb b/recipes-extended/xen/xen_git.bb
index 2fbfb548..ebd1b76f 100644
--- a/recipes-extended/xen/xen_git.bb
+++ b/recipes-extended/xen/xen_git.bb
@@ -1,7 +1,7 @@
-# master status on 2022-03-08
-SRCREV ?= "9d4a44380d273de22d5753883cbf5581795ff24d"
+# master status on 2022-04-05
+SRCREV ?= "14dd241aad8af447680ac73e8579990e2c09c1e7"
 
-XEN_REL ?= "4.16"
+XEN_REL ?= "4.17"
 XEN_BRANCH ?= "master"
 
 SRC_URI = " \