Merge pull request #1738 from quaresmajose/jailhouse-imx

Jailhouse-imx: cleanup and fix bitbake tasks overrides 

1 files changed, 17 insertions, 19 deletions

diff --git a/recipes-extended/jailhouse/jailhouse-imx_git.bb b/recipes-extended/jailhouse/jailhouse-imx_git.bb
index 7eba3a43..dcfe181e 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}"
@@ -41,7 +41,18 @@ INMATES_DIR ?= "${JH_DATADIR}/inmates"
 
 TUNE_CCARGS:remove:mx93-nxp-bsp = "-mcpu=cortex-a55"
 
-do_configure() {
+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
       cp "${STAGING_DIR_HOST}/${CELLCONF_DIR}/"*.c ${S}/configs/${ARCH}/
@@ -49,25 +60,12 @@ do_configure() {
 }
 
 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:prepend() {
-    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
+do_install:append() {
+    oe_runmake DESTDIR=${D} install
 
     install -d ${D}${CELL_DIR}
     install ${B}/configs/${JH_ARCH}/*.cell ${D}${CELL_DIR}/