Merged jailhouse-0.8 into master

2 files changed, 49 insertions, 0 deletions

diff --git a/recipes-jailhouse/jailhouse/jailhouse-0.8/0004-no-kbuild-of-tools.patch b/recipes-jailhouse/jailhouse/jailhouse-0.8/0004-no-kbuild-of-tools.patch
new file mode 100644
index 0000000..30d3b6d
--- /dev/null
+++ b/recipes-jailhouse/jailhouse/jailhouse-0.8/0004-no-kbuild-of-tools.patch
@@ -0,0 +1,13 @@
+Index: git/Kbuild
+===================================================================
+--- git.orig/Kbuild
++++ git/Kbuild
+@@ -53,7 +53,7 @@ $(obj)/driver $(obj)/hypervisor: $(GEN_V
+ 
+ endif
+ 
+-subdir-y := driver hypervisor configs inmates tools
++subdir-y := driver hypervisor configs inmates
+ 
+ subdir-ccflags-y := -Werror
+ 
diff --git a/recipes-jailhouse/jailhouse/jailhouse-0.8/0005-tools-makefile.patch b/recipes-jailhouse/jailhouse/jailhouse-0.8/0005-tools-makefile.patch
new file mode 100644
index 0000000..ea041a9
--- /dev/null
+++ b/recipes-jailhouse/jailhouse/jailhouse-0.8/0005-tools-makefile.patch
@@ -0,0 +1,36 @@
+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 \
+        -DJAILHOUSE_VERSION=\"$(shell cat $(src)/../VERSION)\" $(EXTRA_CFLAGS)
+-LDFLAGS :=
++
+ GCOV_PROFILE := n
+ 
+ BINARIES := jailhouse
+@@ -57,7 +57,7 @@ endef
+ targets += jailhouse.o
+ 
+ $(obj)/jailhouse: $(obj)/jailhouse.o
+-       $(call if_changed,ld)
++       $(LD) $(LDFLAGS) -o $@ $^
+ 
+ CFLAGS_jailhouse-gcov-extract.o        := -I$(src)/../hypervisor/include \
+        -I$(src)/../hypervisor/arch/$(SRCARCH)/include
+@@ -68,10 +68,11 @@ targets += jailhouse-gcov-extract.o
+ always += jailhouse-gcov-extract
+ 
+ $(obj)/jailhouse-gcov-extract: $(obj)/jailhouse-gcov-extract.o
+-       $(call if_changed,ld)
++       $(LD) $(LDFLAGS) -o $@ $^
+ 
+ $(obj)/jailhouse-config-collect: $(src)/jailhouse-config-create $(src)/jailhouse-config-collect.tmpl
+-       $(call if_changed,gen_collect)
++       $< -g $@; \
++       chmod +x $@
+ 
+ install-bin: $(BINARIES) $(DESTDIR)$(sbindir)
+        $(INSTALL_PROGRAM) $^