core/driver: Move version.h to generated directory

Now that we have such a directory, we should also use it for all files
generated during the build. This moves version.h.

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

diff --git a/.gitignore b/.gitignore
index 35a96209f8b85d87436883d7dda7ab68673f9ddb..c501f5e93db8320e992389adbb8fff5deb2b9a3a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,6 @@ modules.order
 driver/jailhouse.ko
 hypervisor/include/jailhouse/config.h
 hypervisor/include/jailhouse/config.mk
-hypervisor/include/jailhouse/version.h
 hypervisor/hypervisor.lds
 tools/jailhouse
 tools/jailhouse-config-collect

diff --git a/driver/Makefile b/driver/Makefile
index 745872d65651ffd0c59114e2e5252fbd5810f5fd..1a94928d7d258164ae4af1c64a97bf8b56cd4f52 100644 (file)
--- a/driver/Makefile
+++ b/driver/Makefile
@@ -18,4 +18,4 @@ ccflags-y := -I$(src)/../hypervisor/arch/$(SRCARCH)/include \
 
 jailhouse-y := main.o
 
-$(obj)/main.o: $(obj)/../hypervisor/include/jailhouse/version.h
+$(obj)/main.o: $(obj)/../hypervisor/include/generated/version.h

diff --git a/driver/main.c b/driver/main.c
index 86299d51df6455036b1a32ab39a028e31ab96900..e504d8d69cd93a69fea3f7038e22317d9fa7887f 100644 (file)
--- a/driver/main.c
+++ b/driver/main.c
@@ -35,7 +35,7 @@
 #include <jailhouse/cell-config.h>
 #include <jailhouse/header.h>
 #include <jailhouse/hypercall.h>
-#include <jailhouse/version.h>
+#include <generated/version.h>
 
 #ifdef CONFIG_X86_32
 #error 64-bit kernel required!

diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index 42c661f3c7e194b21fb39630cf2cf2041b613870..adc44aaffe72c34ea57fcbc8b5c912a13dce33ec 100644 (file)
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -55,8 +55,8 @@ define filechk_version
        $(src)/../scripts/gen_version_h $(src)/..
 endef
 
-clean-files := include/jailhouse/config.mk \
-       include/jailhouse/version.h
+clean-files += include/jailhouse/config.mk \
+       include/generated/version.h
 
 define sed-y
        "/^=>/{s:=>#\(.*\):/* \1 */:; \
@@ -93,13 +93,13 @@ $(obj)/$(defines-file): $(obj)/arch/$(SRCARCH)/asm-defines.s
        $(Q)mkdir -p $(dir $@)
        $(call cmd,defines)
 
-$(obj)/include/jailhouse/version.h: $(src)/Makefile FORCE
+$(obj)/include/generated/version.h: $(src)/Makefile FORCE
        $(call filechk,version)
 
 $(foreach co,$(CORE_OBJECTS),\
        $(eval $(obj)/$(co): $(obj)/$(defines-file)))
 
-$(obj)/setup.o: $(obj)/include/jailhouse/version.h
+$(obj)/setup.o: $(obj)/include/generated/version.h
 
 arch-builtin: $(obj)/$(defines-file) $(obj)/include/jailhouse/config.mk FORCE
        $(Q)$(MAKE) $(build)=$(obj)/arch/$(SRCARCH) \

diff --git a/hypervisor/setup.c b/hypervisor/setup.c
index 8ae0d4861e5853b3cbbaccaed4b21fdc1f7a8cd5..2139148ef3ddacd87945137edf2cad14e3f7f56f 100644 (file)
--- a/hypervisor/setup.c
+++ b/hypervisor/setup.c
@@ -16,7 +16,7 @@
 #include <jailhouse/paging.h>
 #include <jailhouse/control.h>
 #include <jailhouse/string.h>
-#include <jailhouse/version.h>
+#include <generated/version.h>
 #include <asm/spinlock.h>
 
 extern u8 __text_start[], __hv_core_end[];