hacky fix for building jailhouse 0.9+ with git recipe

7 files changed, 50 insertions, 26 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index c81174e..5826443 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -8,3 +8,5 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "jailhouse"
 BBFILE_PATTERN_jailhouse = "^${LAYERDIR}/"
 BBFILE_PRIORITY_jailhouse = "6"
+
+LAYERSERIES_COMPAT_jailhouse = "sumo"
\ No newline at end of file
diff --git a/recipes-jailhouse/jailhouse/jailhouse-defs.inc b/recipes-jailhouse/jailhouse/jailhouse-defs.inc
index 8dd30e3..0c8eb40 100644
--- a/recipes-jailhouse/jailhouse/jailhouse-defs.inc
+++ b/recipes-jailhouse/jailhouse/jailhouse-defs.inc
@@ -22,4 +22,4 @@ def map_jh_arch(a, d):
     else:
         bb.error("cannot map '%s' to a jailhouse supported architecture" % a)
 
-export JH_ARCH = "${@map_jh_arch(d.getVar('TARGET_ARCH', True), d)}"
+JH_ARCH = "${@map_jh_arch(d.getVar('TARGET_ARCH', True), d)}"
diff --git a/recipes-jailhouse/jailhouse/jailhouse-git/0004-no-kbuild-of-tools.patch b/recipes-jailhouse/jailhouse/jailhouse-git/no-kbuild-of-tools.patch
index 30d3b6d..a7c9f99 100644
--- a/recipes-jailhouse/jailhouse/jailhouse-git/0004-no-kbuild-of-tools.patch
+++ b/recipes-jailhouse/jailhouse/jailhouse-git/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-git/tools-makefile-man-pages.patch b/recipes-jailhouse/jailhouse/jailhouse-git/tools-makefile-man-pages.patch
new file mode 100644
index 0000000..75e676f
--- /dev/null
+++ b/recipes-jailhouse/jailhouse/jailhouse-git/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-git/0005-tools-makefile.patch b/recipes-jailhouse/jailhouse/jailhouse-git/tools-makefile.patch
index ea041a9..e2b170e 100644
--- a/recipes-jailhouse/jailhouse/jailhouse-git/0005-tools-makefile.patch
+++ b/recipes-jailhouse/jailhouse/jailhouse-git/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 e916196..49ac544 100644
--- a/recipes-jailhouse/jailhouse/jailhouse.inc
+++ b/recipes-jailhouse/jailhouse/jailhouse.inc
@@ -35,34 +35,42 @@ do_configure() {
 
 USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \
                   -DJAILHOUSE_VERSION=\\\"$JAILHOUSE_VERSION\\\" \
-                  -Wall -Wextra -Wmissing-declarations -Wmissing-prototypes -Werror \
+                  -Wall -Wextra -Wmissing-declarations -Wmissing-prototypes \
+                  -Werror -D__LINUX_COMPILER_TYPES_H \
                   -I../driver'
 
 TOOLS_SRC_DIR = "${S}/tools"
 TOOLS_OBJ_DIR = "${S}/tools"
 
+export LDFLAGS = ""
+
 do_compile() {
-   oe_runmake V=0 \
-        ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} \
+   oe_runmake V=1 \
+        ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} \
         KDIR=${STAGING_KERNEL_BUILDDIR}
 
    cd ${TOOLS_SRC_DIR}
    export JAILHOUSE_VERSION=$(cat ../VERSION)
-   oe_runmake V=0 \
+   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
+                ${TOOLS_OBJ_DIR}/jailhouse-cell-linux \
+                ${TOOLS_OBJ_DIR}/jailhouse-cell-stats \
+               ${TOOLS_OBJ_DIR}/jailhouse-config-collect \
+               ${TOOLS_OBJ_DIR}/jailhouse.8 ${TOOLS_OBJ_DIR}/jailhouse-cell.8 \
+               ${TOOLS_OBJ_DIR}/jailhouse-enable.8 \
+               ${TOOLS_OBJ_DIR}/jailhouse
 }
 
 do_install() {
     oe_runmake \
-               ARCH=${TARGET_ARCH} \
+               ARCH=${JH_ARCH} \
                CROSS_COMPILE=${TARGET_PREFIX} \
                KDIR=${STAGING_KERNEL_BUILDDIR} \
                DESTDIR=${D} install
 
     install -d ${D}${CELL_DIR}
-    install ${B}/configs/*.cell ${D}${CELL_DIR}/
+    install ${B}/configs/${JH_ARCH}/*.cell ${D}${CELL_DIR}/
 
     install -d ${D}${INMATES_DIR}
     install ${B}/inmates/demos/${JH_ARCH}/*.bin ${D}${INMATES_DIR}
diff --git a/recipes-jailhouse/jailhouse/jailhouse_git.bb b/recipes-jailhouse/jailhouse/jailhouse_git.bb
index 907dc8c..5432047 100644
--- a/recipes-jailhouse/jailhouse/jailhouse_git.bb
+++ b/recipes-jailhouse/jailhouse/jailhouse_git.bb
@@ -3,13 +3,14 @@ require jailhouse.inc
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-git:"
 
 SRC_URI = "git://github.com/siemens/jailhouse.git;protocol=git \
-          file://0004-no-kbuild-of-tools.patch \
-          file://0005-tools-makefile.patch \
-        "
+          file://no-kbuild-of-tools.patch \
+          file://tools-makefile.patch \
+          file://tools-makefile-man-pages.patch"
+
 
 SRCREV = "${AUTOREV}"
-PV = "0.8-git${SRCPV}"
+PV = "0.9-git${SRCPV}"
 
 CELLS = ""
 
-DEFAULT_PREFERENCE = "-1"
+#DEFAULT_PREFERENCE = "-1"