1 files changed, 3 insertions, 8 deletions

diff --git a/recipes-jailhouse/jailhouse/jailhouse.inc b/recipes-jailhouse/jailhouse/jailhouse.inc
index c6d959a..3ce9bbf 100644
--- a/recipes-jailhouse/jailhouse/jailhouse.inc
+++ b/recipes-jailhouse/jailhouse/jailhouse.inc
@@ -21,12 +21,10 @@ S ="${WORKDIR}/git"
 require jailhouse-defs.inc
 inherit module pythonnative bash-completion setuptools kernel-arch
 
-JH_CONFIG ?= "${S}/ci/jailhouse-config-x86.h"
+JH_CONFIG ?= ""
 JH_CONFIG_x86 ?= "${S}/ci/jailhouse-config-x86.h"
 JH_CONFIG_x86-64 ?= "${S}/ci/jailhouse-config-x86.h"
 JH_CONFIG_arm ?= "${S}/ci/jailhouse-config-banana-pi.h"
-JH_CONFIG_imx8mqevk = "${S}/ci/jailhouse-config-imx8mq-evk.h"
-JH_CONFIG_imx8mmevk = "${S}/ci/jailhouse-config-imx8mm-evk.h"
 
 do_configure() {
    if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ]; 
@@ -67,8 +65,6 @@ do_compile() {
                ${TOOLS_OBJ_DIR}/jailhouse.8 ${TOOLS_OBJ_DIR}/jailhouse-cell.8 \
                ${TOOLS_OBJ_DIR}/jailhouse-enable.8 \
                ${TOOLS_OBJ_DIR}/jailhouse
-
-    #oe_runmake V=1 CFLAGS="${USER_SPACE_CFLAGS}" src=${TOOLS_SRC_DIR} obj=${TOOLS_OBJ_DIR} ${TOOLS_OBJ_DIR}/jailhouse-config-collect ${TOOLS_OBJ_DIR}/jailhouse
 }
 
 do_install() {
@@ -79,8 +75,7 @@ do_install() {
                KDIR=${STAGING_KERNEL_BUILDDIR} \
                DESTDIR=${D} install
 
-    #distutils_do_install
-    distutils_do_compile
+    distutils_do_install
 
     install -d ${D}${CELL_DIR}
     install ${B}/configs/${ARCH}/*.cell ${D}${CELL_DIR}/
@@ -96,7 +91,7 @@ do_install() {
     install ${B}/tools/jailhouse-config-create ${D}${JH_DATADIR}/tools
     install ${B}/tools/jailhouse-gcov-extract ${D}${JH_DATADIR}/tools
     install ${B}/tools/jailhouse-hardware-check ${D}${JH_DATADIR}/tools
-    install ${B}/inmates/tools/${JH_ARCH}/linux-loader.bin ${D}${INMATES_DIR}/tools/${JH_ARCH}
+    install ${B}/inmates/tools/${ARCH}/linux-loader.bin ${D}${INMATES_DIR}/tools/${ARCH}
 
     install -d ${D}${PYTHON_SITEPACKAGES_DIR}/pyjailhouse
     install -m 0644 ${B}/build${base_libdir}/pyjailhouse/*.py ${D}${PYTHON_SITEPACKAGES_DIR}/pyjailhouse