osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36715?usp=email )
Change subject: doc/examples: fix missing config files in release tarballs ...................................................................... doc/examples: fix missing config files in release tarballs All config file examples must be listed in EXTRA_DIST unconditionally. Adding them conditionally results in incomplete release tarballs, containing only some '*.cfg' files and failing to build. Change-Id: Iffb6d7577de175fc5d14642f0af6852508d74e69 Related: OS#6349 (cherry picked from commit a2d76f1d2fe7a1b162fe183695fb479b13c27aac) --- M doc/examples/Makefile.am 1 file changed, 27 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 0b06130..ac87457 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,3 +1,15 @@ +# all config examples must be listed here unconditionally, so that +# all of them end up in the release tarball (see OS#6349) +EXTRA_DIST = \ + osmo-trx-uhd/osmo-trx-limesdr.cfg \ + osmo-trx-uhd/osmo-trx-usrp_b200.cfg \ + osmo-trx-uhd/osmo-trx-uhd.cfg \ + osmo-trx-uhd/osmo-trx-umtrx.cfg \ + osmo-trx-lms/osmo-trx-limesdr.cfg \ + osmo-trx-lms/osmo-trx-lms.cfg \ + osmo-trx-ipc/osmo-trx-ipc.cfg \ + $(NULL) + OSMOCONF_FILES = osmoconfdir = $(sysconfdir)/osmocom @@ -19,7 +31,6 @@ endif osmoconf_DATA = $(OSMOCONF_FILES) -EXTRA_DIST = $(OSMOCONF_FILES) CFG_FILES = find $(srcdir) -type f -name '*.cfg*' | sed -e 's,^$(srcdir),,' -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36715?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: osmith/1.6.2 Gerrit-Change-Id: Iffb6d7577de175fc5d14642f0af6852508d74e69 Gerrit-Change-Number: 36715 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <[email protected]> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <[email protected]> Gerrit-Reviewer: osmith <[email protected]> Gerrit-Reviewer: pespin <[email protected]> Gerrit-MessageType: merged
