diff options
author | Ola Redell <ola.redell@retotech.se> | 2017-12-29 22:38:57 +0100 |
---|---|---|
committer | Ola Redell <ola.redell@retotech.se> | 2017-12-29 22:38:57 +0100 |
commit | ae7608e59c336d97d550ba4c08a927b58d3703e7 (patch) | |
tree | 1051015216f875a255db498a6b6f94ef7b8c8999 | |
parent | a4a0e54936cbd80439fe9d524fbb4653664d8959 (diff) | |
parent | e15d02bbaa82aeb346e6e1cc14569677f202f6ba (diff) | |
download | meta-jailhouse-ae7608e59c336d97d550ba4c08a927b58d3703e7.tar.gz |
Merged jailhouse-0.8 into master
10 files changed, 51 insertions, 55 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 @@ | |||
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 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 @@ | |||
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.7/0004-no-kbuild-of-tools.patch b/recipes-jailhouse/jailhouse/jailhouse-0.8/0004-no-kbuild-of-tools.patch index 30d3b6d..30d3b6d 100644 --- a/recipes-jailhouse/jailhouse/jailhouse-0.7/0004-no-kbuild-of-tools.patch +++ b/recipes-jailhouse/jailhouse/jailhouse-0.8/0004-no-kbuild-of-tools.patch | |||
diff --git a/recipes-jailhouse/jailhouse/jailhouse-0.7/0005-tools-makefile.patch b/recipes-jailhouse/jailhouse/jailhouse-0.8/0005-tools-makefile.patch index ea041a9..ea041a9 100644 --- a/recipes-jailhouse/jailhouse/jailhouse-0.7/0005-tools-makefile.patch +++ b/recipes-jailhouse/jailhouse/jailhouse-0.8/0005-tools-makefile.patch | |||
diff --git a/recipes-jailhouse/jailhouse/jailhouse-0.6/0004-no-kbuild-of-tools.patch b/recipes-jailhouse/jailhouse/jailhouse-git/0004-no-kbuild-of-tools.patch index 4e0f337..30d3b6d 100644 --- a/recipes-jailhouse/jailhouse/jailhouse-0.6/0004-no-kbuild-of-tools.patch +++ b/recipes-jailhouse/jailhouse/jailhouse-git/0004-no-kbuild-of-tools.patch | |||
@@ -2,9 +2,9 @@ Index: git/Kbuild | |||
2 | =================================================================== | 2 | =================================================================== |
3 | --- git.orig/Kbuild | 3 | --- git.orig/Kbuild |
4 | +++ git/Kbuild | 4 | +++ git/Kbuild |
5 | @@ -11,7 +11,7 @@ | 5 | @@ -53,7 +53,7 @@ $(obj)/driver $(obj)/hypervisor: $(GEN_V |
6 | # the COPYING file in the top-level directory. | 6 | |
7 | # | 7 | endif |
8 | 8 | ||
9 | -subdir-y := driver hypervisor configs inmates tools | 9 | -subdir-y := driver hypervisor configs inmates tools |
10 | +subdir-y := driver hypervisor configs inmates | 10 | +subdir-y := driver hypervisor configs inmates |
diff --git a/recipes-jailhouse/jailhouse/jailhouse-git/0005-tools-makefile.patch b/recipes-jailhouse/jailhouse/jailhouse-git/0005-tools-makefile.patch new file mode 100644 index 0000000..ea041a9 --- /dev/null +++ b/recipes-jailhouse/jailhouse/jailhouse-git/0005-tools-makefile.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | Index: git/tools/Makefile | ||
2 | =================================================================== | ||
3 | --- git.orig/tools/Makefile | ||
4 | +++ git/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 | + | ||
11 | GCOV_PROFILE := n | ||
12 | |||
13 | BINARIES := jailhouse | ||
14 | @@ -57,7 +57,7 @@ endef | ||
15 | targets += jailhouse.o | ||
16 | |||
17 | $(obj)/jailhouse: $(obj)/jailhouse.o | ||
18 | - $(call if_changed,ld) | ||
19 | + $(LD) $(LDFLAGS) -o $@ $^ | ||
20 | |||
21 | CFLAGS_jailhouse-gcov-extract.o := -I$(src)/../hypervisor/include \ | ||
22 | -I$(src)/../hypervisor/arch/$(SRCARCH)/include | ||
23 | @@ -68,10 +68,11 @@ targets += jailhouse-gcov-extract.o | ||
24 | always += jailhouse-gcov-extract | ||
25 | |||
26 | $(obj)/jailhouse-gcov-extract: $(obj)/jailhouse-gcov-extract.o | ||
27 | - $(call if_changed,ld) | ||
28 | + $(LD) $(LDFLAGS) -o $@ $^ | ||
29 | |||
30 | $(obj)/jailhouse-config-collect: $(src)/jailhouse-config-create $(src)/jailhouse-config-collect.tmpl | ||
31 | - $(call if_changed,gen_collect) | ||
32 | + $< -g $@; \ | ||
33 | + chmod +x $@ | ||
34 | |||
35 | install-bin: $(BINARIES) $(DESTDIR)$(sbindir) | ||
36 | $(INSTALL_PROGRAM) $^ | ||
diff --git a/recipes-jailhouse/jailhouse/jailhouse.inc b/recipes-jailhouse/jailhouse/jailhouse.inc index e2d7ed1..e916196 100644 --- a/recipes-jailhouse/jailhouse/jailhouse.inc +++ b/recipes-jailhouse/jailhouse/jailhouse.inc | |||
@@ -2,12 +2,14 @@ SUMMARY = "Jailhouse" | |||
2 | HOMEPAGE = "https://github.com/siemens/jailhouse" | 2 | HOMEPAGE = "https://github.com/siemens/jailhouse" |
3 | SECTION = "jailhouse" | 3 | SECTION = "jailhouse" |
4 | LICENSE = "GPL-2.0 & BSD-2-Clause" | 4 | LICENSE = "GPL-2.0 & BSD-2-Clause" |
5 | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ |
6 | file://tools/root-cell-config.c.tmpl;beginline=6;endline=33;md5=2825581c1666c44a17955dc574cfbfb3 \ | 7 | file://tools/root-cell-config.c.tmpl;beginline=6;endline=33;md5=2825581c1666c44a17955dc574cfbfb3 \ |
7 | file://hypervisor/include/jailhouse/hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ | 8 | file://include/jailhouse/hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ |
8 | file://hypervisor/include/jailhouse/cell-config.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ | 9 | file://include/jailhouse/cell-config.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ |
9 | file://hypervisor/arch/arm/include/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ | 10 | file://include/arch/arm/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ |
10 | file://hypervisor/arch/x86/include/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ | 11 | file://include/arch/arm64/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ |
12 | file://include/arch/x86/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ | ||
11 | file://driver/jailhouse.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3" | 13 | file://driver/jailhouse.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3" |
12 | 14 | ||
13 | DEPENDS = "virtual/kernel make-native python-mako-native dtc-native python-mako" | 15 | DEPENDS = "virtual/kernel make-native python-mako-native dtc-native python-mako" |
@@ -28,7 +30,7 @@ do_configure() { | |||
28 | cp "${STAGING_DIR_HOST}/${CELLCONF_DIR}/"*.c ${S}/configs/ | 30 | cp "${STAGING_DIR_HOST}/${CELLCONF_DIR}/"*.c ${S}/configs/ |
29 | fi | 31 | fi |
30 | 32 | ||
31 | cp -av ${JH_CONFIG} ${S}/hypervisor/include/jailhouse/config.h | 33 | cp -av ${JH_CONFIG} ${S}/include/jailhouse/config.h |
32 | } | 34 | } |
33 | 35 | ||
34 | USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \ | 36 | USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \ |
@@ -40,13 +42,13 @@ TOOLS_SRC_DIR = "${S}/tools" | |||
40 | TOOLS_OBJ_DIR = "${S}/tools" | 42 | TOOLS_OBJ_DIR = "${S}/tools" |
41 | 43 | ||
42 | do_compile() { | 44 | do_compile() { |
43 | oe_runmake V=1 \ | 45 | oe_runmake V=0 \ |
44 | ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} \ | 46 | ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} \ |
45 | KDIR=${STAGING_KERNEL_BUILDDIR} | 47 | KDIR=${STAGING_KERNEL_BUILDDIR} |
46 | 48 | ||
47 | cd ${TOOLS_SRC_DIR} | 49 | cd ${TOOLS_SRC_DIR} |
48 | export JAILHOUSE_VERSION=$(cat ../VERSION) | 50 | export JAILHOUSE_VERSION=$(cat ../VERSION) |
49 | oe_runmake V=1 \ | 51 | oe_runmake V=0 \ |
50 | CFLAGS="${USER_SPACE_CFLAGS}" \ | 52 | CFLAGS="${USER_SPACE_CFLAGS}" \ |
51 | src=${TOOLS_SRC_DIR} obj=${TOOLS_OBJ_DIR} \ | 53 | src=${TOOLS_SRC_DIR} obj=${TOOLS_OBJ_DIR} \ |
52 | ${TOOLS_OBJ_DIR}/jailhouse-config-collect ${TOOLS_OBJ_DIR}/jailhouse | 54 | ${TOOLS_OBJ_DIR}/jailhouse-config-collect ${TOOLS_OBJ_DIR}/jailhouse |
diff --git a/recipes-jailhouse/jailhouse/jailhouse_0.6.bb b/recipes-jailhouse/jailhouse/jailhouse_0.6.bb deleted file mode 100644 index fe63070..0000000 --- a/recipes-jailhouse/jailhouse/jailhouse_0.6.bb +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | require jailhouse.inc | ||
2 | |||
3 | SRC_URI = "git://github.com/siemens/jailhouse.git;protocol=git \ | ||
4 | file://0002-no-ldflags-in-tools.patch \ | ||
5 | file://0003-workaround-if-changed-problem-in-tools-makefile.patch \ | ||
6 | file://0004-no-kbuild-of-tools.patch \ | ||
7 | " | ||
8 | |||
9 | SRCREV = "81528e48763c8dfc10851c49968eb3d053d4b85c" | ||
10 | |||
11 | CELLS = "" | ||
diff --git a/recipes-jailhouse/jailhouse/jailhouse_0.7.bb b/recipes-jailhouse/jailhouse/jailhouse_0.8.bb index dcc6af5..4181776 100644 --- a/recipes-jailhouse/jailhouse/jailhouse_0.7.bb +++ b/recipes-jailhouse/jailhouse/jailhouse_0.8.bb | |||
@@ -5,7 +5,7 @@ SRC_URI = "git://github.com/siemens/jailhouse.git;protocol=git \ | |||
5 | file://0005-tools-makefile.patch \ | 5 | file://0005-tools-makefile.patch \ |
6 | " | 6 | " |
7 | 7 | ||
8 | SRCREV = "5c13b6409b6088ab717e8af444e11839868302eb" | 8 | SRCREV = "07341fa315a7fabb38f07cd3c0b3fe880cffaa65" |
9 | 9 | ||
10 | CELLS = "" | 10 | CELLS = "" |
11 | 11 | ||
diff --git a/recipes-jailhouse/jailhouse/jailhouse_git.bb b/recipes-jailhouse/jailhouse/jailhouse_git.bb index ec8e1d3..907dc8c 100644 --- a/recipes-jailhouse/jailhouse/jailhouse_git.bb +++ b/recipes-jailhouse/jailhouse/jailhouse_git.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require jailhouse.inc | 1 | require jailhouse.inc |
2 | 2 | ||
3 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-0.7:" | 3 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-git:" |
4 | 4 | ||
5 | SRC_URI = "git://github.com/siemens/jailhouse.git;protocol=git \ | 5 | SRC_URI = "git://github.com/siemens/jailhouse.git;protocol=git \ |
6 | file://0004-no-kbuild-of-tools.patch \ | 6 | file://0004-no-kbuild-of-tools.patch \ |
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/siemens/jailhouse.git;protocol=git \ | |||
8 | " | 8 | " |
9 | 9 | ||
10 | SRCREV = "${AUTOREV}" | 10 | SRCREV = "${AUTOREV}" |
11 | PV = "0.7-git${SRCPV}" | 11 | PV = "0.8-git${SRCPV}" |
12 | 12 | ||
13 | CELLS = "" | 13 | CELLS = "" |
14 | 14 | ||