From 934639c311785fce34a5bcb46cf5c4f65dbae5b6 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Fri, 15 Dec 2023 17:36:37 +0200 Subject: jailhouse-imx: Add pyjailhouse to RDEPENDS Install the python jailhouse lib for testing purpose. Signed-off-by: Oleksandr Suvorov --- recipes-extended/jailhouse/jailhouse-imx_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb index dcfe181ec..2079fd39e 100644 --- a/recipes-extended/jailhouse/jailhouse-imx_git.bb +++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb @@ -91,6 +91,7 @@ FILES:${PN}:remove = "${libdir}/*" FILES:pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}" RDEPENDS:${PN} += " \ + pyjailhouse \ python3-curses \ python3-datetime \ python3-mmap \ -- cgit v1.2.3-54-g00ecf From 11ad2ca6a85cd28eb064c7539ab9516d9ffec7d4 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Sun, 17 Dec 2023 15:24:05 +0200 Subject: jailhouse-imx: make repo URL configurable Make recipe aligned with NXP way and use a configurable variable for a project repo. Signed-off-by: Oleksandr Suvorov --- recipes-extended/jailhouse/jailhouse-imx_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb index 2079fd39e..842e2d976 100644 --- a/recipes-extended/jailhouse/jailhouse-imx_git.bb +++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb @@ -19,7 +19,8 @@ RPROVIDES:${PN} += "jailhouse" SRCBRANCH = "lf-6.1.22_2.0.0" SRCREV = "e090abc70bb395f705f85659ad92bdafbe407628" -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 \ -- cgit v1.2.3-54-g00ecf From ab4afc5c3d385475bc10e3ad5e956ce8d2003dc0 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Sun, 17 Dec 2023 15:27:31 +0200 Subject: jailhouse-imx: Upgrade to 6.1.36-2.1.0 Upgrade the jailhouse to the version used in NXP BSP LF6.1.36-2.1.0. Relevant changes: - d3484c68 MLK-26114 solve the problem that .NOTINTERMEDIATE and .SECONDARY are mutually exclusive - bcce5bc4 LF-9101 solve the problem that Jailhouse cannot be compiled Signed-off-by: Oleksandr Suvorov --- recipes-extended/jailhouse/jailhouse-imx_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb index 842e2d976..9c03436c2 100644 --- a/recipes-extended/jailhouse/jailhouse-imx_git.bb +++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb @@ -16,8 +16,8 @@ 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" IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https" SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH}" -- cgit v1.2.3-54-g00ecf From e04bc9be8d05f5488170b7d066cfddbe7770ee71 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Thu, 25 Jan 2024 15:39:41 +0000 Subject: jailhouse-imx: drop unused patch Signed-off-by: Jose Quaresma --- ...1-tools-scripts-update-shebang-to-python3.patch | 69 ---------------------- 1 file changed, 69 deletions(-) delete mode 100644 recipes-extended/jailhouse/jailhouse/0001-tools-scripts-update-shebang-to-python3.patch 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 df2f37ada..000000000 --- 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 -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 ---- - 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 - -- cgit v1.2.3-54-g00ecf