1 files changed, 13 insertions, 15 deletions

diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb
index 13746abc6..1b265cc57 100644
--- a/recipes-extended/jailhouse/jailhouse-imx_git.bb
+++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb
@@ -14,27 +14,23 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
                     file://driver/jailhouse.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \
 "
 
-PROVIDES = "jailhouse"
-RPROVIDES:${PN} += "jailhouse"
+DEPENDS = "\
+    dtc-native \
+    make-native \
+    python3-mako \
+    python3-mako-native \
+"
 
-SRCBRANCH = "lf-6.12.20_2.0.0"
-SRCREV = "399d65450e9a377b4aaff4b0627619174e1c8c46"
+PROVIDES = "jailhouse"
 
 PV = "2023.03+git${SRCPV}"
 
+SRCBRANCH = "lf-6.18.20_2.0.0"
 IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https"
 SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH} \
            file://arm-arm64-Makefile-Remove-march-option-from-Makefile.patch \
-           file://0001-YOCIMX-9281-1-Fix-gcc15-errors.patch \
-           file://0002-YOCIMX-9281-2-hypervisor-arm64-fix-strh-usage.patch \
            "
-
-DEPENDS = "\
-    make-native \
-    python3-mako-native \
-    python3-mako \
-    dtc-native \
-"
+SRCREV = "8d6d397f7f88f4bd0d9f99933a13163266d09099"
 
 inherit module bash-completion deploy setuptools3
 
@@ -90,12 +86,12 @@ do_install:append() {
     install ${B}/inmates/tools/${JH_ARCH}/linux-loader.bin ${D}${INMATES_DIR}/tools/${JH_ARCH}
 }
 
-PACKAGE_BEFORE_PN = "pyjailhouse"
+PACKAGE_BEFORE_PN += "pyjailhouse"
 
 FILES:${PN} += "${nonarch_base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}"
 # Remove libdir/* appended by setuptools3-base.bbclass for module split to work correctly
 FILES:${PN}:remove = "${libdir}/*"
-FILES:pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}"
+FILES:pyjailhouse += "${PYTHON_SITEPACKAGES_DIR}"
 
 RDEPENDS:${PN} += "\
     pyjailhouse \
@@ -111,6 +107,8 @@ RDEPENDS:pyjailhouse = "\
     python3-shell \
 "
 
+RPROVIDES:${PN} += "jailhouse"
+
 INSANE_SKIP:${PN} = "ldflags buildpaths"
 INSANE_SKIP:${PN}-dbg = "buildpaths"