<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10924">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Install sample cfg file to /etc/osmocom<br><br>Change-Id: Ib871a3cd14386ef6e6b512a3d66e7e7a839295a5<br>---<br>M debian/osmo-trx-lms.install<br>M debian/osmo-trx-uhd.install<br>M doc/examples/Makefile.am<br>A doc/examples/osmo-trx-lms/osmo-trx-lms.cfg<br>A doc/examples/osmo-trx-uhd/osmo-trx-uhd.cfg<br>5 files changed, 24 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/debian/osmo-trx-lms.install b/debian/osmo-trx-lms.install</span><br><span>index b58c862..b89506a 100644</span><br><span>--- a/debian/osmo-trx-lms.install</span><br><span>+++ b/debian/osmo-trx-lms.install</span><br><span>@@ -1,3 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+etc/osmocom/osmo-trx-lms.cfg</span><br><span> lib/systemd/system/osmo-trx-lms.service</span><br><span> /usr/bin/osmo-trx-lms</span><br><span> /usr/share/doc/osmo-trx/examples/osmo-trx-lms/osmo-trx-limesdr.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-lms/</span><br><span>diff --git a/debian/osmo-trx-uhd.install b/debian/osmo-trx-uhd.install</span><br><span>index b7ec5ca..77236ca 100644</span><br><span>--- a/debian/osmo-trx-uhd.install</span><br><span>+++ b/debian/osmo-trx-uhd.install</span><br><span>@@ -1,3 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+etc/osmocom/osmo-trx-uhd.cfg</span><br><span> lib/systemd/system/osmo-trx-uhd.service</span><br><span> /usr/bin/osmo-trx-uhd</span><br><span> /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg /usr/share/doc/osmo-trx/examples/osmo-trx-uhd/</span><br><span>diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am</span><br><span>index 530c3fa..88d9142 100644</span><br><span>--- a/doc/examples/Makefile.am</span><br><span>+++ b/doc/examples/Makefile.am</span><br><span>@@ -1,4 +1,23 @@</span><br><span style="color: hsl(0, 100%, 40%);">-CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,'</span><br><span style="color: hsl(120, 100%, 40%);">+OSMOCONF_FILES =</span><br><span style="color: hsl(120, 100%, 40%);">+osmoconfdir = $(sysconfdir)/osmocom</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if DEVICE_UHD</span><br><span style="color: hsl(120, 100%, 40%);">+OSMOCONF_FILES += osmo-trx-uhd/osmo-trx-uhd.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# if DEVICE_USRP1</span><br><span style="color: hsl(120, 100%, 40%);">+# TODO: no usrp1 sample file yet</span><br><span style="color: hsl(120, 100%, 40%);">+# OSMOCONF_FILES += osmo-trx-usrp1/osmo-trx-usrp1.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+# endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+if DEVICE_LMS</span><br><span style="color: hsl(120, 100%, 40%);">+OSMOCONF_FILES += osmo-trx-lms/osmo-trx-lms.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+osmoconf_DATA = $(OSMOCONF_FILES)</span><br><span style="color: hsl(120, 100%, 40%);">+EXTRA_DIST = $(OSMOCONF_FILES)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+CFG_FILES = find $(srcdir) -type f -name '*.cfg*' | sed -e 's,^$(srcdir),,'</span><br><span> </span><br><span> dist-hook:</span><br><span>         for f in $$($(CFG_FILES)); do \</span><br><span>diff --git a/doc/examples/osmo-trx-lms/osmo-trx-lms.cfg b/doc/examples/osmo-trx-lms/osmo-trx-lms.cfg</span><br><span>new file mode 120000</span><br><span>index 0000000..13ae04a</span><br><span>--- /dev/null</span><br><span>+++ b/doc/examples/osmo-trx-lms/osmo-trx-lms.cfg</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+osmo-trx-limesdr.cfg</span><br><span>\ No newline at end of file</span><br><span>diff --git a/doc/examples/osmo-trx-uhd/osmo-trx-uhd.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-uhd.cfg</span><br><span>new file mode 120000</span><br><span>index 0000000..11f2320</span><br><span>--- /dev/null</span><br><span>+++ b/doc/examples/osmo-trx-uhd/osmo-trx-uhd.cfg</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+osmo-trx-usrp_b200.cfg</span><br><span>\ No newline at end of file</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10924">change 10924</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/10924"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib871a3cd14386ef6e6b512a3d66e7e7a839295a5 </div>
<div style="display:none"> Gerrit-Change-Number: 10924 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>