<p>pespin <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-trx/+/15002">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move std_inband.rbf under device/usrp1/ dir<br><br>This file is only used by USRP1, so let's move it there and avoid<br>processing it in Makefiles if build for USRP1 is not requested at<br>configure time.<br><br>Change-Id: Ibb40ba487581e76d2ae3e8a420d631670f876cf0<br>---<br>M Transceiver52M/Makefile.am<br>M Transceiver52M/device/usrp1/Makefile.am<br>R Transceiver52M/device/usrp1/std_inband.rbf<br>M debian/copyright<br>4 files changed, 7 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am</span><br><span>index f039e3f..ade4e30 100644</span><br><span>--- a/Transceiver52M/Makefile.am</span><br><span>+++ b/Transceiver52M/Makefile.am</span><br><span>@@ -27,12 +27,6 @@</span><br><span> AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)</span><br><span> AM_CFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-rev2dir = $(datadir)/usrp/rev2</span><br><span style="color: hsl(0, 100%, 40%);">-rev4dir = $(datadir)/usrp/rev4</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-dist_rev2_DATA = std_inband.rbf</span><br><span style="color: hsl(0, 100%, 40%);">-dist_rev4_DATA = std_inband.rbf</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> noinst_LTLIBRARIES = libtransceiver_common.la</span><br><span> </span><br><span> COMMON_SOURCES = \</span><br><span>diff --git a/Transceiver52M/device/usrp1/Makefile.am b/Transceiver52M/device/usrp1/Makefile.am</span><br><span>index 5078934..24760f7 100644</span><br><span>--- a/Transceiver52M/device/usrp1/Makefile.am</span><br><span>+++ b/Transceiver52M/device/usrp1/Makefile.am</span><br><span>@@ -3,6 +3,12 @@</span><br><span> AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common</span><br><span> AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(USRP_CFLAGS)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+rev2dir = $(datadir)/usrp/rev2</span><br><span style="color: hsl(120, 100%, 40%);">+rev4dir = $(datadir)/usrp/rev4</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+dist_rev2_DATA = std_inband.rbf</span><br><span style="color: hsl(120, 100%, 40%);">+dist_rev4_DATA = std_inband.rbf</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> noinst_HEADERS = USRPDevice.h</span><br><span> </span><br><span> noinst_LTLIBRARIES = libdevice.la</span><br><span>diff --git a/Transceiver52M/std_inband.rbf b/Transceiver52M/device/usrp1/std_inband.rbf</span><br><span>similarity index 100%</span><br><span>rename from Transceiver52M/std_inband.rbf</span><br><span>rename to Transceiver52M/device/usrp1/std_inband.rbf</span><br><span>Binary files differ</span><br><span>diff --git a/debian/copyright b/debian/copyright</span><br><span>index d8db465..19926cd 100644</span><br><span>--- a/debian/copyright</span><br><span>+++ b/debian/copyright</span><br><span>@@ -1,7 +1,7 @@</span><br><span> Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/</span><br><span> Upstream-Name: OsmoTRX</span><br><span> Source: http://cgit.osmocom.org/osmo-trx/</span><br><span style="color: hsl(0, 100%, 40%);">-Files-Excluded: Transceiver52M/std_inband.rbf</span><br><span style="color: hsl(120, 100%, 40%);">+Files-Excluded: Transceiver52M/device/usrp1/std_inband.rbf</span><br><span> </span><br><span> Files: *</span><br><span> Copyright: 2008-2013 Free Software Foundation</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-trx/+/15002">change 15002</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/c/osmo-trx/+/15002"/><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-Change-Id: Ibb40ba487581e76d2ae3e8a420d631670f876cf0 </div>
<div style="display:none"> Gerrit-Change-Number: 15002 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>