summaryrefslogtreecommitdiffstats
path: root/recipes-jailhouse/jailhouse/jailhouse.inc
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-jailhouse/jailhouse/jailhouse.inc')
-rw-r--r--recipes-jailhouse/jailhouse/jailhouse.inc11
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"
21require jailhouse-defs.inc 21require jailhouse-defs.inc
22inherit module pythonnative bash-completion setuptools kernel-arch 22inherit module pythonnative bash-completion setuptools kernel-arch
23 23
24JH_CONFIG ?= "${S}/ci/jailhouse-config-x86.h" 24JH_CONFIG ?= ""
25JH_CONFIG_x86 ?= "${S}/ci/jailhouse-config-x86.h" 25JH_CONFIG_x86 ?= "${S}/ci/jailhouse-config-x86.h"
26JH_CONFIG_x86-64 ?= "${S}/ci/jailhouse-config-x86.h" 26JH_CONFIG_x86-64 ?= "${S}/ci/jailhouse-config-x86.h"
27JH_CONFIG_arm ?= "${S}/ci/jailhouse-config-banana-pi.h" 27JH_CONFIG_arm ?= "${S}/ci/jailhouse-config-banana-pi.h"
28JH_CONFIG_imx8mqevk = "${S}/ci/jailhouse-config-imx8mq-evk.h"
29JH_CONFIG_imx8mmevk = "${S}/ci/jailhouse-config-imx8mm-evk.h"
30 28
31do_configure() { 29do_configure() {
32 if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ]; 30 if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
@@ -67,8 +65,6 @@ do_compile() {
67 ${TOOLS_OBJ_DIR}/jailhouse.8 ${TOOLS_OBJ_DIR}/jailhouse-cell.8 \ 65 ${TOOLS_OBJ_DIR}/jailhouse.8 ${TOOLS_OBJ_DIR}/jailhouse-cell.8 \
68 ${TOOLS_OBJ_DIR}/jailhouse-enable.8 \ 66 ${TOOLS_OBJ_DIR}/jailhouse-enable.8 \
69 ${TOOLS_OBJ_DIR}/jailhouse 67 ${TOOLS_OBJ_DIR}/jailhouse
70
71 #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
72} 68}
73 69
74do_install() { 70do_install() {
@@ -79,8 +75,7 @@ do_install() {
79 KDIR=${STAGING_KERNEL_BUILDDIR} \ 75 KDIR=${STAGING_KERNEL_BUILDDIR} \
80 DESTDIR=${D} install 76 DESTDIR=${D} install
81 77
82 #distutils_do_install 78 distutils_do_install
83 distutils_do_compile
84 79
85 install -d ${D}${CELL_DIR} 80 install -d ${D}${CELL_DIR}
86 install ${B}/configs/${ARCH}/*.cell ${D}${CELL_DIR}/ 81 install ${B}/configs/${ARCH}/*.cell ${D}${CELL_DIR}/
@@ -96,7 +91,7 @@ do_install() {
96 install ${B}/tools/jailhouse-config-create ${D}${JH_DATADIR}/tools 91 install ${B}/tools/jailhouse-config-create ${D}${JH_DATADIR}/tools
97 install ${B}/tools/jailhouse-gcov-extract ${D}${JH_DATADIR}/tools 92 install ${B}/tools/jailhouse-gcov-extract ${D}${JH_DATADIR}/tools
98 install ${B}/tools/jailhouse-hardware-check ${D}${JH_DATADIR}/tools 93 install ${B}/tools/jailhouse-hardware-check ${D}${JH_DATADIR}/tools
99 install ${B}/inmates/tools/${JH_ARCH}/linux-loader.bin ${D}${INMATES_DIR}/tools/${JH_ARCH} 94 install ${B}/inmates/tools/${ARCH}/linux-loader.bin ${D}${INMATES_DIR}/tools/${ARCH}
100 95
101 install -d ${D}${PYTHON_SITEPACKAGES_DIR}/pyjailhouse 96 install -d ${D}${PYTHON_SITEPACKAGES_DIR}/pyjailhouse
102 install -m 0644 ${B}/build${base_libdir}/pyjailhouse/*.py ${D}${PYTHON_SITEPACKAGES_DIR}/pyjailhouse 97 install -m 0644 ${B}/build${base_libdir}/pyjailhouse/*.py ${D}${PYTHON_SITEPACKAGES_DIR}/pyjailhouse