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