Change in osmo-bts[master]: Install sample cfg file to /etc/osmocom

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/.

Pau Espin Pedrol gerrit-no-reply at lists.osmocom.org
Thu Sep 13 13:59:21 UTC 2018


Pau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10921 )

Change subject: Install sample cfg file to /etc/osmocom
......................................................................

Install sample cfg file to /etc/osmocom

Change cfg file names so they don't overlap when installing different
osmo-bts versions, and make systemd services look for correct new name.

Remove unneeded duplicated EXTRA_DIST files from root dir Makefile.am

Change-Id: I75fdd06cc52ce50628efb1f9b007d2e3926db27d
---
M Makefile.am
M contrib/systemd/osmo-bts-lc15.service
M contrib/systemd/osmo-bts-sysmo.service
M contrib/systemd/osmo-bts-trx.service
M debian/osmo-bts-trx.install
M debian/osmo-bts-virtual.install
M doc/examples/Makefile.am
R doc/examples/litecell15/osmo-bts-lc15.cfg
R doc/examples/octphy/osmo-bts-octphy.cfg
R doc/examples/sysmo/osmo-bts-sysmo.cfg
R doc/examples/trx/osmo-bts-trx.cfg
R doc/examples/virtual/osmo-bts-virtual.cfg
12 files changed, 20 insertions(+), 14 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/Makefile.am b/Makefile.am
index b573aa8..5b49bb7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,10 +7,6 @@
 EXTRA_DIST = \
 	contrib/dump_docs.py contrib/screenrc-l1fwd \
 	contrib/l1fwd.init contrib/screenrc-sysmobts contrib/respawn.sh \
-	doc/examples/sysmo/osmo-bts.cfg \
-	doc/examples/sysmo/sysmobts-mgr.cfg \
-	doc/examples/virtual/openbsc-virtual.cfg \
-	doc/examples/virtual/osmobts-virtual.cfg \
 	git-version-gen .version \
 	README.md
 
diff --git a/contrib/systemd/osmo-bts-lc15.service b/contrib/systemd/osmo-bts-lc15.service
index 6aa9751..90e7fc2 100644
--- a/contrib/systemd/osmo-bts-lc15.service
+++ b/contrib/systemd/osmo-bts-lc15.service
@@ -5,7 +5,7 @@
 Type=simple
 ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness'
 ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr1/brightness'
-ExecStart=/usr/bin/osmo-bts-lc15 -t 2 -s -c /etc/osmocom/osmo-bts.cfg -M
+ExecStart=/usr/bin/osmo-bts-lc15 -t 2 -s -c /etc/osmocom/osmo-bts-lc15.cfg -M
 ExecStopPost=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness'
 ExecStopPost=/bin/sh -c 'echo 0 > /sys/class/leds/usr1/brightness'
 Restart=always
diff --git a/contrib/systemd/osmo-bts-sysmo.service b/contrib/systemd/osmo-bts-sysmo.service
index 65b1f00..9255817 100644
--- a/contrib/systemd/osmo-bts-sysmo.service
+++ b/contrib/systemd/osmo-bts-sysmo.service
@@ -4,7 +4,7 @@
 [Service]
 Type=simple
 ExecStartPre=/bin/sh -c 'echo 0 > /sys/class/leds/activity_led/brightness'
-ExecStart=/usr/bin/osmo-bts-sysmo -s -c /etc/osmocom/osmo-bts.cfg -M
+ExecStart=/usr/bin/osmo-bts-sysmo -s -c /etc/osmocom/osmo-bts-sysmo.cfg -M
 ExecStopPost=/bin/sh -c 'echo 0 > /sys/class/leds/activity_led/brightness'
 ExecStopPost=/bin/sh -c 'cat /lib/firmware/sysmobts-v?.bit > /dev/fpgadl_par0 ; sleep 3s; cat /lib/firmware/sysmobts-v?.out > /dev/dspdl_dm644x_0; sleep 1s'
 Restart=always
diff --git a/contrib/systemd/osmo-bts-trx.service b/contrib/systemd/osmo-bts-trx.service
index cea8719..97c2b07 100644
--- a/contrib/systemd/osmo-bts-trx.service
+++ b/contrib/systemd/osmo-bts-trx.service
@@ -3,7 +3,7 @@
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/osmo-bts-trx -s -c /etc/osmocom/osmo-bts.cfg
+ExecStart=/usr/bin/osmo-bts-trx -s -c /etc/osmocom/osmo-bts-trx.cfg
 Restart=always
 RestartSec=2
 
diff --git a/debian/osmo-bts-trx.install b/debian/osmo-bts-trx.install
index 2343d25..004a7ed 100644
--- a/debian/osmo-bts-trx.install
+++ b/debian/osmo-bts-trx.install
@@ -1,4 +1,5 @@
+etc/osmocom/osmo-bts-trx.cfg
 lib/systemd/system/osmo-bts-trx.service
 usr/bin/osmo-bts-trx
-usr/share/doc/osmo-bts/examples/osmo-bts-trx/osmo-bts.cfg
+usr/share/doc/osmo-bts/examples/osmo-bts-trx/osmo-bts-trx.cfg
 usr/share/doc/osmo-bts/examples/osmo-bts-trx/osmo-bts-trx-calypso.cfg
diff --git a/debian/osmo-bts-virtual.install b/debian/osmo-bts-virtual.install
index 0e6ca1b..f4d988f 100644
--- a/debian/osmo-bts-virtual.install
+++ b/debian/osmo-bts-virtual.install
@@ -1,5 +1,6 @@
+etc/osmocom/osmo-bts-virtual.cfg
 lib/systemd/system/osmo-bts-virtual.service
 usr/bin/osmo-bts-virtual
 usr/bin/osmo-bts-omldummy
-usr/share/doc/osmo-bts/examples/osmo-bts-virtual/osmobts-virtual.cfg
+usr/share/doc/osmo-bts/examples/osmo-bts-virtual/osmo-bts-virtual.cfg
 usr/share/doc/osmo-bts/examples/osmo-bts-virtual/openbsc-virtual.cfg
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index e4be5fc..241f579 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -1,38 +1,46 @@
+OSMOCONF_FILES = virtual/osmo-bts-virtual.cfg
 
 doc_virtualdir = $(docdir)/examples/osmo-bts-virtual
 doc_virtual_DATA = \
-        virtual/osmobts-virtual.cfg \
+        virtual/osmo-bts-virtual.cfg \
         virtual/openbsc-virtual.cfg
 EXTRA_DIST = $(doc_virtual_DATA)
 
 if ENABLE_SYSMOBTS
 doc_sysmodir = $(docdir)/examples/osmo-bts-sysmo
 doc_sysmo_DATA = \
-        sysmo/osmo-bts.cfg \
+        sysmo/osmo-bts-sysmo.cfg \
         sysmo/sysmobts-mgr.cfg
 EXTRA_DIST += $(doc_sysmo_DATA)
+OSMOCONF_FILES += sysmo/osmo-bts-sysmo.cfg
 endif
 
 if ENABLE_TRX
 doc_trxdir = $(docdir)/examples/osmo-bts-trx
 doc_trx_DATA = \
-        trx/osmo-bts.cfg \
+        trx/osmo-bts-trx.cfg \
         trx/osmo-bts-trx-calypso.cfg
 EXTRA_DIST += $(doc_trx_DATA)
+OSMOCONF_FILES += trx/osmo-bts-trx.cfg
 endif
 
 if ENABLE_OCTPHY
 doc_octphydir = $(docdir)/examples/osmo-bts-octphy
 doc_octphy_DATA = \
         octphy/osmo-bts-trx2dsp1.cfg \
-        octphy/osmo-bts.cfg
+        octphy/osmo-bts-octphy.cfg
 EXTRA_DIST += $(doc_octphy_DATA)
+OSMOCONF_FILES += octphy/osmo-bts-octphy.cfg
 endif
 
 if ENABLE_LC15BTS
 doc_lc15dir = $(docdir)/examples/osmo-bts-lc15
 doc_lc15_DATA = \
-        litecell15/osmo-bts.cfg \
+        litecell15/osmo-bts-lc15.cfg \
         litecell15/lc15bts-mgr.cfg
 EXTRA_DIST += $(doc_lc15_DATA)
+OSMOCONF_FILES += litecell15/osmo-bts-lc15.cfg
 endif
+
+osmoconfdir = $(sysconfdir)/osmocom
+osmoconf_DATA = $(OSMOCONF_FILES)
diff --git a/doc/examples/litecell15/osmo-bts.cfg b/doc/examples/litecell15/osmo-bts-lc15.cfg
similarity index 100%
rename from doc/examples/litecell15/osmo-bts.cfg
rename to doc/examples/litecell15/osmo-bts-lc15.cfg
diff --git a/doc/examples/octphy/osmo-bts.cfg b/doc/examples/octphy/osmo-bts-octphy.cfg
similarity index 100%
rename from doc/examples/octphy/osmo-bts.cfg
rename to doc/examples/octphy/osmo-bts-octphy.cfg
diff --git a/doc/examples/sysmo/osmo-bts.cfg b/doc/examples/sysmo/osmo-bts-sysmo.cfg
similarity index 100%
rename from doc/examples/sysmo/osmo-bts.cfg
rename to doc/examples/sysmo/osmo-bts-sysmo.cfg
diff --git a/doc/examples/trx/osmo-bts.cfg b/doc/examples/trx/osmo-bts-trx.cfg
similarity index 100%
rename from doc/examples/trx/osmo-bts.cfg
rename to doc/examples/trx/osmo-bts-trx.cfg
diff --git a/doc/examples/virtual/osmobts-virtual.cfg b/doc/examples/virtual/osmo-bts-virtual.cfg
similarity index 100%
rename from doc/examples/virtual/osmobts-virtual.cfg
rename to doc/examples/virtual/osmo-bts-virtual.cfg

-- 
To view, visit https://gerrit.osmocom.org/10921
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I75fdd06cc52ce50628efb1f9b007d2e3926db27d
Gerrit-Change-Number: 10921
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180913/2b8112bd/attachment.htm>


More information about the gerrit-log mailing list