xen: Add bbapends and inc file to use Xilinx Xen 4.18

1. In upstream 4.18 recipes add XEN_URI variable and set xen upstream
   url as conditional assignment. Also unset PV and DEFAULT_PREFERENCE.
2. Add xen_4.18 and xen-tools_4.18 bbapends files use AMD Xilinx Xen
   4.18.0.
3. Add xen-xilinx_4.18.inc file and include AMD Xilinx Xen 4.18.0 repo
   details and also set PV to make it clear this a forked version.

Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>

5 files changed, 33 insertions, 10 deletions

diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.18.bb b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.18.bb
index a3b1e344..8baa2f53 100644
--- a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.18.bb
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.18.bb
@@ -1,21 +1,18 @@
 # tag: RELEASE-4.18.0
 SRCREV ?= "d75f1e9b74314cea91ce435730d4e3539ecca77d"
 
+XEN_URI ?= "git://xenbits.xen.org/xen.git"
 XEN_REL ?= "4.18"
 XEN_BRANCH ?= "stable-4.18"
 
 SRC_URI = " \
-    git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
+    ${XEN_URI};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/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.18.bbappend b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.18.bbappend
new file mode 100644
index 00000000..86702979
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.18.bbappend
@@ -0,0 +1,2 @@
+require xen-xilinx_4.18.inc
+require xen-tools-xilinx.inc
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.18.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.18.inc
new file mode 100644
index 00000000..6ab22816
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.18.inc
@@ -0,0 +1,7 @@
+SRCREV = "6c8d45643aad8fcfe0e4b31ae9b36ceeb2bf91c5"
+XEN_URI = "git://github.com/Xilinx/xen.git;protocol=https"
+XEN_BRANCH = "xlnx_rebase_4.18"
+
+PV .= "-xilinx+git${SRCPV}"
+
+DEFAULT_PREFERENCE = "+1"
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen_4.18.bb b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.18.bb
index 8da44559..d2a09a89 100644
--- a/meta-xilinx-virtualization/recipes-extended/xen/xen_4.18.bb
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.18.bb
@@ -1,21 +1,18 @@
 # tag: RELEASE-4.18.0
 SRCREV ?= "d75f1e9b74314cea91ce435730d4e3539ecca77d"
 
+XEN_URI ?= "git://xenbits.xen.org/xen.git"
 XEN_REL ?= "4.18"
 XEN_BRANCH ?= "stable-4.18"
 
 SRC_URI = " \
-    git://xenbits.xen.org/xen.git;branch=${XEN_BRANCH} \
+    ${XEN_URI};branch=${XEN_BRANCH} \
     file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.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
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen_4.18.bbappend b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.18.bbappend
new file mode 100644
index 00000000..e2c75566
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.18.bbappend
@@ -0,0 +1,20 @@
+require xen-xilinx_4.18.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
+}