From 9df067bc3e2df3816ce1ddd001f2cb2e0e19bada Mon Sep 17 00:00:00 2001
From: Mark Hatle <mark.hatle@amd.com>
Date: Tue, 26 Mar 2024 19:14:02 -0600
Subject: xen: 4.17 version is incompatible

4.17 version of Xen is incompatible with Yocto Project scarthgap.

Python 3.12 related build failures and various compiler errors occur.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>
---
 meta-xilinx-virtualization/conf/layer.conf           |  8 ++------
 .../recipes-extended/xen/xen-tools_4.17.bb           | 18 ------------------
 .../recipes-extended/xen/xen-tools_4.17.bbappend     |  2 --
 .../recipes-extended/xen/xen-xilinx_4.17.inc         |  7 -------
 .../recipes-extended/xen/xen_4.17.bb                 | 19 -------------------
 .../recipes-extended/xen/xen_4.17.bbappend           | 20 --------------------
 6 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bb
 delete mode 100644 meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bbappend
 delete mode 100644 meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.17.inc
 delete mode 100644 meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bb
 delete mode 100644 meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bbappend

diff --git a/meta-xilinx-virtualization/conf/layer.conf b/meta-xilinx-virtualization/conf/layer.conf
index 5e03cde4..191cd2bd 100644
--- a/meta-xilinx-virtualization/conf/layer.conf
+++ b/meta-xilinx-virtualization/conf/layer.conf
@@ -18,10 +18,6 @@ LAYERDEPENDS_xilinx-virtualization = "\
 
 LAYERSERIES_COMPAT_xilinx-virtualization = "scarthgap"
 
-XILINX_XEN_VERSION[v2022.1] = "4.17-xilinx+git%"
-XILINX_XEN_VERSION[v2022.2] = "4.17-xilinx+git%"
-XILINX_XEN_VERSION[v2023.1] = "4.17-xilinx+git%"
-XILINX_XEN_VERSION[v2023.2] = "4.17-xilinx+git%"
 XILINX_XEN_VERSION[v2024.1] = "4.18-xilinx+git%"
-PREFERRED_VERSION_xen ?= "${@d.getVarFlag('XILINX_XEN_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
-PREFERRED_VERSION_xen-tools ?= "${@d.getVarFlag('XILINX_XEN_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
+PREFERRED_VERSION_xen ?= "${@d.getVarFlag('XILINX_XEN_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or '4.18%'}"
+PREFERRED_VERSION_xen-tools ?= "${@d.getVarFlag('XILINX_XEN_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or '4.18%'}"
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bb b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bb
deleted file mode 100644
index acc9184b..00000000
--- a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-# xen 4.17.0 release sha
-SRCREV ?= "11560248ffda3f00f20bbdf3ae088af474f7f2a3"
-
-XEN_URI ?= "git://xenbits.xen.org/xen.git"
-XEN_REL ?= "4.17"
-XEN_BRANCH ?= "stable-${XEN_REL}"
-
-SRC_URI = " \
-    ${XEN_URI};branch=${XEN_BRANCH} \
-    file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \
-    "
-
-LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
-
-S = "${WORKDIR}/git"
-
-require xen.inc
-require xen-tools.inc
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bbappend b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bbappend
deleted file mode 100644
index d033e1d2..00000000
--- a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-require xen-xilinx_4.17.inc
-require xen-tools-xilinx.inc
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.17.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.17.inc
deleted file mode 100644
index d7810b27..00000000
--- a/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.17.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-SRCREV = "38eebc6e5c6f7aa9180672a56d33217bf1ef1ca6"
-XEN_URI = "git://github.com/Xilinx/xen.git;protocol=https"
-XEN_BRANCH = "xlnx_rebase_4.17"
-
-PV .= "-xilinx+git${SRCPV}"
-
-DEFAULT_PREFERENCE = "+1"
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bb b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bb
deleted file mode 100644
index 41cf2a15..00000000
--- a/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-# xen 4.17.0 release sha
-SRCREV ?= "11560248ffda3f00f20bbdf3ae088af474f7f2a3"
-
-XEN_URI ?= "git://xenbits.xen.org/xen.git"
-XEN_REL ?= "4.17"
-XEN_BRANCH ?= "stable-${XEN_REL}"
-
-SRC_URI = " \
-    ${XEN_URI};branch=${XEN_BRANCH} \
-    file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \
-    file://xen-flask-race-fix.patch \
-    "
-
-LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
-
-S = "${WORKDIR}/git"
-
-require xen.inc
-require xen-hypervisor.inc
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bbappend b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bbappend
deleted file mode 100644
index a569a96d..00000000
--- a/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bbappend
+++ /dev/null
@@ -1,20 +0,0 @@
-require xen-xilinx_4.17.inc
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-RDEPENDS:${PN}-efi += "bash python3"
-
-do_deploy:append() {
-    # Mimic older behavior for compatibility
-    if [ -f ${DEPLOYDIR}/xen-${MACHINE} ]; then
-        ln -s xen-${MACHINE} ${DEPLOYDIR}/xen
-    fi
-
-    if [ -f ${DEPLOYDIR}/xen-${MACHINE}.gz ]; then
-        ln -s xen-${MACHINE}.gz ${DEPLOYDIR}/xen.gz
-    fi
-
-    if [ -f ${DEPLOYDIR}/xen-${MACHINE}.efi ]; then
-        ln -s xen-${MACHINE}.efi ${DEPLOYDIR}/xen.efi
-    fi
-}
-- 
cgit v1.2.3-54-g00ecf