From 53f0d8039822f59b9ba4ed16c8769b0777b216cb Mon Sep 17 00:00:00 2001 From: Ola Redell Date: Thu, 20 Sep 2018 18:20:30 +0200 Subject: now pyjailhouse is installed too. Other tools remain. --- recipes-jailhouse/jailhouse/jailhouse.inc | 12 +++++++++--- 1 file 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 \ file://include/arch/x86/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ file://driver/jailhouse.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3" -DEPENDS = "virtual/kernel make-native python-mako-native dtc-native python-mako" +DEPENDS = "virtual/kernel make-native \ + python-mako-native python-mako \ + dtc-native " S ="${WORKDIR}/git" require jailhouse-defs.inc -inherit module pythonnative bash-completion +inherit module pythonnative bash-completion setuptools JH_CONFIG ?= "${S}/ci/jailhouse-config-x86.h" JH_CONFIG_x86 ?= "${S}/ci/jailhouse-config-x86.h" @@ -49,6 +51,8 @@ do_compile() { ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} \ KDIR=${STAGING_KERNEL_BUILDDIR} + distutils_do_compile + cd ${TOOLS_SRC_DIR} export JAILHOUSE_VERSION=$(cat ../VERSION) oe_runmake V=1 \ @@ -69,6 +73,8 @@ do_install() { KDIR=${STAGING_KERNEL_BUILDDIR} \ DESTDIR=${D} install + distutils_do_install + install -d ${D}${CELL_DIR} install ${B}/configs/${JH_ARCH}/*.cell ${D}${CELL_DIR}/ @@ -77,7 +83,7 @@ do_install() { } PACKAGE_BEFORE_PN = "kernel-module-jailhouse" -FILES_${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}" +FILES_${PN} += "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}" KERNEL_MODULE_AUTOLOAD += "jailhouse" -- cgit v1.2.3-54-g00ecf