From: Ken Dreyer Date: Mon, 3 Oct 2016 20:43:25 +0000 (-0600) Subject: build: include more files in "make dist" tarball X-Git-Tag: v10.2.4~35^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d66bb7a991affb8b77eb9440d7c8874cc0b3bbf4;p=ceph.git build: include more files in "make dist" tarball Include all the documentation, qa, and CMakeLists.txt files in the "make dist" tarball. Kraken and newer releases will already do this. This change is restricted to releases that still use autotools. The purpose of this change is to make it easier to apply downstream patches on an unpacked upstream tarball, because often those patches are cherry-picks of commits that touch files under doc/, qa/, or CMakeLists.txt. Signed-off-by: Ken Dreyer --- diff --git a/Makefile.am b/Makefile.am index a7f0e3ee6c2f..778be29cbb10 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,6 +5,8 @@ EXTRA_DIST = autogen.sh ceph.spec.in ceph.spec install-deps.sh SUBDIRS = . src man doc systemd selinux EXTRA_DIST += \ + CMakeLists.txt \ + qa \ src/test/run-cli-tests \ src/test/run-cli-tests-maybe-unset-ccache \ src/test/cli \ diff --git a/doc/Makefile.am b/doc/Makefile.am index c4bcfc7c6f10..2ca0addc9d7b 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,37 +1,25 @@ EXTRA_DIST = \ - man/8/ceph-authtool.rst \ - man/8/ceph-clsinfo.rst \ - man/8/ceph-conf.rst \ - man/8/ceph-create-keys.rst \ - man/8/ceph-debugpack.rst \ - man/8/ceph-dencoder.rst \ - man/8/ceph-deploy.rst \ - man/8/ceph-detect-init.rst \ - man/8/ceph-disk.rst \ - man/8/cephfs.rst \ - man/8/ceph-fuse.rst \ - man/8/ceph-mds.rst \ - man/8/ceph-mon.rst \ - man/8/ceph-osd.rst \ - man/8/ceph-post-file.rst \ - man/8/ceph-rbdnamer.rst \ - man/8/ceph-rest-api.rst \ - man/8/ceph.rst \ - man/8/ceph-run.rst \ - man/8/ceph-syn.rst \ - man/8/crushtool.rst \ - man/8/librados-config.rst \ - man/8/monmaptool.rst \ - man/8/mount.ceph.rst \ - man/8/osdmaptool.rst \ - man/8/radosgw-admin.rst \ - man/8/radosgw.rst \ - man/8/rados.rst \ - man/8/rbd-fuse.rst \ - man/8/rbd-mirror.rst \ - man/8/rbd-nbd.rst \ - man/8/rbd-replay-many.rst \ - man/8/rbd-replay-prep.rst \ - man/8/rbd-replay.rst \ - man/8/rbd.rst \ - man/8/rbdmap.rst + man \ + api \ + architecture.rst \ + cephfs \ + conf.py \ + dev \ + favicon.ico \ + glossary.rst / + images / + index.rst / + install / + logo.png / + Makefile.am / + man / + mon / + rados / + radosgw / + rbd / + release-notes.rst / + releases.rst / + scripts / + start / + _templates / + _themes diff --git a/man/Makefile.am b/man/Makefile.am index 40506babd5e0..0dcf03826ee3 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = gnu -EXTRA_DIST = conf.py ceph_selinux.8 +EXTRA_DIST = conf.py ceph_selinux.8 CMakeLists.txt dist_man_MANS = diff --git a/src/Makefile.am b/src/Makefile.am index a11325e7feda..a3d0ecdd573d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -139,6 +139,7 @@ EXTRA_DIST += \ yasm-wrapper EXTRA_DIST += \ + CMakeLists.txt \ unittest_bufferlist.sh diff --git a/src/ceph-detect-init/Makefile.am b/src/ceph-detect-init/Makefile.am index 8ddcb1eaeae0..3926ac4bec29 100644 --- a/src/ceph-detect-init/Makefile.am +++ b/src/ceph-detect-init/Makefile.am @@ -22,6 +22,7 @@ check_SCRIPTS += ceph-detect-init/run-tox.sh EXTRA_DIST += \ ceph-detect-init/AUTHORS.rst \ + ceph-detect-init/CMakeLists.txt \ ceph-detect-init/ceph_detect_init/centos/__init__.py \ ceph-detect-init/ceph_detect_init/exc.py \ ceph-detect-init/ceph_detect_init/main.py \ diff --git a/src/ceph-disk/Makefile.am b/src/ceph-disk/Makefile.am index 900630382a13..a8532878c84e 100644 --- a/src/ceph-disk/Makefile.am +++ b/src/ceph-disk/Makefile.am @@ -17,6 +17,7 @@ check_SCRIPTS += ceph-disk/run-tox.sh EXTRA_DIST += \ ceph-disk/AUTHORS.rst \ + ceph-disk/CMakeLists.txt \ ceph-disk/ceph_disk/__init__.py \ ceph-disk/ceph_disk/main.py \ ceph-disk/Makefile.am \ diff --git a/src/cls/Makefile.am b/src/cls/Makefile.am index bac67e902e02..bb9ec9441902 100644 --- a/src/cls/Makefile.am +++ b/src/cls/Makefile.am @@ -5,3 +5,5 @@ endif if ENABLE_SERVER include cls/Makefile-server.am endif + +EXTRA_DIST += cls/CMakeLists.txt diff --git a/src/compressor/Makefile.am b/src/compressor/Makefile.am index 9deda3c482bc..4d42803bdd3f 100644 --- a/src/compressor/Makefile.am +++ b/src/compressor/Makefile.am @@ -19,3 +19,5 @@ noinst_HEADERS += \ compressor/AsyncCompressor.h \ compressor/CompressionPlugin.h + +EXTRA_DIST += compressor/CMakeLists.txt diff --git a/src/compressor/snappy/Makefile.am b/src/compressor/snappy/Makefile.am index 49d3db053298..427cea53dffa 100644 --- a/src/compressor/snappy/Makefile.am +++ b/src/compressor/snappy/Makefile.am @@ -20,3 +20,5 @@ libceph_snappy_la_LDFLAGS += -export-symbols-regex '.*__compressor_.*' endif compressorlib_LTLIBRARIES += libceph_snappy.la + +EXTRA_DIST += compressor/snappy/CMakeLists.txt diff --git a/src/compressor/zlib/Makefile.am b/src/compressor/zlib/Makefile.am index 250f39622015..623cdcd7f729 100644 --- a/src/compressor/zlib/Makefile.am +++ b/src/compressor/zlib/Makefile.am @@ -19,3 +19,5 @@ libceph_zlib_la_LDFLAGS += -export-symbols-regex '.*__compressor_.*' endif compressorlib_LTLIBRARIES += libceph_zlib.la + +EXTRA_DIST += compressor/zlib/CMakeLists.txt diff --git a/src/erasure-code/Makefile.am b/src/erasure-code/Makefile.am index 224e67b91e2f..e150556b980f 100644 --- a/src/erasure-code/Makefile.am +++ b/src/erasure-code/Makefile.am @@ -26,3 +26,5 @@ noinst_HEADERS += \ erasure-code/ErasureCode.h \ erasure-code/ErasureCodeInterface.h \ erasure-code/ErasureCodePlugin.h + +EXTRA_DIST += erasure-code/CMakeLists.txt diff --git a/src/erasure-code/isa/Makefile.am b/src/erasure-code/isa/Makefile.am index 6bbb37cd8da8..971b73628852 100644 --- a/src/erasure-code/isa/Makefile.am +++ b/src/erasure-code/isa/Makefile.am @@ -75,3 +75,5 @@ libec_isa_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif erasure_codelib_LTLIBRARIES += libec_isa.la + +EXTRA_DIST += erasure-code/isa/CMakeLists.txt diff --git a/src/erasure-code/jerasure/Makefile.am b/src/erasure-code/jerasure/Makefile.am index adcb95daf345..6ffe3ed1a317 100644 --- a/src/erasure-code/jerasure/Makefile.am +++ b/src/erasure-code/jerasure/Makefile.am @@ -146,3 +146,5 @@ endif erasure-code/jerasure/ErasureCodePluginSelectJerasure.cc: ./ceph_ver.h erasure_codelib_LTLIBRARIES += libec_jerasure.la + +EXTRA_DIST += erasure-code/jerasure/CMakeLists.txt diff --git a/src/erasure-code/lrc/Makefile.am b/src/erasure-code/lrc/Makefile.am index 44c47d558315..0f914063089c 100644 --- a/src/erasure-code/lrc/Makefile.am +++ b/src/erasure-code/lrc/Makefile.am @@ -19,3 +19,5 @@ libec_lrc_la_LDFLAGS += -export-symbols-regex '.*__erasure_code_.*' endif erasure_codelib_LTLIBRARIES += libec_lrc.la + +EXTRA_DIST += erasure-code/lrc/CMakeLists.txt diff --git a/src/erasure-code/shec/Makefile.am b/src/erasure-code/shec/Makefile.am index 6b658d5a575d..cd931328675e 100644 --- a/src/erasure-code/shec/Makefile.am +++ b/src/erasure-code/shec/Makefile.am @@ -160,3 +160,5 @@ endif erasure-code/shec/ErasureCodePluginSelectShec.cc: ./ceph_ver.h erasure_codelib_LTLIBRARIES += libec_shec.la + +EXTRA_DIST += erasure-code/shec/CMakeLists.txt diff --git a/src/json_spirit/Makefile.am b/src/json_spirit/Makefile.am index f14228cb0627..21c0dea78936 100644 --- a/src/json_spirit/Makefile.am +++ b/src/json_spirit/Makefile.am @@ -16,3 +16,5 @@ noinst_HEADERS += \ json_spirit/json_spirit_writer_options.h \ json_spirit/json_spirit_writer_template.h + +EXTRA_DIST += json_spirit/CMakeLists.txt diff --git a/src/kv/Makefile.am b/src/kv/Makefile.am index b8761714491f..9dd8b0d8d1e0 100644 --- a/src/kv/Makefile.am +++ b/src/kv/Makefile.am @@ -42,3 +42,5 @@ noinst_HEADERS += kv/KineticStore.h endif endif # ENABLE_SERVER + +EXTRA_DIST += kv/CMakeLists.txt diff --git a/src/libradosstriper/Makefile.am b/src/libradosstriper/Makefile.am index 13b8b28c4935..293c8a541cee 100644 --- a/src/libradosstriper/Makefile.am +++ b/src/libradosstriper/Makefile.am @@ -25,3 +25,5 @@ noinst_HEADERS += \ endif # WITH_RADOSSTRIPER endif # WITH_RADOS endif # ENABLE_CLIENT + +EXTRA_DIST += libradosstriper/CMakeLists.txt diff --git a/src/librbd/Makefile.am b/src/librbd/Makefile.am index 08c9738806ee..548b1ad63863 100644 --- a/src/librbd/Makefile.am +++ b/src/librbd/Makefile.am @@ -159,3 +159,5 @@ noinst_HEADERS += \ endif # WITH_RBD endif # WITH_RADOS endif # ENABLE_CLIENT + +EXTRA_DIST += librbd/CMakeLists.txt diff --git a/src/pybind/Makefile.am b/src/pybind/Makefile.am index 9f779dd5f8ef..9a8181d78452 100644 --- a/src/pybind/Makefile.am +++ b/src/pybind/Makefile.am @@ -27,3 +27,5 @@ endif # WITH_RADOS endif # WITH_CYTHON endif # ENABLE_CLIENT + +EXTRA_DIST += pybind/CMakeLists.txt diff --git a/src/pybind/cephfs/Makefile.am b/src/pybind/cephfs/Makefile.am index 577431fdd0fb..698522daa41d 100644 --- a/src/pybind/cephfs/Makefile.am +++ b/src/pybind/cephfs/Makefile.am @@ -1,4 +1,7 @@ -EXTRA_DIST += $(srcdir)/pybind/cephfs/setup.py $(srcdir)/pybind/cephfs/cephfs.pyx +EXTRA_DIST += \ + $(srcdir)/pybind/cephfs/CMakeLists.txt \ + $(srcdir)/pybind/cephfs/setup.py \ + $(srcdir)/pybind/cephfs/cephfs.pyx cephfs-pybind-all: libcephfs.la ${srcdir}/ceph_ver.h cd $(srcdir)/pybind/cephfs; $(PY_DISTUTILS) build \ diff --git a/src/pybind/rados/Makefile.am b/src/pybind/rados/Makefile.am index ad555c394b91..a4145bf0f4ab 100644 --- a/src/pybind/rados/Makefile.am +++ b/src/pybind/rados/Makefile.am @@ -1,4 +1,7 @@ -EXTRA_DIST += $(srcdir)/pybind/rados/setup.py $(srcdir)/pybind/rados/rados.pyx $(srcdir)/pybind/rados/rados.pxd +EXTRA_DIST += \ + $(srcdir)/pybind/rados/CMakeLists.txt \ + $(srcdir)/pybind/rados/setup.py \ + $(srcdir)/pybind/rados/rados.pyx $(srcdir)/pybind/rados/rados.pxd rados-pybind-all: librados.la ${srcdir}/ceph_ver.h cd $(srcdir)/pybind/rados; $(PY_DISTUTILS) build \ diff --git a/src/pybind/rbd/Makefile.am b/src/pybind/rbd/Makefile.am index affd2de5054d..7dd49333fa4b 100644 --- a/src/pybind/rbd/Makefile.am +++ b/src/pybind/rbd/Makefile.am @@ -1,4 +1,7 @@ -EXTRA_DIST += $(srcdir)/pybind/rbd/setup.py $(srcdir)/pybind/rbd/rbd.pyx +EXTRA_DIST += \ + $(srcdir)/pybind/rbd/CMakeLists.txt \ + $(srcdir)/pybind/rbd/setup.py \ + $(srcdir)/pybind/rbd/rbd.pyx rbd-pybind-all: librbd.la ${srcdir}/ceph_ver.h cd $(srcdir)/pybind/rbd; $(PY_DISTUTILS) build \ diff --git a/src/rbd_replay/Makefile.am b/src/rbd_replay/Makefile.am index 23a8e9152e08..775ca0a80ade 100644 --- a/src/rbd_replay/Makefile.am +++ b/src/rbd_replay/Makefile.am @@ -74,3 +74,5 @@ endif endif # WITH_RBD endif # WITH_RADOS endif # ENABLE_CLIENT + +EXTRA_DIST += rbd_replay/CMakeLists.txt diff --git a/src/test/Makefile.am b/src/test/Makefile.am index c865b6891769..ce6fc2048f7b 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -1,3 +1,40 @@ +EXTRA_DIST += \ + test/CMakeLists.txt \ + test/ObjectMap/CMakeLists.txt \ + test/bench/CMakeLists.txt \ + test/cls_hello/CMakeLists.txt \ + test/cls_lock/CMakeLists.txt \ + test/cls_log/CMakeLists.txt \ + test/cls_numops/CMakeLists.txt \ + test/cls_rbd/CMakeLists.txt \ + test/cls_refcount/CMakeLists.txt \ + test/cls_replica_log/CMakeLists.txt \ + test/cls_rgw/CMakeLists.txt \ + test/cls_statelog/CMakeLists.txt \ + test/cls_version/CMakeLists.txt \ + test/common/CMakeLists.txt \ + test/crush/CMakeLists.txt \ + test/encoding/CMakeLists.txt \ + test/filestore/CMakeLists.txt \ + test/fs/CMakeLists.txt \ + test/journal/CMakeLists.txt \ + test/libcephfs/CMakeLists.txt \ + test/librados/CMakeLists.txt \ + test/librados_test_stub/CMakeLists.txt \ + test/libradosstriper/CMakeLists.txt \ + test/librbd/CMakeLists.txt \ + test/mds/CMakeLists.txt \ + test/mon/CMakeLists.txt \ + test/msgr/CMakeLists.txt \ + test/objectstore/CMakeLists.txt \ + test/os/CMakeLists.txt \ + test/osd/CMakeLists.txt \ + test/osdc/CMakeLists.txt \ + test/pybind/CMakeLists.txt \ + test/rbd_mirror/CMakeLists.txt \ + test/rgw/CMakeLists.txt \ + test/system/CMakeLists.txt + include test/erasure-code/Makefile.am include test/messenger/Makefile.am include test/compressor/Makefile.am diff --git a/src/test/compressor/Makefile.am b/src/test/compressor/Makefile.am index 4a41354b88e4..4f0d88114558 100644 --- a/src/test/compressor/Makefile.am +++ b/src/test/compressor/Makefile.am @@ -69,3 +69,5 @@ check_TESTPROGRAMS += unittest_compression_plugin_zlib endif # WITH_OSD endif # ENABLE_SERVER + +EXTRA_DIST += test/compressor/CMakeLists.txt diff --git a/src/test/erasure-code/Makefile.am b/src/test/erasure-code/Makefile.am index 3c45c67c61c3..f2d2b28c10de 100644 --- a/src/test/erasure-code/Makefile.am +++ b/src/test/erasure-code/Makefile.am @@ -367,3 +367,5 @@ check_TESTPROGRAMS += unittest_erasure_code_example endif # WITH_OSD endif # ENABLE_SERVER + +EXTRA_DIST += test/erasure-code/CMakeLists.txt diff --git a/src/test/messenger/Makefile.am b/src/test/messenger/Makefile.am index 9fe2416614ab..71a660489de5 100644 --- a/src/test/messenger/Makefile.am +++ b/src/test/messenger/Makefile.am @@ -74,3 +74,5 @@ noinst_PROGRAMS += \ endif # ENABLE_XIO endif # ENABLE_SERVER + +EXTRA_DIST += test/messenger/CMakeLists.txt diff --git a/src/tracing/Makefile.am b/src/tracing/Makefile.am index 1c2349e5d2b6..f022acd4c07c 100644 --- a/src/tracing/Makefile.am +++ b/src/tracing/Makefile.am @@ -1,4 +1,5 @@ EXTRA_DIST += \ + tracing/CMakeLists.txt \ tracing/tracing-common.h if WITH_LTTNG