This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Harald Welte gerrit-no-reply at lists.osmocom.orgHarald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9680 ) Change subject: debian: Add cfg file examples for osmo-trx-{lms,uhd} ...................................................................... debian: Add cfg file examples for osmo-trx-{lms,uhd} Sort cfg files according to their osmo-trx binary. Install them during make install. Add the installed cfg files to related debian packages. Change-Id: I905cdac30b441e4df0a3f5c0924d1637b9f67b90 --- M Makefile.am M configure.ac M debian/osmo-trx-lms.install M debian/osmo-trx-uhd.install A doc/Makefile.am A doc/examples/Makefile.am R doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg C doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg R doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg R doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg 10 files changed, 32 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/Makefile.am b/Makefile.am index 71f7b91..8ab73a6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,6 +28,7 @@ # Order must be preserved SUBDIRS = \ + doc \ CommonLibs \ GSM \ Transceiver52M \ diff --git a/configure.ac b/configure.ac index aae151b..974a611 100644 --- a/configure.ac +++ b/configure.ac @@ -225,6 +225,8 @@ tests/Makefile \ tests/CommonLibs/Makefile \ tests/Transceiver52M/Makefile \ + doc/Makefile \ + doc/examples/Makefile \ ]) AC_OUTPUT diff --git a/debian/osmo-trx-lms.install b/debian/osmo-trx-lms.install index 5937edb..e8bb867 100644 --- a/debian/osmo-trx-lms.install +++ b/debian/osmo-trx-lms.install @@ -1 +1,2 @@ /usr/bin/osmo-trx-lms +/usr/share/doc/osmo-trx-lms/examples/osmo-trx-limesdr.cfg /usr/share/doc/osmo-trx-lms/examples diff --git a/debian/osmo-trx-uhd.install b/debian/osmo-trx-uhd.install index 0005b76..2db0142 100644 --- a/debian/osmo-trx-uhd.install +++ b/debian/osmo-trx-uhd.install @@ -1 +1,4 @@ /usr/bin/osmo-trx-uhd +/usr/share/doc/osmo-trx-uhd/examples/osmo-trx-usrp_b200.cfg /usr/share/doc/osmo-trx-uhd/examples +/usr/share/doc/osmo-trx-uhd/examples/osmo-trx-limesdr.cfg /usr/share/doc/osmo-trx-uhd/examples +/usr/share/doc/osmo-trx-uhd/examples/osmo-trx-umtrx.cfg /usr/share/doc/osmo-trx-uhd/examples diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 0000000..1d42b0a --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,3 @@ +SUBDIRS = \ + examples \ + $(NULL) diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am new file mode 100644 index 0000000..530c3fa --- /dev/null +++ b/doc/examples/Makefile.am @@ -0,0 +1,22 @@ +CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,' + +dist-hook: + for f in $$($(CFG_FILES)); do \ + j="$(distdir)/$$f" && \ + mkdir -p "$$(dirname $$j)" && \ + $(INSTALL_DATA) $(srcdir)/$$f $$j; \ + done + +install-data-hook: + for f in $$($(CFG_FILES)); do \ + j="$(DESTDIR)$(docdir)/examples/$$f" && \ + mkdir -p "$$(dirname $$j)" && \ + $(INSTALL_DATA) $(srcdir)/$$f $$j; \ + done + +uninstall-hook: + @$(PRE_UNINSTALL) + for f in $$($(CFG_FILES)); do \ + j="$(DESTDIR)$(docdir)/examples/$$f" && \ + $(RM) $$j; \ + done diff --git a/doc/examples/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg similarity index 100% rename from doc/examples/osmo-trx-limesdr.cfg rename to doc/examples/osmo-trx-lms/osmo-trx-limesdr.cfg diff --git a/doc/examples/osmo-trx-limesdr.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg similarity index 100% copy from doc/examples/osmo-trx-limesdr.cfg copy to doc/examples/osmo-trx-uhd/osmo-trx-limesdr.cfg diff --git a/doc/examples/osmo-trx-umtrx.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg similarity index 100% rename from doc/examples/osmo-trx-umtrx.cfg rename to doc/examples/osmo-trx-uhd/osmo-trx-umtrx.cfg diff --git a/doc/examples/osmo-trx-usrp_b200.cfg b/doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg similarity index 100% rename from doc/examples/osmo-trx-usrp_b200.cfg rename to doc/examples/osmo-trx-uhd/osmo-trx-usrp_b200.cfg -- To view, visit https://gerrit.osmocom.org/9680 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I905cdac30b441e4df0a3f5c0924d1637b9f67b90 Gerrit-Change-Number: 9680 Gerrit-PatchSet: 1 Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180620/b1f20692/attachment.htm>