From f2f6d83741066584e5d5e5c131c4ce80102a84c1 Mon Sep 17 00:00:00 2001
From: Ola Redell <ola.redell@codiax.se>
Date: Mon, 27 May 2019 12:57:30 +0200
Subject: Pulling in changes from meta-fsl-... layer and raising layer priority
 to 9

Needed to take priority over meta-fsl-... jailhouse recipe
---
 conf/layer.conf                                |  2 +-
 recipes-jailhouse/jailhouse/jailhouse.inc      | 37 +++++++++++++++++++-------
 recipes-kernel/linux/jailhouse-linux_4.14.6.bb |  2 +-
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index 5826443..133f215 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -7,6 +7,6 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 
 BBFILE_COLLECTIONS += "jailhouse"
 BBFILE_PATTERN_jailhouse = "^${LAYERDIR}/"
-BBFILE_PRIORITY_jailhouse = "6"
+BBFILE_PRIORITY_jailhouse = "9"
 
 LAYERSERIES_COMPAT_jailhouse = "sumo"
\ No newline at end of file
diff --git a/recipes-jailhouse/jailhouse/jailhouse.inc b/recipes-jailhouse/jailhouse/jailhouse.inc
index e304c4c..c6d959a 100644
--- a/recipes-jailhouse/jailhouse/jailhouse.inc
+++ b/recipes-jailhouse/jailhouse/jailhouse.inc
@@ -25,6 +25,8 @@ JH_CONFIG ?= "${S}/ci/jailhouse-config-x86.h"
 JH_CONFIG_x86 ?= "${S}/ci/jailhouse-config-x86.h"
 JH_CONFIG_x86-64 ?= "${S}/ci/jailhouse-config-x86.h"
 JH_CONFIG_arm ?= "${S}/ci/jailhouse-config-banana-pi.h"
+JH_CONFIG_imx8mqevk = "${S}/ci/jailhouse-config-imx8mq-evk.h"
+JH_CONFIG_imx8mmevk = "${S}/ci/jailhouse-config-imx8mm-evk.h"
 
 do_configure() {
    if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ]; 
@@ -40,17 +42,15 @@ do_configure() {
 
 USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \
 		  -DJAILHOUSE_VERSION=\\\"$JAILHOUSE_VERSION\\\" \
-		  -Wall -Wextra -Wmissing-declarations -Wmissing-prototypes \
-                  -Werror -D__LINUX_COMPILER_TYPES_H \
+		  -Wall -Wextra -Wmissing-declarations -Wmissing-prototypes -Werror \
 		  -I../driver'
 
 TOOLS_SRC_DIR = "${S}/tools"
 TOOLS_OBJ_DIR = "${S}/tools"
 
-export LDFLAGS = ""
-
 do_compile() {
-   oe_runmake V=0 \
+   unset LDFLAGS
+   oe_runmake V=0 CC="${CC}" \
         CROSS_COMPILE=${TARGET_PREFIX} \
         KDIR=${STAGING_KERNEL_BUILDDIR}
 
@@ -67,27 +67,46 @@ do_compile() {
                ${TOOLS_OBJ_DIR}/jailhouse.8 ${TOOLS_OBJ_DIR}/jailhouse-cell.8 \
                ${TOOLS_OBJ_DIR}/jailhouse-enable.8 \
                ${TOOLS_OBJ_DIR}/jailhouse
+
+    #oe_runmake V=1 CFLAGS="${USER_SPACE_CFLAGS}" src=${TOOLS_SRC_DIR} obj=${TOOLS_OBJ_DIR} ${TOOLS_OBJ_DIR}/jailhouse-config-collect ${TOOLS_OBJ_DIR}/jailhouse
 }
 
 do_install() {
-    oe_runmake \
+    oe_runmake V=1 \
+	       LDFLAGS="" \
+	       CC="${CC}" \
 	       CROSS_COMPILE=${TARGET_PREFIX} \
 	       KDIR=${STAGING_KERNEL_BUILDDIR} \
 	       DESTDIR=${D} install
 
-    distutils_do_install
-    
+    #distutils_do_install
+    distutils_do_compile
+
     install -d ${D}${CELL_DIR}
-    install ${B}/configs/${JH_ARCH}/*.cell ${D}${CELL_DIR}/
+    install ${B}/configs/${ARCH}/*.cell ${D}${CELL_DIR}/
 
     install -d ${D}${INMATES_DIR}
+    install -d ${D}${INMATES_DIR}/tools/${ARCH}
     install ${B}/inmates/demos/${ARCH}/*.bin ${D}${INMATES_DIR}
+
+    install -d ${D}${JH_DATADIR}/tools
+    install ${B}/tools/jailhouse-cell-linux ${D}${JH_DATADIR}/tools
+    install ${B}/tools/jailhouse-cell-stats ${D}${JH_DATADIR}/tools
+    install ${B}/tools/jailhouse-config-collect ${D}${JH_DATADIR}/tools
+    install ${B}/tools/jailhouse-config-create ${D}${JH_DATADIR}/tools
+    install ${B}/tools/jailhouse-gcov-extract ${D}${JH_DATADIR}/tools
+    install ${B}/tools/jailhouse-hardware-check ${D}${JH_DATADIR}/tools
+    install ${B}/inmates/tools/${JH_ARCH}/linux-loader.bin ${D}${INMATES_DIR}/tools/${JH_ARCH}
+
+    install -d ${D}${PYTHON_SITEPACKAGES_DIR}/pyjailhouse
+    install -m 0644 ${B}/build${base_libdir}/pyjailhouse/*.py ${D}${PYTHON_SITEPACKAGES_DIR}/pyjailhouse
 }
 
 PACKAGE_BEFORE_PN = "kernel-module-jailhouse"
 FILES_${PN} += "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}"
 
 KERNEL_MODULE_AUTOLOAD += "jailhouse"
+INSANE_SKIP_${PN} = "ldflags"
 
 python __anonymous () {
     # Setup DEPENDS and RDEPENDS to included cells"
diff --git a/recipes-kernel/linux/jailhouse-linux_4.14.6.bb b/recipes-kernel/linux/jailhouse-linux_4.14.6.bb
index 3cd4e97..d072f5b 100644
--- a/recipes-kernel/linux/jailhouse-linux_4.14.6.bb
+++ b/recipes-kernel/linux/jailhouse-linux_4.14.6.bb
@@ -10,7 +10,7 @@ require recipes-kernel/linux/linux-dtb.inc
 require recipes-kernel/linux/linux.inc
 
 # Pull in the devicetree files into the rootfs
-RDEPENDS_kernel-base += "kernel-devicetree"
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
 
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
-- 
cgit v1.2.3-54-g00ecf