From 9b943659589e685d1bd706f98645215dce9aa44a Mon Sep 17 00:00:00 2001 From: "Rodrigo M. Duarte" Date: Thu, 29 Oct 2026 17:10:25 -0300 Subject: jailhouse-imx: Upgrade to NXP lf-6.18.37_2.1.0 Move to the lf-6.18.37_2.1.0 branch. The new SRCREV is two commits ahead of the previous one: i.MX937 cell configurations and an SBOM update. No driver or hypervisor code changes. The NXP bbappend for this release also adds a revert of the bin_attribute version check (6.16 -> 6.15). It is not carried here: every kernel we build against is 6.18 or newer, so both checks give the same result. Signed-off-by: Rodrigo M. Duarte --- 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 449677391..c3665bb41 100644 --- a/recipes-extended/jailhouse/jailhouse-imx_git.bb +++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb @@ -25,12 +25,12 @@ PROVIDES = "jailhouse" PV = "2023.03+git${SRCPV}" -SRCBRANCH = "lf-6.18.20_2.0.0" +SRCBRANCH = "lf-6.18.37_2.1.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 \ " -SRCREV = "8d6d397f7f88f4bd0d9f99933a13163266d09099" +SRCREV = "8ce492bb2c69e486b8afb655f87d8b4708c79d89" inherit module bash-completion deploy setuptools3 -- cgit v1.2.3-54-g00ecf From 37a71a4637080edb93b8b0c91c01db7eedf923bd Mon Sep 17 00:00:00 2001 From: "Rodrigo M. Duarte" Date: Fri, 30 Oct 2026 09:27:30 -0300 Subject: jailhouse-imx: Keep make install from running pip python3-pip-native now ends up in the recipe sysroot, so the jailhouse Makefile finds a usable pip and its install target runs "pip install .". pip then tries to fetch setuptools from PyPI for an isolated build, and do_install fails because the task has no network access: ERROR: Could not find a version that satisfies the requirement setuptools>=40.8.0 (from versions: none) pyjailhouse is already installed by setuptools3_do_install, so that pip call has nothing to add. Disabling pip detection is not an option, because the same PYTHON_PIP_USABLE check also gates installing the Python helpers into libexec (jailhouse-cell-linux, jailhouse-config-create, ...). Pass PIP=true to the install call instead: the check still passes, the helpers are installed, and the pip step becomes a no-op. Tested on imx8mq-evk (NXP BSP, linux-fslc-imx 6.18.24) with core-image-weston: booted with jh_mmcboot, enabled the imx8mq root cell, created, loaded and started the gic-demo inmate, then shut it down, destroyed it and disabled jailhouse. Signed-off-by: Rodrigo M. Duarte --- recipes-extended/jailhouse/jailhouse-imx_git.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb index c3665bb41..56ec6c6e9 100644 --- a/recipes-extended/jailhouse/jailhouse-imx_git.bb +++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb @@ -71,7 +71,12 @@ do_compile:prepend() { } do_install:append() { - oe_runmake DESTDIR=${D} install + # pyjailhouse is already installed by setuptools3_do_install. With + # python3-pip-native in the sysroot the Makefile would also run + # "pip install .", which fetches build dependencies from the network. + # PIP=true keeps PYTHON_PIP_USABLE set, so the Python helpers are still + # installed, and turns that pip call into a no-op. + oe_runmake DESTDIR=${D} PIP=true install install -d ${D}${CELL_DIR} install ${B}/configs/${JH_ARCH}/*.cell ${D}${CELL_DIR}/ -- cgit v1.2.3-54-g00ecf