Change in ...osmo-trx[master]: Move std_inband.rbf under device/usrp1/ dir

pespin gerrit-no-reply at lists.osmocom.org
Thu Aug 1 12:04:24 UTC 2019


pespin has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-trx/+/15002 )

Change subject: Move std_inband.rbf under device/usrp1/ dir
......................................................................

Move std_inband.rbf under device/usrp1/ dir

This file is only used by USRP1, so let's move it there and avoid
processing it in Makefiles if build for USRP1 is not requested at
configure time.

Change-Id: Ibb40ba487581e76d2ae3e8a420d631670f876cf0
---
M Transceiver52M/Makefile.am
M Transceiver52M/device/usrp1/Makefile.am
R Transceiver52M/device/usrp1/std_inband.rbf
M debian/copyright
4 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index f039e3f..ade4e30 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -27,12 +27,6 @@
 AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
 AM_CFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS)
 
-rev2dir = $(datadir)/usrp/rev2
-rev4dir = $(datadir)/usrp/rev4
-
-dist_rev2_DATA = std_inband.rbf
-dist_rev4_DATA = std_inband.rbf
-
 noinst_LTLIBRARIES = libtransceiver_common.la
 
 COMMON_SOURCES = \
diff --git a/Transceiver52M/device/usrp1/Makefile.am b/Transceiver52M/device/usrp1/Makefile.am
index 5078934..24760f7 100644
--- a/Transceiver52M/device/usrp1/Makefile.am
+++ b/Transceiver52M/device/usrp1/Makefile.am
@@ -3,6 +3,12 @@
 AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common
 AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(USRP_CFLAGS)
 
+rev2dir = $(datadir)/usrp/rev2
+rev4dir = $(datadir)/usrp/rev4
+
+dist_rev2_DATA = std_inband.rbf
+dist_rev4_DATA = std_inband.rbf
+
 noinst_HEADERS = USRPDevice.h
 
 noinst_LTLIBRARIES = libdevice.la
diff --git a/Transceiver52M/std_inband.rbf b/Transceiver52M/device/usrp1/std_inband.rbf
similarity index 100%
rename from Transceiver52M/std_inband.rbf
rename to Transceiver52M/device/usrp1/std_inband.rbf
Binary files differ
diff --git a/debian/copyright b/debian/copyright
index d8db465..19926cd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: OsmoTRX
 Source: http://cgit.osmocom.org/osmo-trx/
-Files-Excluded: Transceiver52M/std_inband.rbf
+Files-Excluded: Transceiver52M/device/usrp1/std_inband.rbf
 
 Files: *
 Copyright: 2008-2013 Free Software Foundation

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/15002
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-trx
Gerrit-Branch: master
Gerrit-Change-Id: Ibb40ba487581e76d2ae3e8a420d631670f876cf0
Gerrit-Change-Number: 15002
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at gnumonks.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190801/5888b4b8/attachment.html>


More information about the gerrit-log mailing list