<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9680">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">debian: Add cfg file examples for osmo-trx-{lms,uhd}<br><br>Sort cfg files according to their osmo-trx binary.<br>Install them during make install.<br>Add the installed cfg files to related debian packages.<br><br>Change-Id: I905cdac30b441e4df0a3f5c0924d1637b9f67b90<br>---<br>M Makefile.am<br>M configure.ac<br>M debian/osmo-trx-lms.install<br>M debian/osmo-trx-uhd.install<br>A doc/Makefile.am<br>A doc/examples/Makefile.am<br>R doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg<br>C doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg<br>R doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg<br>R doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg<br>10 files changed, 32 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/80/9680/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile.am b/Makefile.am</span><br><span>index 71f7b91..8ab73a6 100644</span><br><span>--- a/Makefile.am</span><br><span>+++ b/Makefile.am</span><br><span>@@ -28,6 +28,7 @@</span><br><span> </span><br><span> # Order must be preserved</span><br><span> SUBDIRS = \</span><br><span style="color: hsl(120, 100%, 40%);">+ doc \</span><br><span> CommonLibs \</span><br><span> GSM \</span><br><span> Transceiver52M \</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index aae151b..974a611 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -225,6 +225,8 @@</span><br><span> tests/Makefile \</span><br><span> tests/CommonLibs/Makefile \</span><br><span> tests/Transceiver52M/Makefile \</span><br><span style="color: hsl(120, 100%, 40%);">+ doc/Makefile \</span><br><span style="color: hsl(120, 100%, 40%);">+ doc/examples/Makefile \</span><br><span> ])</span><br><span> </span><br><span> AC_OUTPUT</span><br><span>diff --git a/debian/osmo-trx-lms.install b/debian/osmo-trx-lms.install</span><br><span>index 5937edb..e8bb867 100644</span><br><span>--- a/debian/osmo-trx-lms.install</span><br><span>+++ b/debian/osmo-trx-lms.install</span><br><span>@@ -1 +1,2 @@</span><br><span> /usr/bin/osmo-trx-lms</span><br><span style="color: hsl(120, 100%, 40%);">+/usr/share/doc/osmo-trx-lms/examples/osmo-trx-limesdr.cfg /usr/share/doc/osmo-trx-lms/examples</span><br><span>diff --git a/debian/osmo-trx-uhd.install b/debian/osmo-trx-uhd.install</span><br><span>index 0005b76..2db0142 100644</span><br><span>--- a/debian/osmo-trx-uhd.install</span><br><span>+++ b/debian/osmo-trx-uhd.install</span><br><span>@@ -1 +1,4 @@</span><br><span> /usr/bin/osmo-trx-uhd</span><br><span style="color: hsl(120, 100%, 40%);">+/usr/share/doc/osmo-trx-uhd/examples/osmo-trx-usrp_b200.cfg /usr/share/doc/osmo-trx-uhd/examples</span><br><span style="color: hsl(120, 100%, 40%);">+/usr/share/doc/osmo-trx-uhd/examples/osmo-trx-limesdr.cfg /usr/share/doc/osmo-trx-uhd/examples</span><br><span style="color: hsl(120, 100%, 40%);">+/usr/share/doc/osmo-trx-uhd/examples/osmo-trx-umtrx.cfg /usr/share/doc/osmo-trx-uhd/examples</span><br><span>diff --git a/doc/Makefile.am b/doc/Makefile.am</span><br><span>new file mode 100644</span><br><span>index 0000000..1d42b0a</span><br><span>--- /dev/null</span><br><span>+++ b/doc/Makefile.am</span><br><span>@@ -0,0 +1,3 @@</span><br><span style="color: hsl(120, 100%, 40%);">+SUBDIRS = \</span><br><span style="color: hsl(120, 100%, 40%);">+ examples \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span>diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am</span><br><span>new file mode 100644</span><br><span>index 0000000..530c3fa</span><br><span>--- /dev/null</span><br><span>+++ b/doc/examples/Makefile.am</span><br><span>@@ -0,0 +1,22 @@</span><br><span style="color: hsl(120, 100%, 40%);">+CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+dist-hook:</span><br><span style="color: hsl(120, 100%, 40%);">+ for f in $$($(CFG_FILES)); do \</span><br><span style="color: hsl(120, 100%, 40%);">+ j="$(distdir)/$$f" && \</span><br><span style="color: hsl(120, 100%, 40%);">+ mkdir -p "$$(dirname $$j)" && \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(INSTALL_DATA) $(srcdir)/$$f $$j; \</span><br><span style="color: hsl(120, 100%, 40%);">+ done</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+install-data-hook:</span><br><span style="color: hsl(120, 100%, 40%);">+ for f in $$($(CFG_FILES)); do \</span><br><span style="color: hsl(120, 100%, 40%);">+ j="$(DESTDIR)$(docdir)/examples/$$f" && \</span><br><span style="color: hsl(120, 100%, 40%);">+ mkdir -p "$$(dirname $$j)" && \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(INSTALL_DATA) $(srcdir)/$$f $$j; \</span><br><span style="color: hsl(120, 100%, 40%);">+ done</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+uninstall-hook:</span><br><span style="color: hsl(120, 100%, 40%);">+ @$(PRE_UNINSTALL)</span><br><span style="color: hsl(120, 100%, 40%);">+ for f in $$($(CFG_FILES)); do \</span><br><span style="color: hsl(120, 100%, 40%);">+ j="$(DESTDIR)$(docdir)/examples/$$f" && \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(RM) $$j; \</span><br><span style="color: hsl(120, 100%, 40%);">+ done</span><br><span>diff --git a/doc/examples/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg</span><br><span>similarity index 100%</span><br><span>rename from doc/examples/osmo-trx-limesdr.cfg</span><br><span>rename to doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg</span><br><span>diff --git a/doc/examples/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg</span><br><span>similarity index 100%</span><br><span>copy from doc/examples/osmo-trx-limesdr.cfg</span><br><span>copy to doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg</span><br><span>diff --git a/doc/examples/osmo-trx-umtrx.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg</span><br><span>similarity index 100%</span><br><span>rename from doc/examples/osmo-trx-umtrx.cfg</span><br><span>rename to doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg</span><br><span>diff --git a/doc/examples/osmo-trx-usrp_b200.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg</span><br><span>similarity index 100%</span><br><span>rename from doc/examples/osmo-trx-usrp_b200.cfg</span><br><span>rename to doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9680">change 9680</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9680"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I905cdac30b441e4df0a3f5c0924d1637b9f67b90 </div>
<div style="display:none"> Gerrit-Change-Number: 9680 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>