From 697eeb3669ea95a3e55fed711d5511e7f6262113 Mon Sep 17 00:00:00 2001 From: Ola Redell Date: Thu, 28 Dec 2017 13:38:30 +0100 Subject: recipe for jailhouse 0.8 and updated -git recipe --- .../jailhouse-0.8/0004-no-kbuild-of-tools.patch | 13 ++++++++ .../jailhouse-0.8/0005-tools-makefile.patch | 36 ++++++++++++++++++++++ .../jailhouse-git/0004-no-kbuild-of-tools.patch | 13 ++++++++ .../jailhouse-git/0005-tools-makefile.patch | 36 ++++++++++++++++++++++ recipes-jailhouse/jailhouse/jailhouse.inc | 16 +++++----- recipes-jailhouse/jailhouse/jailhouse_0.8.bb | 11 +++++++ recipes-jailhouse/jailhouse/jailhouse_git.bb | 4 +-- 7 files changed, 120 insertions(+), 9 deletions(-) create mode 100644 recipes-jailhouse/jailhouse/jailhouse-0.8/0004-no-kbuild-of-tools.patch create mode 100644 recipes-jailhouse/jailhouse/jailhouse-0.8/0005-tools-makefile.patch create mode 100644 recipes-jailhouse/jailhouse/jailhouse-git/0004-no-kbuild-of-tools.patch create mode 100644 recipes-jailhouse/jailhouse/jailhouse-git/0005-tools-makefile.patch create mode 100644 recipes-jailhouse/jailhouse/jailhouse_0.8.bb 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) $^ diff --git a/recipes-jailhouse/jailhouse/jailhouse-git/0004-no-kbuild-of-tools.patch b/recipes-jailhouse/jailhouse/jailhouse-git/0004-no-kbuild-of-tools.patch new file mode 100644 index 0000000..30d3b6d --- /dev/null +++ b/recipes-jailhouse/jailhouse/jailhouse-git/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-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 @@ +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) $^ 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" HOMEPAGE = "https://github.com/siemens/jailhouse" SECTION = "jailhouse" LICENSE = "GPL-2.0 & BSD-2-Clause" + LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ file://tools/root-cell-config.c.tmpl;beginline=6;endline=33;md5=2825581c1666c44a17955dc574cfbfb3 \ - file://hypervisor/include/jailhouse/hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ - file://hypervisor/include/jailhouse/cell-config.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ - file://hypervisor/arch/arm/include/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ - file://hypervisor/arch/x86/include/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ + file://include/jailhouse/hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ + file://include/jailhouse/cell-config.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ + file://include/arch/arm/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ + file://include/arch/arm64/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ + file://include/arch/x86/asm/jailhouse_hypercall.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3 \ file://driver/jailhouse.h;beginline=9;endline=36;md5=2825581c1666c44a17955dc574cfbfb3" DEPENDS = "virtual/kernel make-native python-mako-native dtc-native python-mako" @@ -28,7 +30,7 @@ do_configure() { cp "${STAGING_DIR_HOST}/${CELLCONF_DIR}/"*.c ${S}/configs/ fi - cp -av ${JH_CONFIG} ${S}/hypervisor/include/jailhouse/config.h + cp -av ${JH_CONFIG} ${S}/include/jailhouse/config.h } USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \ @@ -40,13 +42,13 @@ TOOLS_SRC_DIR = "${S}/tools" TOOLS_OBJ_DIR = "${S}/tools" do_compile() { - oe_runmake V=1 \ + oe_runmake V=0 \ ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} \ KDIR=${STAGING_KERNEL_BUILDDIR} cd ${TOOLS_SRC_DIR} export JAILHOUSE_VERSION=$(cat ../VERSION) - oe_runmake V=1 \ + oe_runmake V=0 \ CFLAGS="${USER_SPACE_CFLAGS}" \ src=${TOOLS_SRC_DIR} obj=${TOOLS_OBJ_DIR} \ ${TOOLS_OBJ_DIR}/jailhouse-config-collect ${TOOLS_OBJ_DIR}/jailhouse diff --git a/recipes-jailhouse/jailhouse/jailhouse_0.8.bb b/recipes-jailhouse/jailhouse/jailhouse_0.8.bb new file mode 100644 index 0000000..4181776 --- /dev/null +++ b/recipes-jailhouse/jailhouse/jailhouse_0.8.bb @@ -0,0 +1,11 @@ +require jailhouse.inc + +SRC_URI = "git://github.com/siemens/jailhouse.git;protocol=git \ + file://0004-no-kbuild-of-tools.patch \ + file://0005-tools-makefile.patch \ + " + +SRCREV = "07341fa315a7fabb38f07cd3c0b3fe880cffaa65" + +CELLS = "" + 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 @@ require jailhouse.inc -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-0.7:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-git:" SRC_URI = "git://github.com/siemens/jailhouse.git;protocol=git \ file://0004-no-kbuild-of-tools.patch \ @@ -8,7 +8,7 @@ SRC_URI = "git://github.com/siemens/jailhouse.git;protocol=git \ " SRCREV = "${AUTOREV}" -PV = "0.7-git${SRCPV}" +PV = "0.8-git${SRCPV}" CELLS = "" -- cgit v1.2.3-54-g00ecf From 5c476eab0ab43f5ff83215488474fdb6e2a3432c Mon Sep 17 00:00:00 2001 From: Ola Redell Date: Thu, 28 Dec 2017 14:07:43 +0100 Subject: removed old recipes for jailhouse 0.6 and 0.7 --- .../jailhouse-0.6/0002-no-ldflags-in-tools.patch | 13 -------- ...ound-if-changed-problem-in-tools-makefile.patch | 18 ----------- .../jailhouse-0.6/0004-no-kbuild-of-tools.patch | 13 -------- .../jailhouse-0.7/0004-no-kbuild-of-tools.patch | 13 -------- .../jailhouse-0.7/0005-tools-makefile.patch | 36 ---------------------- recipes-jailhouse/jailhouse/jailhouse_0.6.bb | 11 ------- recipes-jailhouse/jailhouse/jailhouse_0.7.bb | 11 ------- 7 files changed, 115 deletions(-) delete mode 100644 recipes-jailhouse/jailhouse/jailhouse-0.6/0002-no-ldflags-in-tools.patch delete mode 100644 recipes-jailhouse/jailhouse/jailhouse-0.6/0003-workaround-if-changed-problem-in-tools-makefile.patch delete mode 100644 recipes-jailhouse/jailhouse/jailhouse-0.6/0004-no-kbuild-of-tools.patch delete mode 100644 recipes-jailhouse/jailhouse/jailhouse-0.7/0004-no-kbuild-of-tools.patch delete mode 100644 recipes-jailhouse/jailhouse/jailhouse-0.7/0005-tools-makefile.patch delete mode 100644 recipes-jailhouse/jailhouse/jailhouse_0.6.bb delete mode 100644 recipes-jailhouse/jailhouse/jailhouse_0.7.bb 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 - diff --git a/recipes-jailhouse/jailhouse/jailhouse-0.7/0004-no-kbuild-of-tools.patch b/recipes-jailhouse/jailhouse/jailhouse-0.7/0004-no-kbuild-of-tools.patch deleted file mode 100644 index 30d3b6d..0000000 --- a/recipes-jailhouse/jailhouse/jailhouse-0.7/0004-no-kbuild-of-tools.patch +++ /dev/null @@ -1,13 +0,0 @@ -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.7/0005-tools-makefile.patch b/recipes-jailhouse/jailhouse/jailhouse-0.7/0005-tools-makefile.patch deleted file mode 100644 index ea041a9..0000000 --- a/recipes-jailhouse/jailhouse/jailhouse-0.7/0005-tools-makefile.patch +++ /dev/null @@ -1,36 +0,0 @@ -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) $^ 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 @@ -require jailhouse.inc - -SRC_URI = "git://github.com/siemens/jailhouse.git;protocol=git \ - file://0002-no-ldflags-in-tools.patch \ - file://0003-workaround-if-changed-problem-in-tools-makefile.patch \ - file://0004-no-kbuild-of-tools.patch \ - " - -SRCREV = "81528e48763c8dfc10851c49968eb3d053d4b85c" - -CELLS = "" diff --git a/recipes-jailhouse/jailhouse/jailhouse_0.7.bb b/recipes-jailhouse/jailhouse/jailhouse_0.7.bb deleted file mode 100644 index dcc6af5..0000000 --- a/recipes-jailhouse/jailhouse/jailhouse_0.7.bb +++ /dev/null @@ -1,11 +0,0 @@ -require jailhouse.inc - -SRC_URI = "git://github.com/siemens/jailhouse.git;protocol=git \ - file://0004-no-kbuild-of-tools.patch \ - file://0005-tools-makefile.patch \ - " - -SRCREV = "5c13b6409b6088ab717e8af444e11839868302eb" - -CELLS = "" - -- cgit v1.2.3-54-g00ecf