Merged jailhouse-0.8 into master

3 files changed, 0 insertions, 44 deletions

diff --git a/recipes-jailhouse/jailhouse/jailhouse-0.6/0002-no-ldflags-in-tools.patch b/recipes-jailhouse/jailhouse/jailhouse-0.6/0002-no-ldflags-in-tools.patch
deleted file mode 100644
index e94f69d..0000000
--- a/recipes-jailhouse/jailhouse/jailhouse-0.6/0002-no-ldflags-in-tools.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tools/Makefile b/tools/Makefile
-index 4d91e7a..ecc5503 100644
---- a/tools/Makefile
-+++ b/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 :=
-+#LDFLAGS := $(EXTRA_LDLAGS)
- 
- BINARIES := jailhouse
- HELPERS := \
diff --git a/recipes-jailhouse/jailhouse/jailhouse-0.6/0003-workaround-if-changed-problem-in-tools-makefile.patch b/recipes-jailhouse/jailhouse/jailhouse-0.6/0003-workaround-if-changed-problem-in-tools-makefile.patch
deleted file mode 100644
index 7d02b55..0000000
--- a/recipes-jailhouse/jailhouse/jailhouse-0.6/0003-workaround-if-changed-problem-in-tools-makefile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: git/tools/Makefile
-===================================================================
---- git.orig/tools/Makefile
-+++ git/tools/Makefile
-@@ -55,10 +55,11 @@ endef
- targets += jailhouse.o
- 
- $(obj)/jailhouse: $(obj)/jailhouse.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) $^
diff --git a/recipes-jailhouse/jailhouse/jailhouse-0.6/0004-no-kbuild-of-tools.patch b/recipes-jailhouse/jailhouse/jailhouse-0.6/0004-no-kbuild-of-tools.patch
deleted file mode 100644
index 4e0f337..0000000
--- a/recipes-jailhouse/jailhouse/jailhouse-0.6/0004-no-kbuild-of-tools.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: git/Kbuild
-===================================================================
---- git.orig/Kbuild
-+++ git/Kbuild
-@@ -11,7 +11,7 @@
- # the COPYING file in the top-level directory.
- #
- 
--subdir-y := driver hypervisor configs inmates tools
-+subdir-y := driver hypervisor configs inmates
- 
- subdir-ccflags-y := -Werror
-