Merge pull request #1739 from quaresmajose/master-6.1.36.-jail

jailhouse-imx: upgrade to 6.1.36-2.1.0

2 files changed, 5 insertions, 72 deletions

diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb
index dcfe181e..9c03436c 100644
--- a/recipes-extended/jailhouse/jailhouse-imx_git.bb
+++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb
@@ -16,10 +16,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
 PROVIDES = "jailhouse"
 RPROVIDES:${PN} += "jailhouse"
 
-SRCBRANCH = "lf-6.1.22_2.0.0"
-SRCREV = "e090abc70bb395f705f85659ad92bdafbe407628"
+SRCBRANCH = "lf-6.1.36_2.1.0"
+SRCREV = "d3484c68313c2c837eb213ca1aa373e491fbc55f"
 
-SRC_URI = "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https;branch=${SRCBRANCH}"
+IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https"
+SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH}"
 
 DEPENDS = " \
     make-native \
@@ -91,6 +92,7 @@ FILES:${PN}:remove = "${libdir}/*"
 FILES:pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}"
 
 RDEPENDS:${PN} += " \
+    pyjailhouse \
     python3-curses \
     python3-datetime \
     python3-mmap \
diff --git a/recipes-extended/jailhouse/jailhouse/0001-tools-scripts-update-shebang-to-python3.patch b/recipes-extended/jailhouse/jailhouse/0001-tools-scripts-update-shebang-to-python3.patch
deleted file mode 100644
index df2f37ad..00000000
--- a/recipes-extended/jailhouse/jailhouse/0001-tools-scripts-update-shebang-to-python3.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From f07cd0e5f32a00a4091fa964d0dae0cd46c17554 Mon Sep 17 00:00:00 2001
-From: Cristinel Panfir <cristinel.panfir@nxp.com>
-Date: Sat, 23 May 2020 08:51:31 +0000
-Subject: [PATCH] tools/scripts: update shebang to python3
-
-Upstream-Status: Pending
-
-Signed-off-by: Cristinel Panfir <cristinel.panfir@nxp.com>
----
- scripts/arm64-parsedump.py     | 2 +-
- tools/jailhouse-cell-linux     | 2 +-
- tools/jailhouse-cell-stats     | 2 +-
- tools/jailhouse-config-create  | 2 +-
- tools/jailhouse-hardware-check | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/scripts/arm64-parsedump.py b/scripts/arm64-parsedump.py
-index 9519eb5..c695706 100755
---- a/scripts/arm64-parsedump.py
-+++ b/scripts/arm64-parsedump.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # Jailhouse, a Linux-based partitioning hypervisor
- #
-diff --git a/tools/jailhouse-cell-linux b/tools/jailhouse-cell-linux
-index 215932a..bcbb902 100755
---- a/tools/jailhouse-cell-linux
-+++ b/tools/jailhouse-cell-linux
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # Jailhouse, a Linux-based partitioning hypervisor
- #
-diff --git a/tools/jailhouse-cell-stats b/tools/jailhouse-cell-stats
-index 2f7e966..4c5289f 100755
---- a/tools/jailhouse-cell-stats
-+++ b/tools/jailhouse-cell-stats
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # Jailhouse, a Linux-based partitioning hypervisor
- #
-diff --git a/tools/jailhouse-config-create b/tools/jailhouse-config-create
-index 55601a6..9869b94 100755
---- a/tools/jailhouse-config-create
-+++ b/tools/jailhouse-config-create
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Jailhouse, a Linux-based partitioning hypervisor
- #
-diff --git a/tools/jailhouse-hardware-check b/tools/jailhouse-hardware-check
-index b86756a..0c8fb42 100755
---- a/tools/jailhouse-hardware-check
-+++ b/tools/jailhouse-hardware-check
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- # Jailhouse, a Linux-based partitioning hypervisor
- #
--- 
-2.7.4
-