From d3c49e8ee7575581e661b2baea27d9ba5562850a Mon Sep 17 00:00:00 2001 From: Henning Schild Date: Wed, 27 Mar 2019 11:11:45 +0100 Subject: jailhouse: use kernel-arch to set ARCH and JH_ARCH Signed-off-by: Henning Schild Signed-off-by: Ola Redell --- recipes-jailhouse/jailhouse/jailhouse-defs.inc | 21 --------------------- recipes-jailhouse/jailhouse/jailhouse.inc | 7 +++---- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/recipes-jailhouse/jailhouse/jailhouse-defs.inc b/recipes-jailhouse/jailhouse/jailhouse-defs.inc index 8dd30e3..df39d40 100644 --- a/recipes-jailhouse/jailhouse/jailhouse-defs.inc +++ b/recipes-jailhouse/jailhouse/jailhouse-defs.inc @@ -2,24 +2,3 @@ JH_DATADIR ?= "${datadir}/jailhouse" CELL_DIR ?= "${JH_DATADIR}/cells" CELLCONF_DIR ?= "${JH_DATADIR}/configs" INMATES_DIR ?= "${JH_DATADIR}/inmates" - -# Set jailhouse architecture JH_ARCH variable -# -# return value must match one of architectures supported by jailhouse -# -valid_jh_archs = "x86 arm" - -def map_jh_arch(a, d): - import re - - valid_jh_archs = d.getVar('valid_jh_archs', True).split() - - if re.match('(i.86|athlon|x86.64)$', a): return 'x86' - elif re.match('armeb$', a): return 'arm' - elif re.match('aarch64$', a): return 'arm64' - elif re.match('aarch64_be$', a): return 'arm64' - elif a in valid_jh_archs: return a - else: - bb.error("cannot map '%s' to a jailhouse supported architecture" % a) - -export JH_ARCH = "${@map_jh_arch(d.getVar('TARGET_ARCH', True), d)}" diff --git a/recipes-jailhouse/jailhouse/jailhouse.inc b/recipes-jailhouse/jailhouse/jailhouse.inc index 961e707..0ace05d 100644 --- a/recipes-jailhouse/jailhouse/jailhouse.inc +++ b/recipes-jailhouse/jailhouse/jailhouse.inc @@ -17,7 +17,7 @@ DEPENDS = "virtual/kernel make-native python-mako-native dtc-native python-mako" S ="${WORKDIR}/git" require jailhouse-defs.inc -inherit module pythonnative bash-completion +inherit module pythonnative bash-completion kernel-arch JH_CONFIG ?= "${S}/ci/jailhouse-config-x86.h" JH_CONFIG_x86 ?= "${S}/ci/jailhouse-config-x86.h" @@ -46,7 +46,7 @@ TOOLS_OBJ_DIR = "${S}/tools" do_compile() { oe_runmake V=0 \ - ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} \ + CROSS_COMPILE=${TARGET_PREFIX} \ KDIR=${STAGING_KERNEL_BUILDDIR} cd ${TOOLS_SRC_DIR} @@ -59,7 +59,6 @@ do_compile() { do_install() { oe_runmake \ - ARCH=${TARGET_ARCH} \ CROSS_COMPILE=${TARGET_PREFIX} \ KDIR=${STAGING_KERNEL_BUILDDIR} \ DESTDIR=${D} install @@ -68,7 +67,7 @@ do_install() { install ${B}/configs/*.cell ${D}${CELL_DIR}/ install -d ${D}${INMATES_DIR} - install ${B}/inmates/demos/${JH_ARCH}/*.bin ${D}${INMATES_DIR} + install ${B}/inmates/demos/${ARCH}/*.bin ${D}${INMATES_DIR} } PACKAGE_BEFORE_PN = "kernel-module-jailhouse" -- cgit v1.2.3-54-g00ecf