[lxc-devel] [lxc/master] make dist: add missing files

brauner on Github lxc-bot at linuxcontainers.org
Tue Mar 24 19:37:55 UTC 2020


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 701 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200324/18e074ea/attachment-0001.bin>
-------------- next part --------------
From fef909cf628c0928f9efcaefdb6c29e5c10978b7 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Tue, 24 Mar 2020 20:37:00 +0100
Subject: [PATCH] make dist: add missing files

deleted:    CODING_STYLE.md
deleted:    LICENSE.GPL2
deleted:    LICENSE.LGPL2.1
deleted:    README.md
deleted:    coccinelle/exit.cocci
deleted:    coccinelle/run-coccinelle.sh
deleted:    coccinelle/while-true.cocci
deleted:    doc/api-extensions.md
deleted:    src/tests/lxc-test-exit-code
deleted:    src/tests/travis.sh

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 Makefile.am            | 17 ++++++++++-------
 coccinelle/Makefile.am |  7 +++++++
 configure.ac           |  2 ++
 doc/Makefile.am        |  8 ++++----
 src/tests/Makefile.am  |  4 +++-
 5 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 coccinelle/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index dd892c820c..d3ce7b507e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,13 +3,16 @@
 ACLOCAL_AMFLAGS = -I config
 
 LIBTOOL_DEPS = @LIBTOOL_DEPS@
-SUBDIRS = config src templates doc hooks
-DIST_SUBDIRS = config src templates doc hooks
-EXTRA_DIST = \
-	autogen.sh \
-	lxc.spec \
-	CONTRIBUTING \
-	MAINTAINERS
+SUBDIRS = config coccinelle src templates doc hooks
+DIST_SUBDIRS = config coccinelle  src templates doc hooks
+EXTRA_DIST = autogen.sh \
+	     lxc.spec \
+	     CONTRIBUTING \
+	     CODING_STYLE.md \
+	     LICENSE.GPL2 \
+	     LICENSE.LGPL2.1 \
+	     MAINTAINERS \
+	     README.md
 
 RPMARGS =
 
diff --git a/coccinelle/Makefile.am b/coccinelle/Makefile.am
new file mode 100644
index 0000000000..a3c8b03d95
--- /dev/null
+++ b/coccinelle/Makefile.am
@@ -0,0 +1,7 @@
+# Makefile.am
+
+EXTRA_DIST = exit.cocci \
+	     run-coccinelle.sh \
+	     while-true.cocci
+
+bin_SCRIPTS = run-coccinelle.sh
diff --git a/configure.ac b/configure.ac
index 3b4cd5730e..35cb76f767 100644
--- a/configure.ac
+++ b/configure.ac
@@ -797,6 +797,8 @@ AC_CONFIG_FILES([
 	lxc.pc
 	lxc.spec
 
+	coccinelle/Makefile
+
 	config/Makefile
 	config/apparmor/Makefile
 	config/apparmor/abstractions/start-container
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 29abd01543..d613a75cb8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -9,10 +9,10 @@ if ENABLE_API_DOCS
 SUBDIRS += api
 endif
 
-EXTRA_DIST = \
-	lxc.container.conf \
-	lxc.system.conf \
-	FAQ.txt
+EXTRA_DIST = api-extensions.md \
+	     lxc.container.conf \
+	     lxc.system.conf \
+	     FAQ.txt
 
 if ENABLE_DOCBOOK
 man_MANS = lxc.conf.5 \
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index d05021a054..493b33c9d8 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -158,6 +158,7 @@ EXTRA_DIST = basic.c \
 	     lxc-test-checkpoint-restore \
 	     lxc-test-cloneconfig \
 	     lxc-test-createconfig \
+	     lxc-test-exit-code \
 	     lxc-test-no-new-privs \
 	     lxc-test-snapdeps \
 	     lxc-test-symlink \
@@ -172,7 +173,8 @@ EXTRA_DIST = basic.c \
 	     snapshot.c \
 	     startone.c \
 	     state_server.c \
-	     share_ns.c
+	     share_ns.c \
+	     travis.sh
 
 clean-local:
 	rm -f lxc-test-utils-*


More information about the lxc-devel mailing list