inmates: Add infrastructure for inmates that serve as tools

We will had an x86 inmate that will support the booting of Linux in
non-root cells. This lays the foundation for such tools, including their
installation into $(libexecdir)/jailhouse.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/Makefile b/Makefile
index 987e0446a6255461faaf54dc2bde3e6cd15d7b0c..799e1e7682dde820e6046192e5f3a94560c053f7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,13 @@ modules_install: modules
 firmware_install: $(DESTDIR)$(firmwaredir) modules
        $(INSTALL_DATA) hypervisor/jailhouse*.bin $<
 
-install: modules_install firmware_install
+ifeq ($(ARCH),)
+TOOL_INMATES_INSTALL := tool_inmates_install
+tool_inmates_install: $(DESTDIR)$(libexecdir)/jailhouse
+       $(INSTALL_DATA) inmates/tools/$(ARCH)/*.bin $<
+endif
+
+install: modules_install firmware_install $(TOOL_INMATES_INSTALL)
        $(Q)$(MAKE) -C tools $@
 
 .PHONY: modules_install install clean firmware_install modules tools docs \

diff --git a/inmates/Makefile b/inmates/Makefile
index 012627a33f4174764ec5b2981a9eefbe5fa67044..0d4ea5d53d37643458b4ba299e642cb930ccdca6 100644 (file)
--- a/inmates/Makefile
+++ b/inmates/Makefile
@@ -30,7 +30,7 @@ endif
 OBJCOPYFLAGS := -O binary
 LDFLAGS += -T
 
-subdir-y := lib/$(SRCARCH) demos/$(SRCARCH)
+subdir-y := lib/$(SRCARCH) demos/$(SRCARCH) tools/$(SRCARCH)
 
-# demos depend on the library
-$(obj)/demos/$(SRCARCH): $(obj)/lib/$(SRCARCH)
+# demos and tools depend on the library
+$(obj)/demos/$(SRCARCH) $(obj)/tools/$(SRCARCH): $(obj)/lib/$(SRCARCH)

diff --git a/inmates/tools/arm/Makefile b/inmates/tools/arm/Makefile
new file mode 100644 (file)
index 0000000..a81719a
--- /dev/null
+++ b/inmates/tools/arm/Makefile
@@ -0,0 +1,17 @@
+#
+# Jailhouse, a Linux-based partitioning hypervisor
+#
+# Copyright (c) Siemens AG, 2013-2015
+#
+# Authors:
+#  Jan Kiszka <jan.kiszka@siemens.com>
+#
+# This work is licensed under the terms of the GNU GPL, version 2.  See
+# the COPYING file in the top-level directory.
+#
+
+include $(INMATES_LIB)/Makefile.lib
+
+INMATES :=
+
+$(eval $(call DECLARE_TARGETS,$(INMATES)))

diff --git a/inmates/tools/x86/Makefile b/inmates/tools/x86/Makefile
new file mode 100644 (file)
index 0000000..a81719a
--- /dev/null
+++ b/inmates/tools/x86/Makefile
@@ -0,0 +1,17 @@
+#
+# Jailhouse, a Linux-based partitioning hypervisor
+#
+# Copyright (c) Siemens AG, 2013-2015
+#
+# Authors:
+#  Jan Kiszka <jan.kiszka@siemens.com>
+#
+# This work is licensed under the terms of the GNU GPL, version 2.  See
+# the COPYING file in the top-level directory.
+#
+
+include $(INMATES_LIB)/Makefile.lib
+
+INMATES :=
+
+$(eval $(call DECLARE_TARGETS,$(INMATES)))

diff --git a/scripts/include.mk b/scripts/include.mk
index 533df93caa192037f38a14b27c2c9d68024891f4..e4a372ab5cce9cf6191b63525823fc0a432151b0 100644 (file)
--- a/scripts/include.mk
+++ b/scripts/include.mk
@@ -48,3 +48,8 @@ INSTALL_DIR     ?= $(INSTALL) -d -m 755
 $(sort $(INSTALL_DIRECTORIES:%=$(DESTDIR)%) \
        $(INSTALL_DIRECTORIES:%=$(DESTDIR)%/jailhouse)):
        $(INSTALL_DIR) $@
+
+ARCH ?= $(shell uname -m)
+ifeq ($(ARCH),x86_64)
+       ARCH = x86
+endif