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>

.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

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

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!

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) \

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[];