summaryrefslogtreecommitdiffstats
path: root/recipes-jailhouse
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-jailhouse')
-rw-r--r--recipes-jailhouse/jailhouse/jailhouse-dirs.inc4
-rw-r--r--recipes-jailhouse/jailhouse/jailhouse.inc32
-rw-r--r--recipes-jailhouse/jailhouse/jailhouse_0.6.bb2
3 files changed, 15 insertions, 23 deletions
diff --git a/recipes-jailhouse/jailhouse/jailhouse-dirs.inc b/recipes-jailhouse/jailhouse/jailhouse-dirs.inc
new file mode 100644
index 0000000..df39d40
--- /dev/null
+++ b/recipes-jailhouse/jailhouse/jailhouse-dirs.inc
@@ -0,0 +1,4 @@
1JH_DATADIR ?= "${datadir}/jailhouse"
2CELL_DIR ?= "${JH_DATADIR}/cells"
3CELLCONF_DIR ?= "${JH_DATADIR}/configs"
4INMATES_DIR ?= "${JH_DATADIR}/inmates"
diff --git a/recipes-jailhouse/jailhouse/jailhouse.inc b/recipes-jailhouse/jailhouse/jailhouse.inc
index 2c30725..3965fd1 100644
--- a/recipes-jailhouse/jailhouse/jailhouse.inc
+++ b/recipes-jailhouse/jailhouse/jailhouse.inc
@@ -14,23 +14,11 @@ DEPENDS = "virtual/kernel make-native python-mako-native dtc-native python-mako"
14 14
15S ="${WORKDIR}/git" 15S ="${WORKDIR}/git"
16 16
17JH_DATADIR="${datadir}/jailhouse" 17require jailhouse-dirs.inc
18CELL_DIR ?= "${JH_DATADIR}/cells"
19CELLCONF_DIR ?= "${JH_DATADIR}/configs"
20INMATES_DIR ?= "${JH_DATADIR}/inmates"
21
22export PACKAGECONFIG_CONFARGS
23
24inherit module pythonnative bash-completion 18inherit module pythonnative bash-completion
25 19
26do_configure() { 20do_configure() {
27 # Copy all cell configs included through PACKAGECONFIG 21 cp "${STAGING_DIR_HOST}/${CELLCONF_DIR}/"*.c ${S}/configs/
28 for arg in $(echo $PACKAGECONFIG_CONFARGS); do
29 if conf=$(echo $arg | grep -o "with-.*$");
30 then
31 cp "${STAGING_DIR_HOST}/${CELLCONF_DIR}/${conf#with-}.c" ${S}/configs/
32 fi
33 done
34} 22}
35 23
36USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \ 24USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \
@@ -71,12 +59,10 @@ do_install() {
71PACKAGE_BEFORE_PN = "kernel-module-jailhouse" 59PACKAGE_BEFORE_PN = "kernel-module-jailhouse"
72FILES_${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}" 60FILES_${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}"
73 61
74PACKAGECONFIG ??= "freertos-cell freertos-demo1-cell freertos-demo3-cell freertos-ivshmem-demo" 62python __anonymous () {
75PACKAGECONFIG[freertos-cell] = \ 63 # Setup DEPENDS and RDEPENDS to included cells"
76 "--with-freertos-cell,,freertos-cell,freertos-cell" 64 cells = d.getVar('CELLS', True) or ""
77PACKAGECONFIG[freertos-demo1-cell] = \ 65 for cell in cells.split():
78 "--with-freertos-demo1-cell,,freertos-demo1-cell,freertos-demo1-cell" 66 d.appendVar('DEPENDS', ' ' + cell)
79PACKAGECONFIG[freertos-demo3-cell] = \ 67 d.appendVar('RDEPENDS_${PN}', ' ' + cell)
80 "--with-freertos-demo3-cell,,freertos-demo3-cell,freertos-demo3-cell" 68}
81PACKAGECONFIG[freertos-ivshmem-demo] = \
82 "--with-freertos-ivshmem-demo,,freertos-ivshmem-demo,freertos-ivshmem-demo"
diff --git a/recipes-jailhouse/jailhouse/jailhouse_0.6.bb b/recipes-jailhouse/jailhouse/jailhouse_0.6.bb
index 6c752f7..d0fc7f9 100644
--- a/recipes-jailhouse/jailhouse/jailhouse_0.6.bb
+++ b/recipes-jailhouse/jailhouse/jailhouse_0.6.bb
@@ -7,3 +7,5 @@ SRC_URI = "git://github.com/siemens/jailhouse.git;protocol=git \
7 " 7 "
8 8
9SRCREV = "81528e48763c8dfc10851c49968eb3d053d4b85c" 9SRCREV = "81528e48763c8dfc10851c49968eb3d053d4b85c"
10
11CELLS = "freertos-cell freertos-demo1-cell freertos-demo3-cell freertos-ivshmem-demo"