5 files changed, 68 insertions, 21 deletions

diff --git a/recipes-extended/xen/files/0001-arm-silence-gcc14-warning-error-on-irq-bounds-check.patch b/recipes-extended/xen/files/0001-arm-silence-gcc14-warning-error-on-irq-bounds-check.patch
index a3dbbbb4..637d6fe5 100644
--- a/recipes-extended/xen/files/0001-arm-silence-gcc14-warning-error-on-irq-bounds-check.patch
+++ b/recipes-extended/xen/files/0001-arm-silence-gcc14-warning-error-on-irq-bounds-check.patch
@@ -21,11 +21,11 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  xen/arch/arm/irq.c | 19 ++++++++++++-------
  1 file changed, 12 insertions(+), 7 deletions(-)
 
-diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
-index ae69fb4aeb..dcac86bd84 100644
---- a/xen/arch/arm/irq.c
-+++ b/xen/arch/arm/irq.c
-@@ -58,8 +58,13 @@ hw_irq_controller no_irq_type = {
+Index: git/xen/arch/arm/irq.c
+===================================================================
+--- git.orig/xen/arch/arm/irq.c
++++ git/xen/arch/arm/irq.c
+@@ -48,8 +48,13 @@ void irq_end_none(struct irq_desc *irq)
  static irq_desc_t irq_desc[NR_IRQS];
  static DEFINE_PER_CPU(irq_desc_t[NR_LOCAL_IRQS], local_irq_desc);
  
@@ -39,7 +39,7 @@ index ae69fb4aeb..dcac86bd84 100644
      if ( irq < NR_LOCAL_IRQS )
          return &this_cpu(local_irq_desc)[irq];
  
-@@ -723,16 +728,16 @@ int platform_get_irq(const struct dt_device_node *device, int index)
+@@ -722,16 +727,16 @@ int platform_get_irq(const struct dt_dev
  
  int platform_get_irq_byname(const struct dt_device_node *np, const char *name)
  {
@@ -63,6 +63,3 @@ index ae69fb4aeb..dcac86bd84 100644
  }
  
  /*
--- 
-2.39.2
-
diff --git a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch
index 7ac1a399..bfd1acb4 100644
--- a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch
+++ b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch
@@ -1,10 +1,10 @@
 Upstream-Status: Pending
 
-diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
-index 4963bc89c6..c1c05eb421 100644
---- a/tools/pygrub/Makefile
-+++ b/tools/pygrub/Makefile
-@@ -13,14 +13,14 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLA
+Index: git/tools/pygrub/Makefile
+===================================================================
+--- git.orig/tools/pygrub/Makefile
++++ git/tools/pygrub/Makefile
+@@ -13,14 +13,14 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAG
  all: build
  .PHONY: build
  build:
@@ -19,13 +19,13 @@ index 4963bc89c6..c1c05eb421 100644
 -               --root="$(DESTDIR)" --force
 +               --root="$(DESTDIR)" --force  $(DISTUTILS_INSTALL_ARGS)
         $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub
-        set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \
-                     "`readlink -f $(DESTDIR)/$(bindir)`" != \
-diff --git a/tools/python/Makefile b/tools/python/Makefile
-index 437431c48e..0a99c2067e 100644
---- a/tools/python/Makefile
-+++ b/tools/python/Makefile
-@@ -16,13 +16,13 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLA
+ 
+ .PHONY: uninstall
+Index: git/tools/python/Makefile
+===================================================================
+--- git.orig/tools/python/Makefile
++++ git/tools/python/Makefile
+@@ -16,13 +16,13 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAG
  
  .PHONY: build
  build:
diff --git a/recipes-extended/xen/xen-tools.inc b/recipes-extended/xen/xen-tools.inc
index 5f010a5d..72d0b377 100644
--- a/recipes-extended/xen/xen-tools.inc
+++ b/recipes-extended/xen/xen-tools.inc
@@ -213,6 +213,7 @@ PACKAGES = " \
     ${PN}-test \
     ${PN}-xen-vmtrace \
     ${PN}-xen-mceinj \
+    ${PN}-xen-9pfsd \
     "
 
 PROVIDES =+ " \
@@ -594,6 +595,12 @@ FILES:${PN}-xenstored = "\
     ${localstatedir}/lib/xenstored \
     "
 
+FILES:${PN}-xen-9pfsd = "\
+    ${libdir}/xen/bin/xen-9pfsd \
+    "
+# 9pfsd is only on xen-4.19+
+ALLOW_EMPTY:${PN}-xen-9pfsd = "1"
+
 FILES:${PN}-xentrace = "\
     ${bindir}/xentrace \
     ${bindir}/xentrace_setsize \
diff --git a/recipes-extended/xen/xen-tools_4.19.bb b/recipes-extended/xen/xen-tools_4.19.bb
new file mode 100644
index 00000000..68a9491f
--- /dev/null
+++ b/recipes-extended/xen/xen-tools_4.19.bb
@@ -0,0 +1,21 @@
+# tag: RELEASE-4.19.0
+SRCREV ?= "026c9fa29716b0ff0f8b7c687908e71ba29cf239"
+
+XEN_REL ?= "4.19"
+XEN_BRANCH ?= "stable-4.19"
+
+SRC_URI = " \
+    git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
+    file://0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch \
+    "
+
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
+
+PV = "${XEN_REL}+stable"
+
+S = "${WORKDIR}/git"
+
+DEFAULT_PREFERENCE ??= "-1"
+
+require xen.inc
+require xen-tools.inc
diff --git a/recipes-extended/xen/xen_4.19.bb b/recipes-extended/xen/xen_4.19.bb
new file mode 100644
index 00000000..6d3ecfa2
--- /dev/null
+++ b/recipes-extended/xen/xen_4.19.bb
@@ -0,0 +1,22 @@
+# tag: RELEASE-4.19.0
+SRCREV ?= "026c9fa29716b0ff0f8b7c687908e71ba29cf239"
+
+XEN_REL ?= "4.19.0"
+XEN_BRANCH ?= "stable-4.19"
+
+SRC_URI = " \
+    git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
+    file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \
+    file://0001-arm-silence-gcc14-warning-error-on-irq-bounds-check.patch \
+    "
+
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
+
+PV = "${XEN_REL}+stable"
+
+S = "${WORKDIR}/git"
+
+DEFAULT_PREFERENCE ??= "-1"
+
+require xen.inc
+require xen-hypervisor.inc