diff options
Diffstat (limited to 'recipes-jailhouse/jailhouse/jailhouse.inc')
-rw-r--r-- | recipes-jailhouse/jailhouse/jailhouse.inc | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/recipes-jailhouse/jailhouse/jailhouse.inc b/recipes-jailhouse/jailhouse/jailhouse.inc index e304c4c..c6d959a 100644 --- a/recipes-jailhouse/jailhouse/jailhouse.inc +++ b/recipes-jailhouse/jailhouse/jailhouse.inc | |||
@@ -25,6 +25,8 @@ JH_CONFIG ?= "${S}/ci/jailhouse-config-x86.h" | |||
25 | JH_CONFIG_x86 ?= "${S}/ci/jailhouse-config-x86.h" | 25 | JH_CONFIG_x86 ?= "${S}/ci/jailhouse-config-x86.h" |
26 | JH_CONFIG_x86-64 ?= "${S}/ci/jailhouse-config-x86.h" | 26 | JH_CONFIG_x86-64 ?= "${S}/ci/jailhouse-config-x86.h" |
27 | JH_CONFIG_arm ?= "${S}/ci/jailhouse-config-banana-pi.h" | 27 | JH_CONFIG_arm ?= "${S}/ci/jailhouse-config-banana-pi.h" |
28 | JH_CONFIG_imx8mqevk = "${S}/ci/jailhouse-config-imx8mq-evk.h" | ||
29 | JH_CONFIG_imx8mmevk = "${S}/ci/jailhouse-config-imx8mm-evk.h" | ||
28 | 30 | ||
29 | do_configure() { | 31 | do_configure() { |
30 | if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ]; | 32 | if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ]; |
@@ -40,17 +42,15 @@ do_configure() { | |||
40 | 42 | ||
41 | USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \ | 43 | USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \ |
42 | -DJAILHOUSE_VERSION=\\\"$JAILHOUSE_VERSION\\\" \ | 44 | -DJAILHOUSE_VERSION=\\\"$JAILHOUSE_VERSION\\\" \ |
43 | -Wall -Wextra -Wmissing-declarations -Wmissing-prototypes \ | 45 | -Wall -Wextra -Wmissing-declarations -Wmissing-prototypes -Werror \ |
44 | -Werror -D__LINUX_COMPILER_TYPES_H \ | ||
45 | -I../driver' | 46 | -I../driver' |
46 | 47 | ||
47 | TOOLS_SRC_DIR = "${S}/tools" | 48 | TOOLS_SRC_DIR = "${S}/tools" |
48 | TOOLS_OBJ_DIR = "${S}/tools" | 49 | TOOLS_OBJ_DIR = "${S}/tools" |
49 | 50 | ||
50 | export LDFLAGS = "" | ||
51 | |||
52 | do_compile() { | 51 | do_compile() { |
53 | oe_runmake V=0 \ | 52 | unset LDFLAGS |
53 | oe_runmake V=0 CC="${CC}" \ | ||
54 | CROSS_COMPILE=${TARGET_PREFIX} \ | 54 | CROSS_COMPILE=${TARGET_PREFIX} \ |
55 | KDIR=${STAGING_KERNEL_BUILDDIR} | 55 | KDIR=${STAGING_KERNEL_BUILDDIR} |
56 | 56 | ||
@@ -67,27 +67,46 @@ do_compile() { | |||
67 | ${TOOLS_OBJ_DIR}/jailhouse.8 ${TOOLS_OBJ_DIR}/jailhouse-cell.8 \ | 67 | ${TOOLS_OBJ_DIR}/jailhouse.8 ${TOOLS_OBJ_DIR}/jailhouse-cell.8 \ |
68 | ${TOOLS_OBJ_DIR}/jailhouse-enable.8 \ | 68 | ${TOOLS_OBJ_DIR}/jailhouse-enable.8 \ |
69 | ${TOOLS_OBJ_DIR}/jailhouse | 69 | ${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 | ||
70 | } | 72 | } |
71 | 73 | ||
72 | do_install() { | 74 | do_install() { |
73 | oe_runmake \ | 75 | oe_runmake V=1 \ |
76 | LDFLAGS="" \ | ||
77 | CC="${CC}" \ | ||
74 | CROSS_COMPILE=${TARGET_PREFIX} \ | 78 | CROSS_COMPILE=${TARGET_PREFIX} \ |
75 | KDIR=${STAGING_KERNEL_BUILDDIR} \ | 79 | KDIR=${STAGING_KERNEL_BUILDDIR} \ |
76 | DESTDIR=${D} install | 80 | DESTDIR=${D} install |
77 | 81 | ||
78 | distutils_do_install | 82 | #distutils_do_install |
79 | 83 | distutils_do_compile | |
84 | |||
80 | install -d ${D}${CELL_DIR} | 85 | install -d ${D}${CELL_DIR} |
81 | install ${B}/configs/${JH_ARCH}/*.cell ${D}${CELL_DIR}/ | 86 | install ${B}/configs/${ARCH}/*.cell ${D}${CELL_DIR}/ |
82 | 87 | ||
83 | install -d ${D}${INMATES_DIR} | 88 | install -d ${D}${INMATES_DIR} |
89 | install -d ${D}${INMATES_DIR}/tools/${ARCH} | ||
84 | install ${B}/inmates/demos/${ARCH}/*.bin ${D}${INMATES_DIR} | 90 | install ${B}/inmates/demos/${ARCH}/*.bin ${D}${INMATES_DIR} |
91 | |||
92 | install -d ${D}${JH_DATADIR}/tools | ||
93 | install ${B}/tools/jailhouse-cell-linux ${D}${JH_DATADIR}/tools | ||
94 | install ${B}/tools/jailhouse-cell-stats ${D}${JH_DATADIR}/tools | ||
95 | install ${B}/tools/jailhouse-config-collect ${D}${JH_DATADIR}/tools | ||
96 | install ${B}/tools/jailhouse-config-create ${D}${JH_DATADIR}/tools | ||
97 | install ${B}/tools/jailhouse-gcov-extract ${D}${JH_DATADIR}/tools | ||
98 | 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} | ||
100 | |||
101 | install -d ${D}${PYTHON_SITEPACKAGES_DIR}/pyjailhouse | ||
102 | install -m 0644 ${B}/build${base_libdir}/pyjailhouse/*.py ${D}${PYTHON_SITEPACKAGES_DIR}/pyjailhouse | ||
85 | } | 103 | } |
86 | 104 | ||
87 | PACKAGE_BEFORE_PN = "kernel-module-jailhouse" | 105 | PACKAGE_BEFORE_PN = "kernel-module-jailhouse" |
88 | FILES_${PN} += "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}" | 106 | FILES_${PN} += "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}" |
89 | 107 | ||
90 | KERNEL_MODULE_AUTOLOAD += "jailhouse" | 108 | KERNEL_MODULE_AUTOLOAD += "jailhouse" |
109 | INSANE_SKIP_${PN} = "ldflags" | ||
91 | 110 | ||
92 | python __anonymous () { | 111 | python __anonymous () { |
93 | # Setup DEPENDS and RDEPENDS to included cells" | 112 | # Setup DEPENDS and RDEPENDS to included cells" |