diff options
author | Ola Redell <ola.redell@retotech.se> | 2017-11-15 21:54:39 +0100 |
---|---|---|
committer | Ola Redell <ola.redell@retotech.se> | 2017-11-15 21:54:39 +0100 |
commit | 3af813eaa50cc3bf5192c0218cf7e779f9f5af01 (patch) | |
tree | dfb2fa235941f723cca0c9b1347fe04597d4bfb8 /recipes-jailhouse/jailhouse/jailhouse-0.6 | |
parent | f2cccf9409c91a33c4394ca4cfafe1cc00f9ce21 (diff) | |
download | meta-jailhouse-3af813eaa50cc3bf5192c0218cf7e779f9f5af01.tar.gz |
Default Jailhouse configuration, add new jailhouse versions
Added variable JH_CONFIG that is used to point to current jailhouse
hypervisor configuration. Added recipes for jailhouse version 0.7
and a _git recipe that tracks HEAD on master.
Diffstat (limited to 'recipes-jailhouse/jailhouse/jailhouse-0.6')
3 files changed, 44 insertions, 0 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 new file mode 100644 index 0000000..e94f69d --- /dev/null +++ b/recipes-jailhouse/jailhouse/jailhouse-0.6/0002-no-ldflags-in-tools.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | diff --git a/tools/Makefile b/tools/Makefile | ||
2 | index 4d91e7a..ecc5503 100644 | ||
3 | --- a/tools/Makefile | ||
4 | +++ b/tools/Makefile | ||
5 | @@ -19,7 +19,7 @@ LINUXINCLUDE := -I$(src)/../driver | ||
6 | KBUILD_CFLAGS := -g -O3 -DLIBEXECDIR=\"$(libexecdir)\" \ | ||
7 | -Wall -Wextra -Wmissing-declarations -Wmissing-prototypes -Werror \ | ||
8 | -DJAILHOUSE_VERSION=\"$(shell cat $(src)/../VERSION)\" $(EXTRA_CFLAGS) | ||
9 | -LDFLAGS := | ||
10 | +#LDFLAGS := $(EXTRA_LDLAGS) | ||
11 | |||
12 | BINARIES := jailhouse | ||
13 | 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 new file mode 100644 index 0000000..7d02b55 --- /dev/null +++ b/recipes-jailhouse/jailhouse/jailhouse-0.6/0003-workaround-if-changed-problem-in-tools-makefile.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | Index: git/tools/Makefile | ||
2 | =================================================================== | ||
3 | --- git.orig/tools/Makefile | ||
4 | +++ git/tools/Makefile | ||
5 | @@ -55,10 +55,11 @@ endef | ||
6 | targets += jailhouse.o | ||
7 | |||
8 | $(obj)/jailhouse: $(obj)/jailhouse.o | ||
9 | - $(call if_changed,ld) | ||
10 | + $(LD) $(LDFLAGS) -o $@ $^ | ||
11 | |||
12 | $(obj)/jailhouse-config-collect: $(src)/jailhouse-config-create $(src)/jailhouse-config-collect.tmpl | ||
13 | - $(call if_changed,gen_collect) | ||
14 | + $< -g $@; \ | ||
15 | + chmod +x $@ | ||
16 | |||
17 | install-bin: $(BINARIES) $(DESTDIR)$(sbindir) | ||
18 | $(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 new file mode 100644 index 0000000..4e0f337 --- /dev/null +++ b/recipes-jailhouse/jailhouse/jailhouse-0.6/0004-no-kbuild-of-tools.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: git/Kbuild | ||
2 | =================================================================== | ||
3 | --- git.orig/Kbuild | ||
4 | +++ git/Kbuild | ||
5 | @@ -11,7 +11,7 @@ | ||
6 | # the COPYING file in the top-level directory. | ||
7 | # | ||
8 | |||
9 | -subdir-y := driver hypervisor configs inmates tools | ||
10 | +subdir-y := driver hypervisor configs inmates | ||
11 | |||
12 | subdir-ccflags-y := -Werror | ||
13 | |||