[CRIU] [PATCH 39/78] compel: Create symlink into arch dir inside uapi headers

Cyrill Gorcunov gorcunov at openvz.org
Mon Nov 7 08:36:24 PST 2016


To be able to include compel/asm/ headers when needed.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
Signed-off-by: Pavel Emelyanov <xemul at virtuozzo.com>
---
 Makefile                                                |  3 +++
 Makefile.compel                                         | 15 +++++++++++++++
 compel/arch/aarch64/src/lib/include/uapi/asm/.gitignore |  0
 compel/arch/arm/src/lib/include/uapi/asm/.gitignore     |  0
 compel/arch/ppc64/src/lib/include/uapi/asm/.gitignore   |  0
 compel/arch/x86/src/lib/include/uapi/asm/.gitignore     |  0
 6 files changed, 18 insertions(+)
 create mode 100644 compel/arch/aarch64/src/lib/include/uapi/asm/.gitignore
 create mode 100644 compel/arch/arm/src/lib/include/uapi/asm/.gitignore
 create mode 100644 compel/arch/ppc64/src/lib/include/uapi/asm/.gitignore
 create mode 100644 compel/arch/x86/src/lib/include/uapi/asm/.gitignore

diff --git a/Makefile b/Makefile
index 5e15e757375a..7357dee7d16f 100644
--- a/Makefile
+++ b/Makefile
@@ -272,6 +272,9 @@ mrproper: subclean
 	$(Q) $(RM) $(VERSION_HEADER)
 	$(Q) $(RM) include/common/asm
 	$(Q) $(RM) $(COMPEL_VERSION_HEADER)
+	$(Q) $(RM) compel/include/uapi/compel
+	$(Q) $(RM) compel/include/uapi/asm
+	$(Q) $(RM) compel/include/asm
 	$(Q) $(RM) cscope.*
 	$(Q) $(RM) tags TAGS
 .PHONY: mrproper
diff --git a/Makefile.compel b/Makefile.compel
index e3edd558d762..a5999581b598 100644
--- a/Makefile.compel
+++ b/Makefile.compel
@@ -11,6 +11,21 @@ $(COMPEL_VERSION_HEADER): $(SRC_DIR)/Makefile.versions
 	$(Q) echo "#define COMPEL_SO_VERSION_SUBLEVEL " $(COMPEL_SO_VERSION_SUBLEVEL)	>> $(COMPEL_VERSION_HEADER)
 	$(Q) echo "#endif /* COMPEL_SO_VERSION_H__ */"					>> $(COMPEL_VERSION_HEADER)
 
+$(SRC_DIR)/compel/include/uapi/compel: $(SRC_DIR)/compel/include/uapi
+	$(call msg-gen, $@)
+	$(Q) ln -s $^ $@
+$(COMPEL_VERSION_HEADER): $(SRC_DIR)/compel/include/uapi/compel
+
+$(SRC_DIR)/compel/include/uapi/asm: $(SRC_DIR)/compel/arch/$(ARCH)/src/lib/include/uapi/asm
+	$(call msg-gen, $@)
+	$(Q) ln -s $^ $@
+$(COMPEL_VERSION_HEADER): $(SRC_DIR)/compel/include/uapi/asm
+
+$(SRC_DIR)/compel/include/asm: $(SRC_DIR)/compel/arch/$(ARCH)/src/lib/include
+	$(call msg-gen, $@)
+	$(Q) ln -s $^ $@
+$(COMPEL_VERSION_HEADER): $(SRC_DIR)/compel/include/asm
+
 #
 # Compel itself.
 compel/%: $(COMPEL_VERSION_HEADER) $(CONFIG_HEADER) .FORCE
diff --git a/compel/arch/aarch64/src/lib/include/uapi/asm/.gitignore b/compel/arch/aarch64/src/lib/include/uapi/asm/.gitignore
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/compel/arch/arm/src/lib/include/uapi/asm/.gitignore b/compel/arch/arm/src/lib/include/uapi/asm/.gitignore
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/compel/arch/ppc64/src/lib/include/uapi/asm/.gitignore b/compel/arch/ppc64/src/lib/include/uapi/asm/.gitignore
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/compel/arch/x86/src/lib/include/uapi/asm/.gitignore b/compel/arch/x86/src/lib/include/uapi/asm/.gitignore
new file mode 100644
index 000000000000..e69de29bb2d1
-- 
2.7.4



More information about the CRIU mailing list