summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOla Redell <ola.redell@retotech.se>2018-09-20 18:20:30 +0200
committerOla Redell <ola.redell@retotech.se>2018-09-20 18:20:30 +0200
commit53f0d8039822f59b9ba4ed16c8769b0777b216cb (patch)
tree81affde0e337c99d56505e6c8c08d0e4048b3442
parent80d553539345dde697032148788b4e1cd529dcc0 (diff)
downloadmeta-jailhouse-53f0d8039822f59b9ba4ed16c8769b0777b216cb.tar.gz
now pyjailhouse is installed too. Other tools remain.
-rw-r--r--recipes-jailhouse/jailhouse/jailhouse.inc12
1 files changed, 9 insertions, 3 deletions
diff --git a/recipes-jailhouse/jailhouse/jailhouse.inc b/recipes-jailhouse/jailhouse/jailhouse.inc
index 49ac544..a499456 100644
--- a/recipes-jailhouse/jailhouse/jailhouse.inc
+++ b/recipes-jailhouse/jailhouse/jailhouse.inc
@@ -12,12 +12,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
12 file://include/arch/x86/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ 12 file://include/arch/x86/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \
13 file://driver/jailhouse.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3" 13 file://driver/jailhouse.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3"
14 14
15DEPENDS = "virtual/kernel make-native python-mako-native dtc-native python-mako" 15DEPENDS = "virtual/kernel make-native \
16 python-mako-native python-mako \
17 dtc-native "
16 18
17S ="${WORKDIR}/git" 19S ="${WORKDIR}/git"
18 20
19require jailhouse-defs.inc 21require jailhouse-defs.inc
20inherit module pythonnative bash-completion 22inherit module pythonnative bash-completion setuptools
21 23
22JH_CONFIG ?= "${S}/ci/jailhouse-config-x86.h" 24JH_CONFIG ?= "${S}/ci/jailhouse-config-x86.h"
23JH_CONFIG_x86 ?= "${S}/ci/jailhouse-config-x86.h" 25JH_CONFIG_x86 ?= "${S}/ci/jailhouse-config-x86.h"
@@ -49,6 +51,8 @@ do_compile() {
49 ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} \ 51 ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} \
50 KDIR=${STAGING_KERNEL_BUILDDIR} 52 KDIR=${STAGING_KERNEL_BUILDDIR}
51 53
54 distutils_do_compile
55
52 cd ${TOOLS_SRC_DIR} 56 cd ${TOOLS_SRC_DIR}
53 export JAILHOUSE_VERSION=$(cat ../VERSION) 57 export JAILHOUSE_VERSION=$(cat ../VERSION)
54 oe_runmake V=1 \ 58 oe_runmake V=1 \
@@ -69,6 +73,8 @@ do_install() {
69 KDIR=${STAGING_KERNEL_BUILDDIR} \ 73 KDIR=${STAGING_KERNEL_BUILDDIR} \
70 DESTDIR=${D} install 74 DESTDIR=${D} install
71 75
76 distutils_do_install
77
72 install -d ${D}${CELL_DIR} 78 install -d ${D}${CELL_DIR}
73 install ${B}/configs/${JH_ARCH}/*.cell ${D}${CELL_DIR}/ 79 install ${B}/configs/${JH_ARCH}/*.cell ${D}${CELL_DIR}/
74 80
@@ -77,7 +83,7 @@ do_install() {
77} 83}
78 84
79PACKAGE_BEFORE_PN = "kernel-module-jailhouse" 85PACKAGE_BEFORE_PN = "kernel-module-jailhouse"
80FILES_${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}" 86FILES_${PN} += "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}"
81 87
82KERNEL_MODULE_AUTOLOAD += "jailhouse" 88KERNEL_MODULE_AUTOLOAD += "jailhouse"
83 89