laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/35726?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 'osmo-bts-virtual.cfg' and failing to build.

Change-Id: I167027afde3cee40a3b52adfaec7bde91ba896da Related: OS#6349 --- M doc/examples/Makefile.am 1 file changed, 30 insertions(+), 7 deletions(-)

Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved

diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am index 25a2151..6a1ae95 100644 --- a/doc/examples/Makefile.am +++ b/doc/examples/Makefile.am @@ -1,16 +1,29 @@ -OSMOCONF_FILES = virtual/osmo-bts-virtual.cfg +# all config examples must be listed here unconditionally, so that +# all of them end up in the release tarball (see OS#6349) +EXTRA_DIST = \ + trx/osmo-bts-trx.cfg \ + trx/osmo-bts-trx-calypso.cfg \ + octphy/osmo-bts-trx2dsp1.cfg \ + octphy/osmo-bts-octphy.cfg \ + oc2g/osmo-bts-oc2g.cfg \ + oc2g/oc2gbts-mgr.cfg \ + sysmo/sysmobts-mgr.cfg \ + sysmo/osmo-bts-sysmo.cfg \ + litecell15/osmo-bts-lc15.cfg \ + litecell15/lc15bts-mgr.cfg \ + virtual/osmo-bts-virtual.cfg \ + $(NULL)

doc_virtualdir = $(docdir)/examples/osmo-bts-virtual doc_virtual_DATA = \ virtual/osmo-bts-virtual.cfg -EXTRA_DIST = $(doc_virtual_DATA) +OSMOCONF_FILES = virtual/osmo-bts-virtual.cfg

if ENABLE_SYSMOBTS doc_sysmodir = $(docdir)/examples/osmo-bts-sysmo doc_sysmo_DATA = \ sysmo/osmo-bts-sysmo.cfg \ sysmo/sysmobts-mgr.cfg -EXTRA_DIST += $(doc_sysmo_DATA) OSMOCONF_FILES += sysmo/osmo-bts-sysmo.cfg sysmo/sysmobts-mgr.cfg endif

@@ -19,7 +32,6 @@ doc_trx_DATA = \ trx/osmo-bts-trx.cfg \ trx/osmo-bts-trx-calypso.cfg -EXTRA_DIST += $(doc_trx_DATA) OSMOCONF_FILES += trx/osmo-bts-trx.cfg endif

@@ -28,7 +40,6 @@ doc_octphy_DATA = \ octphy/osmo-bts-trx2dsp1.cfg \ octphy/osmo-bts-octphy.cfg -EXTRA_DIST += $(doc_octphy_DATA) OSMOCONF_FILES += octphy/osmo-bts-octphy.cfg endif

@@ -37,7 +48,6 @@ doc_lc15_DATA = \ litecell15/osmo-bts-lc15.cfg \ litecell15/lc15bts-mgr.cfg -EXTRA_DIST += $(doc_lc15_DATA) OSMOCONF_FILES += litecell15/osmo-bts-lc15.cfg litecell15/lc15bts-mgr.cfg endif

@@ -46,7 +56,6 @@ doc_oc2g_DATA = \ oc2g/osmo-bts-oc2g.cfg \ oc2g/oc2gbts-mgr.cfg -EXTRA_DIST += $(doc_oc2g_DATA) OSMOCONF_FILES += oc2g/osmo-bts-oc2g.cfg oc2g/oc2gbts-mgr.cfg endif