[CRIU] [PATCH 2/2] Do not install .gitignore

Kir Kolyshkin kolyshkin at gmail.com
Wed Dec 5 05:07:12 MSK 2018


This avoids installing .gitignore file to compel includes.

While at it, describe why this .gitignore is needed.

Signed-off-by: Kir Kolyshkin <kolyshkin at gmail.com>
---
 compel/plugins/Makefile                        | 6 ++++--
 compel/plugins/include/uapi/std/asm/.gitignore | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/compel/plugins/Makefile b/compel/plugins/Makefile
index 82c35be6a..60b78473c 100644
--- a/compel/plugins/Makefile
+++ b/compel/plugins/Makefile
@@ -87,8 +87,10 @@ install: compel/plugins/std.lib.a compel/plugins/fds.lib.a
 	$(Q) mkdir -p $(DESTDIR)$(LIBEXECDIR)/compel/scripts
 	$(Q) install -m 0644 compel/arch/$(ARCH)/scripts/compel-pack.lds.S $(DESTDIR)$(LIBEXECDIR)/compel/scripts
 	$(E) "  INSTALL " compel plugins uapi
-	$(Q) mkdir -p $(DESTDIR)$(INCLUDEDIR)/compel/plugins
-	$(Q) cp -frL compel/plugins/include/uapi/* $(DESTDIR)$(INCLUDEDIR)/compel/plugins/
+	$(Q) mkdir -p $(DESTDIR)$(INCLUDEDIR)/compel/plugins/std/asm
+	$(Q) cp -fL compel/plugins/include/uapi/*.h $(DESTDIR)$(INCLUDEDIR)/compel/plugins/
+	$(Q) cp -fL compel/plugins/include/uapi/std/*.h $(DESTDIR)$(INCLUDEDIR)/compel/plugins/std/
+	$(Q) cp -fL compel/plugins/include/uapi/std/asm/*.h $(DESTDIR)$(INCLUDEDIR)/compel/plugins/std/asm/
 .PHONY: install
 
 uninstall:
diff --git a/compel/plugins/include/uapi/std/asm/.gitignore b/compel/plugins/include/uapi/std/asm/.gitignore
index e69de29bb..5ca235408 100644
--- a/compel/plugins/include/uapi/std/asm/.gitignore
+++ b/compel/plugins/include/uapi/std/asm/.gitignore
@@ -0,0 +1 @@
+# Dear git, please keep this directory
-- 
2.17.1



More information about the CRIU mailing list