Moved to version 0.10 for imx8

6 files changed, 44 insertions, 32 deletions

diff --git a/recipes-jailhouse/jailhouse/jailhouse-0.8/0004-no-kbuild-of-tools.patch b/recipes-jailhouse/jailhouse/jailhouse-0.10/no-kbuild-of-tools.patch
index 30d3b6d..a7c9f99 100644
--- a/recipes-jailhouse/jailhouse/jailhouse-0.8/0004-no-kbuild-of-tools.patch
+++ b/recipes-jailhouse/jailhouse/jailhouse-0.10/no-kbuild-of-tools.patch
@@ -2,9 +2,9 @@ Index: git/Kbuild
 ===================================================================
 --- git.orig/Kbuild
 +++ git/Kbuild
-@@ -53,7 +53,7 @@ $(obj)/driver $(obj)/hypervisor: $(GEN_V
- 
- endif
+@@ -41,7 +41,7 @@ GEN_VERSION_H := $(obj)/hypervisor/inclu
+ $(GEN_VERSION_H): $(src)/Makefile FORCE
+        $(call filechk,version)
  
 -subdir-y := driver hypervisor configs inmates tools
 +subdir-y := driver hypervisor configs inmates
diff --git a/recipes-jailhouse/jailhouse/jailhouse-0.10/tools-makefile-man-pages.patch b/recipes-jailhouse/jailhouse/jailhouse-0.10/tools-makefile-man-pages.patch
new file mode 100644
index 0000000..75e676f
--- /dev/null
+++ b/recipes-jailhouse/jailhouse/jailhouse-0.10/tools-makefile-man-pages.patch
@@ -0,0 +1,13 @@
+Index: git/tools/Makefile
+===================================================================
+--- git.orig/tools/Makefile
++++ git/tools/Makefile
+@@ -122,7 +122,7 @@ targets += $(MAN8_PAGES)
+ always +=  $(MAN8_PAGES)
+ 
+ $(obj)/%.8: $(src)/%.8.in
+-       $(call if_changed,gen_man)
++       sed 's/$${VERSION}/$(shell cat $(src)/../VERSION)/g' $< > $@
+ 
+ install-bin: $(BINARIES) $(DESTDIR)$(sbindir)
+        $(INSTALL_PROGRAM) $^
diff --git a/recipes-jailhouse/jailhouse/jailhouse-0.8/0005-tools-makefile.patch b/recipes-jailhouse/jailhouse/jailhouse-0.10/tools-makefile.patch
index ea041a9..e2b170e 100644
--- a/recipes-jailhouse/jailhouse/jailhouse-0.8/0005-tools-makefile.patch
+++ b/recipes-jailhouse/jailhouse/jailhouse-0.10/tools-makefile.patch
@@ -2,16 +2,16 @@ Index: git/tools/Makefile
 ===================================================================
 --- git.orig/tools/Makefile
 +++ git/tools/Makefile
-@@ -19,7 +19,7 @@ LINUXINCLUDE := -I$(src)/../driver
- KBUILD_CFLAGS := -g -O3 -DLIBEXECDIR=\"$(libexecdir)\" \
-        -Wall -Wextra -Wmissing-declarations -Wmissing-prototypes -Werror \
+@@ -23,7 +23,7 @@ KBUILD_CFLAGS := -g -O3 -DLIBEXECDIR=\"$
+        -D__LINUX_COMPILER_TYPES_H \
         -DJAILHOUSE_VERSION=\"$(shell cat $(src)/../VERSION)\" $(EXTRA_CFLAGS)
+ # prior to 4.19
 -LDFLAGS :=
-+
- GCOV_PROFILE := n
++#LDFLAGS :=
+ # since 4.19
+ KBUILD_LDFLAGS :=
  
- BINARIES := jailhouse
-@@ -57,7 +57,7 @@ endef
+@@ -101,7 +101,7 @@ endef
  targets += jailhouse.o
  
  $(obj)/jailhouse: $(obj)/jailhouse.o
@@ -20,7 +20,7 @@ Index: git/tools/Makefile
  
  CFLAGS_jailhouse-gcov-extract.o        := -I$(src)/../hypervisor/include \
         -I$(src)/../hypervisor/arch/$(SRCARCH)/include
-@@ -68,10 +68,11 @@ targets += jailhouse-gcov-extract.o
+@@ -112,10 +112,11 @@ targets += jailhouse-gcov-extract.o
  always += jailhouse-gcov-extract
  
  $(obj)/jailhouse-gcov-extract: $(obj)/jailhouse-gcov-extract.o
@@ -32,5 +32,5 @@ Index: git/tools/Makefile
 +       $< -g $@; \
 +       chmod +x $@
  
- install-bin: $(BINARIES) $(DESTDIR)$(sbindir)
-        $(INSTALL_PROGRAM) $^
+ targets += $(MAN8_PAGES)
+ always +=  $(MAN8_PAGES)
diff --git a/recipes-jailhouse/jailhouse/jailhouse.inc b/recipes-jailhouse/jailhouse/jailhouse.inc
index c6d959a..3ce9bbf 100644
--- a/recipes-jailhouse/jailhouse/jailhouse.inc
+++ b/recipes-jailhouse/jailhouse/jailhouse.inc
@@ -21,12 +21,10 @@ S ="${WORKDIR}/git"
 require jailhouse-defs.inc
 inherit module pythonnative bash-completion setuptools kernel-arch
 
-JH_CONFIG ?= "${S}/ci/jailhouse-config-x86.h"
+JH_CONFIG ?= ""
 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} ]; 
@@ -67,8 +65,6 @@ 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() {
@@ -79,8 +75,7 @@ do_install() {
                KDIR=${STAGING_KERNEL_BUILDDIR} \
                DESTDIR=${D} install
 
-    #distutils_do_install
-    distutils_do_compile
+    distutils_do_install
 
     install -d ${D}${CELL_DIR}
     install ${B}/configs/${ARCH}/*.cell ${D}${CELL_DIR}/
@@ -96,7 +91,7 @@ do_install() {
     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 ${B}/inmates/tools/${ARCH}/linux-loader.bin ${D}${INMATES_DIR}/tools/${ARCH}
 
     install -d ${D}${PYTHON_SITEPACKAGES_DIR}/pyjailhouse
     install -m 0644 ${B}/build${base_libdir}/pyjailhouse/*.py ${D}${PYTHON_SITEPACKAGES_DIR}/pyjailhouse
diff --git a/recipes-jailhouse/jailhouse/jailhouse_0.10.bb b/recipes-jailhouse/jailhouse/jailhouse_0.10.bb
new file mode 100644
index 0000000..6b2b5d2
--- /dev/null
+++ b/recipes-jailhouse/jailhouse/jailhouse_0.10.bb
@@ -0,0 +1,15 @@
+require jailhouse.inc
+
+JAILHOUSE_SRCBRANCH = "master"
+JAILHOUSE_SRC ?= "git://github.com/siemens/jailhouse.git;protocol=git"
+ 
+SRC_URI = "${JAILHOUSE_SRC};branch=${JAILHOUSE_SRCBRANCH} \
+          file://no-kbuild-of-tools.patch \
+          file://tools-makefile.patch \
+          file://tools-makefile-man-pages.patch"
+
+SRCREV = "f596aa7355bc2134650544bdf1e13f1f55d3f2fc"
+
+CELLS = ""
+
+COMPATIBLE_MACHINE = "${@bb.utils.contains('MACHINE_FEATURES', 'jailhouse', '${MACHINE}', '(^$)', d)}"
diff --git a/recipes-jailhouse/jailhouse/jailhouse_0.8.bb b/recipes-jailhouse/jailhouse/jailhouse_0.8.bb
deleted file mode 100644
index 4181776..0000000
--- a/recipes-jailhouse/jailhouse/jailhouse_0.8.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require jailhouse.inc
-
-SRC_URI = "git://github.com/siemens/jailhouse.git;protocol=git \
-          file://0004-no-kbuild-of-tools.patch \
-          file://0005-tools-makefile.patch \
-        "
-
-SRCREV = "07341fa315a7fabb38f07cd3c0b3fe880cffaa65"
-
-CELLS = ""
-