From 8c714143f4487c07515056be1da696cd73052e0a Mon Sep 17 00:00:00 2001
From: Jose Quaresma <jose.quaresma@foundries.io>
Date: Thu, 25 Jan 2024 14:29:24 +0000
Subject: jailhouse-imx: fix bitbake tasks overrides

Overriding do_configure will skip:
 setup_target_config
 setuptools3_do_configure

Using prepend in do_install will result in the call of python3
pip directly inside of oe_runmake instead of using the functions [1]
resulting in install the python stuff to a wrong target path
which includes the HOME directory of the user who runs bitbake.

[1]
 setup_target_config
 setuptools3_do_install
 python_pep517_do_install

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
---
 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 7eba3a439..f275274d2 100644
--- a/recipes-extended/jailhouse/jailhouse-imx_git.bb
+++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb
@@ -41,7 +41,7 @@ INMATES_DIR ?= "${JH_DATADIR}/inmates"
 
 TUNE_CCARGS:remove:mx93-nxp-bsp = "-mcpu=cortex-a55"
 
-do_configure() {
+do_configure:prepend() {
    if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
    then
       cp "${STAGING_DIR_HOST}/${CELLCONF_DIR}/"*.c ${S}/configs/${ARCH}/
@@ -55,7 +55,7 @@ do_compile:prepend() {
         KDIR=${STAGING_KERNEL_BUILDDIR}
 }
 
-do_install:prepend() {
+do_install:append() {
     oe_runmake \
         PYTHON=python3 \
         V=1 \
-- 
cgit v1.2.3-54-g00ecf


From 2276e673c780bfb0164095f2a38821f088d17e41 Mon Sep 17 00:00:00 2001
From: Jose Quaresma <jose.quaresma@foundries.io>
Date: Thu, 25 Jan 2024 14:29:24 +0000
Subject: jailhouse-imx: use EXTRA_OEMAKE to pass the args

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
---
 recipes-extended/jailhouse/jailhouse-imx_git.bb | 30 ++++++++++++-------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb
index f275274d2..26a16aeed 100644
--- a/recipes-extended/jailhouse/jailhouse-imx_git.bb
+++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb
@@ -41,6 +41,17 @@ INMATES_DIR ?= "${JH_DATADIR}/inmates"
 
 TUNE_CCARGS:remove:mx93-nxp-bsp = "-mcpu=cortex-a55"
 
+EXTRA_OEMAKE += 'V=1'
+EXTRA_OEMAKE += 'PYTHON=python3'
+EXTRA_OEMAKE += 'LDFLAGS=""'
+EXTRA_OEMAKE += 'CC="${CC}"'
+EXTRA_OEMAKE += 'ARCH=${JH_ARCH}'
+EXTRA_OEMAKE += 'CROSS_COMPILE=${TARGET_PREFIX}'
+EXTRA_OEMAKE += 'KDIR=${STAGING_KERNEL_BUILDDIR}'
+EXTRA_OEMAKE += 'MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}"'
+EXTRA_OEMAKE += 'INSTALL_MOD_PATH=${D}${root_prefix}'
+EXTRA_OEMAKE += 'firmwaredir=${nonarch_base_libdir}/firmware'
+
 do_configure:prepend() {
    if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
    then
@@ -49,25 +60,12 @@ do_configure:prepend() {
 }
 
 do_compile:prepend() {
-    unset LDFLAGS
-    oe_runmake V=1 CC="${CC}" \
-        ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} \
-        KDIR=${STAGING_KERNEL_BUILDDIR}
+    # explicity call make to build the kernel module and tools
+    oe_runmake
 }
 
 do_install:append() {
-    oe_runmake \
-        PYTHON=python3 \
-        V=1 \
-        LDFLAGS="" \
-        CC="${CC}" \
-        ARCH=${JH_ARCH} \
-        CROSS_COMPILE=${TARGET_PREFIX} \
-        KDIR=${STAGING_KERNEL_BUILDDIR} \
-        MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}" \
-        INSTALL_MOD_PATH=${D}${root_prefix} \
-        firmwaredir=${nonarch_base_libdir}/firmware \
-        DESTDIR=${D} install
+    oe_runmake DESTDIR=${D} install
 
     install -d ${D}${CELL_DIR}
     install ${B}/configs/${JH_ARCH}/*.cell ${D}${CELL_DIR}/
-- 
cgit v1.2.3-54-g00ecf


From edd0fc9980e08355b6b8da6df4138cf6029e00e8 Mon Sep 17 00:00:00 2001
From: Jose Quaresma <jose.quaresma@foundries.io>
Date: Thu, 25 Jan 2024 14:29:24 +0000
Subject: jailhouse-imx: drop python3native inherit

The native python is only needed by the setuptools witch is
already provided in setuptools3

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
---
 recipes-extended/jailhouse/jailhouse-imx_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb
index 26a16aeed..dcfe181ec 100644
--- a/recipes-extended/jailhouse/jailhouse-imx_git.bb
+++ b/recipes-extended/jailhouse/jailhouse-imx_git.bb
@@ -28,7 +28,7 @@ DEPENDS = " \
     dtc-native \
 "
 
-inherit module python3native bash-completion deploy setuptools3
+inherit module bash-completion deploy setuptools3
 
 S = "${WORKDIR}/git"
 B = "${S}"
-- 
cgit v1.2.3-54-g00ecf