diff options
-rw-r--r-- | recipes-jailhouse/jailhouse/jailhouse-defs.inc | 21 | ||||
-rw-r--r-- | 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" | |||
2 | CELL_DIR ?= "${JH_DATADIR}/cells" | 2 | CELL_DIR ?= "${JH_DATADIR}/cells" |
3 | CELLCONF_DIR ?= "${JH_DATADIR}/configs" | 3 | CELLCONF_DIR ?= "${JH_DATADIR}/configs" |
4 | INMATES_DIR ?= "${JH_DATADIR}/inmates" | 4 | INMATES_DIR ?= "${JH_DATADIR}/inmates" |
5 | |||
6 | # Set jailhouse architecture JH_ARCH variable | ||
7 | # | ||
8 | # return value must match one of architectures supported by jailhouse | ||
9 | # | ||
10 | valid_jh_archs = "x86 arm" | ||
11 | |||
12 | def map_jh_arch(a, d): | ||
13 | import re | ||
14 | |||
15 | valid_jh_archs = d.getVar('valid_jh_archs', True).split() | ||
16 | |||
17 | if re.match('(i.86|athlon|x86.64)$', a): return 'x86' | ||
18 | elif re.match('armeb$', a): return 'arm' | ||
19 | elif re.match('aarch64$', a): return 'arm64' | ||
20 | elif re.match('aarch64_be$', a): return 'arm64' | ||
21 | elif a in valid_jh_archs: return a | ||
22 | else: | ||
23 | bb.error("cannot map '%s' to a jailhouse supported architecture" % a) | ||
24 | |||
25 | 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" | |||
17 | S ="${WORKDIR}/git" | 17 | S ="${WORKDIR}/git" |
18 | 18 | ||
19 | require jailhouse-defs.inc | 19 | require jailhouse-defs.inc |
20 | inherit module pythonnative bash-completion | 20 | inherit module pythonnative bash-completion kernel-arch |
21 | 21 | ||
22 | JH_CONFIG ?= "${S}/ci/jailhouse-config-x86.h" | 22 | JH_CONFIG ?= "${S}/ci/jailhouse-config-x86.h" |
23 | JH_CONFIG_x86 ?= "${S}/ci/jailhouse-config-x86.h" | 23 | JH_CONFIG_x86 ?= "${S}/ci/jailhouse-config-x86.h" |
@@ -46,7 +46,7 @@ TOOLS_OBJ_DIR = "${S}/tools" | |||
46 | 46 | ||
47 | do_compile() { | 47 | do_compile() { |
48 | oe_runmake V=0 \ | 48 | oe_runmake V=0 \ |
49 | ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} \ | 49 | CROSS_COMPILE=${TARGET_PREFIX} \ |
50 | KDIR=${STAGING_KERNEL_BUILDDIR} | 50 | KDIR=${STAGING_KERNEL_BUILDDIR} |
51 | 51 | ||
52 | cd ${TOOLS_SRC_DIR} | 52 | cd ${TOOLS_SRC_DIR} |
@@ -59,7 +59,6 @@ do_compile() { | |||
59 | 59 | ||
60 | do_install() { | 60 | do_install() { |
61 | oe_runmake \ | 61 | oe_runmake \ |
62 | ARCH=${TARGET_ARCH} \ | ||
63 | CROSS_COMPILE=${TARGET_PREFIX} \ | 62 | CROSS_COMPILE=${TARGET_PREFIX} \ |
64 | KDIR=${STAGING_KERNEL_BUILDDIR} \ | 63 | KDIR=${STAGING_KERNEL_BUILDDIR} \ |
65 | DESTDIR=${D} install | 64 | DESTDIR=${D} install |
@@ -68,7 +67,7 @@ do_install() { | |||
68 | install ${B}/configs/*.cell ${D}${CELL_DIR}/ | 67 | install ${B}/configs/*.cell ${D}${CELL_DIR}/ |
69 | 68 | ||
70 | install -d ${D}${INMATES_DIR} | 69 | install -d ${D}${INMATES_DIR} |
71 | install ${B}/inmates/demos/${JH_ARCH}/*.bin ${D}${INMATES_DIR} | 70 | install ${B}/inmates/demos/${ARCH}/*.bin ${D}${INMATES_DIR} |
72 | } | 71 | } |
73 | 72 | ||
74 | PACKAGE_BEFORE_PN = "kernel-module-jailhouse" | 73 | PACKAGE_BEFORE_PN = "kernel-module-jailhouse" |