jailhouse.inc/jailhouse-def: merged changes from master

2 files changed, 8 insertions, 27 deletions

diff --git a/recipes-jailhouse/jailhouse/jailhouse-defs.inc b/recipes-jailhouse/jailhouse/jailhouse-defs.inc
index 0c8eb40..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)
-
-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 a499456..e304c4c 100644
--- a/recipes-jailhouse/jailhouse/jailhouse.inc
+++ b/recipes-jailhouse/jailhouse/jailhouse.inc
@@ -19,7 +19,7 @@ DEPENDS = "virtual/kernel make-native \
 S ="${WORKDIR}/git"
 
 require jailhouse-defs.inc
-inherit module pythonnative bash-completion setuptools
+inherit module pythonnative bash-completion setuptools kernel-arch
 
 JH_CONFIG ?= "${S}/ci/jailhouse-config-x86.h"
 JH_CONFIG_x86 ?= "${S}/ci/jailhouse-config-x86.h"
@@ -32,7 +32,10 @@ do_configure() {
       cp "${STAGING_DIR_HOST}/${CELLCONF_DIR}/"*.c ${S}/configs/
    fi
 
-   cp -av ${JH_CONFIG} ${S}/include/jailhouse/config.h
+   if [ ! -z ${JH_CONFIG} ];
+   then
+      cp -av ${JH_CONFIG} ${S}/include/jailhouse/config.h
+   fi
 }
 
 USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \
@@ -47,8 +50,8 @@ TOOLS_OBJ_DIR = "${S}/tools"
 export LDFLAGS = ""
 
 do_compile() {
-   oe_runmake V=1 \
-        ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} \
+   oe_runmake V=0 \
+        CROSS_COMPILE=${TARGET_PREFIX} \
         KDIR=${STAGING_KERNEL_BUILDDIR}
 
    distutils_do_compile
@@ -68,7 +71,6 @@ do_compile() {
 
 do_install() {
     oe_runmake \
-               ARCH=${JH_ARCH} \
                CROSS_COMPILE=${TARGET_PREFIX} \
                KDIR=${STAGING_KERNEL_BUILDDIR} \
                DESTDIR=${D} install
@@ -79,7 +81,7 @@ do_install() {
     install ${B}/configs/${JH_ARCH}/*.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"