<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10921">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Install sample cfg file to /etc/osmocom<br><br>Change cfg file names so they don't overlap when installing different<br>osmo-bts versions, and make systemd services look for correct new name.<br><br>Remove unneeded duplicated EXTRA_DIST files from root dir Makefile.am<br><br>Change-Id: I75fdd06cc52ce50628efb1f9b007d2e3926db27d<br>---<br>M Makefile.am<br>M contrib/systemd/osmo-bts-lc15.service<br>M contrib/systemd/osmo-bts-sysmo.service<br>M contrib/systemd/osmo-bts-trx.service<br>M debian/osmo-bts-trx.install<br>M debian/osmo-bts-virtual.install<br>M doc/examples/Makefile.am<br>R doc/examples/litecell15/osmo-bts-lc15.cfg<br>R doc/examples/octphy/osmo-bts-octphy.cfg<br>R doc/examples/sysmo/osmo-bts-sysmo.cfg<br>R doc/examples/trx/osmo-bts-trx.cfg<br>R doc/examples/virtual/osmo-bts-virtual.cfg<br>12 files changed, 20 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/21/10921/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile.am b/Makefile.am</span><br><span>index b573aa8..5b49bb7 100644</span><br><span>--- a/Makefile.am</span><br><span>+++ b/Makefile.am</span><br><span>@@ -7,10 +7,6 @@</span><br><span> EXTRA_DIST = \</span><br><span>     contrib/dump_docs.py contrib/screenrc-l1fwd \</span><br><span>        contrib/l1fwd.init contrib/screenrc-sysmobts contrib/respawn.sh \</span><br><span style="color: hsl(0, 100%, 40%);">-       doc/examples/sysmo/osmo-bts.cfg \</span><br><span style="color: hsl(0, 100%, 40%);">-       doc/examples/sysmo/sysmobts-mgr.cfg \</span><br><span style="color: hsl(0, 100%, 40%);">-   doc/examples/virtual/openbsc-virtual.cfg \</span><br><span style="color: hsl(0, 100%, 40%);">-      doc/examples/virtual/osmobts-virtual.cfg \</span><br><span>   git-version-gen .version \</span><br><span>   README.md</span><br><span> </span><br><span>diff --git a/contrib/systemd/osmo-bts-lc15.service b/contrib/systemd/osmo-bts-lc15.service</span><br><span>index 6aa9751..90e7fc2 100644</span><br><span>--- a/contrib/systemd/osmo-bts-lc15.service</span><br><span>+++ b/contrib/systemd/osmo-bts-lc15.service</span><br><span>@@ -5,7 +5,7 @@</span><br><span> Type=simple</span><br><span> ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness'</span><br><span> ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr1/brightness'</span><br><span style="color: hsl(0, 100%, 40%);">-ExecStart=/usr/bin/osmo-bts-lc15 -t 2 -s -c /etc/osmocom/osmo-bts.cfg -M</span><br><span style="color: hsl(120, 100%, 40%);">+ExecStart=/usr/bin/osmo-bts-lc15 -t 2 -s -c /etc/osmocom/osmo-bts-lc15.cfg -M</span><br><span> ExecStopPost=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness'</span><br><span> ExecStopPost=/bin/sh -c 'echo 0 > /sys/class/leds/usr1/brightness'</span><br><span> Restart=always</span><br><span>diff --git a/contrib/systemd/osmo-bts-sysmo.service b/contrib/systemd/osmo-bts-sysmo.service</span><br><span>index 65b1f00..9255817 100644</span><br><span>--- a/contrib/systemd/osmo-bts-sysmo.service</span><br><span>+++ b/contrib/systemd/osmo-bts-sysmo.service</span><br><span>@@ -4,7 +4,7 @@</span><br><span> [Service]</span><br><span> Type=simple</span><br><span> ExecStartPre=/bin/sh -c 'echo 0 > /sys/class/leds/activity_led/brightness'</span><br><span style="color: hsl(0, 100%, 40%);">-ExecStart=/usr/bin/osmo-bts-sysmo -s -c /etc/osmocom/osmo-bts.cfg -M</span><br><span style="color: hsl(120, 100%, 40%);">+ExecStart=/usr/bin/osmo-bts-sysmo -s -c /etc/osmocom/osmo-bts-sysmo.cfg -M</span><br><span> ExecStopPost=/bin/sh -c 'echo 0 > /sys/class/leds/activity_led/brightness'</span><br><span> 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'</span><br><span> Restart=always</span><br><span>diff --git a/contrib/systemd/osmo-bts-trx.service b/contrib/systemd/osmo-bts-trx.service</span><br><span>index cea8719..97c2b07 100644</span><br><span>--- a/contrib/systemd/osmo-bts-trx.service</span><br><span>+++ b/contrib/systemd/osmo-bts-trx.service</span><br><span>@@ -3,7 +3,7 @@</span><br><span> </span><br><span> [Service]</span><br><span> Type=simple</span><br><span style="color: hsl(0, 100%, 40%);">-ExecStart=/usr/bin/osmo-bts-trx -s -c /etc/osmocom/osmo-bts.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+ExecStart=/usr/bin/osmo-bts-trx -s -c /etc/osmocom/osmo-bts-trx.cfg</span><br><span> Restart=always</span><br><span> RestartSec=2</span><br><span> </span><br><span>diff --git a/debian/osmo-bts-trx.install b/debian/osmo-bts-trx.install</span><br><span>index 2343d25..004a7ed 100644</span><br><span>--- a/debian/osmo-bts-trx.install</span><br><span>+++ b/debian/osmo-bts-trx.install</span><br><span>@@ -1,4 +1,5 @@</span><br><span style="color: hsl(120, 100%, 40%);">+etc/osmocom/osmo-bts-trx.cfg</span><br><span> lib/systemd/system/osmo-bts-trx.service</span><br><span> usr/bin/osmo-bts-trx</span><br><span style="color: hsl(0, 100%, 40%);">-usr/share/doc/osmo-bts/examples/osmo-bts-trx/osmo-bts.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+usr/share/doc/osmo-bts/examples/osmo-bts-trx/osmo-bts-trx.cfg</span><br><span> usr/share/doc/osmo-bts/examples/osmo-bts-trx/osmo-bts-trx-calypso.cfg</span><br><span>diff --git a/debian/osmo-bts-virtual.install b/debian/osmo-bts-virtual.install</span><br><span>index 0e6ca1b..f4d988f 100644</span><br><span>--- a/debian/osmo-bts-virtual.install</span><br><span>+++ b/debian/osmo-bts-virtual.install</span><br><span>@@ -1,5 +1,6 @@</span><br><span style="color: hsl(120, 100%, 40%);">+etc/osmocom/osmo-bts-virtual.cfg</span><br><span> lib/systemd/system/osmo-bts-virtual.service</span><br><span> usr/bin/osmo-bts-virtual</span><br><span> usr/bin/osmo-bts-omldummy</span><br><span style="color: hsl(0, 100%, 40%);">-usr/share/doc/osmo-bts/examples/osmo-bts-virtual/osmobts-virtual.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+usr/share/doc/osmo-bts/examples/osmo-bts-virtual/osmo-bts-virtual.cfg</span><br><span> usr/share/doc/osmo-bts/examples/osmo-bts-virtual/openbsc-virtual.cfg</span><br><span>diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am</span><br><span>index e4be5fc..241f579 100644</span><br><span>--- a/doc/examples/Makefile.am</span><br><span>+++ b/doc/examples/Makefile.am</span><br><span>@@ -1,38 +1,46 @@</span><br><span style="color: hsl(120, 100%, 40%);">+OSMOCONF_FILES = virtual/osmo-bts-virtual.cfg</span><br><span> </span><br><span> doc_virtualdir = $(docdir)/examples/osmo-bts-virtual</span><br><span> doc_virtual_DATA = \</span><br><span style="color: hsl(0, 100%, 40%);">-        virtual/osmobts-virtual.cfg \</span><br><span style="color: hsl(120, 100%, 40%);">+        virtual/osmo-bts-virtual.cfg \</span><br><span>         virtual/openbsc-virtual.cfg</span><br><span> EXTRA_DIST = $(doc_virtual_DATA)</span><br><span> </span><br><span> if ENABLE_SYSMOBTS</span><br><span> doc_sysmodir = $(docdir)/examples/osmo-bts-sysmo</span><br><span> doc_sysmo_DATA = \</span><br><span style="color: hsl(0, 100%, 40%);">-        sysmo/osmo-bts.cfg \</span><br><span style="color: hsl(120, 100%, 40%);">+        sysmo/osmo-bts-sysmo.cfg \</span><br><span>         sysmo/sysmobts-mgr.cfg</span><br><span> EXTRA_DIST += $(doc_sysmo_DATA)</span><br><span style="color: hsl(120, 100%, 40%);">+OSMOCONF_FILES += sysmo/osmo-bts-sysmo.cfg</span><br><span> endif</span><br><span> </span><br><span> if ENABLE_TRX</span><br><span> doc_trxdir = $(docdir)/examples/osmo-bts-trx</span><br><span> doc_trx_DATA = \</span><br><span style="color: hsl(0, 100%, 40%);">-        trx/osmo-bts.cfg \</span><br><span style="color: hsl(120, 100%, 40%);">+        trx/osmo-bts-trx.cfg \</span><br><span>         trx/osmo-bts-trx-calypso.cfg</span><br><span> EXTRA_DIST += $(doc_trx_DATA)</span><br><span style="color: hsl(120, 100%, 40%);">+OSMOCONF_FILES += trx/osmo-bts-trx.cfg</span><br><span> endif</span><br><span> </span><br><span> if ENABLE_OCTPHY</span><br><span> doc_octphydir = $(docdir)/examples/osmo-bts-octphy</span><br><span> doc_octphy_DATA = \</span><br><span>         octphy/osmo-bts-trx2dsp1.cfg \</span><br><span style="color: hsl(0, 100%, 40%);">-        octphy/osmo-bts.cfg</span><br><span style="color: hsl(120, 100%, 40%);">+        octphy/osmo-bts-octphy.cfg</span><br><span> EXTRA_DIST += $(doc_octphy_DATA)</span><br><span style="color: hsl(120, 100%, 40%);">+OSMOCONF_FILES += octphy/osmo-bts-octphy.cfg</span><br><span> endif</span><br><span> </span><br><span> if ENABLE_LC15BTS</span><br><span> doc_lc15dir = $(docdir)/examples/osmo-bts-lc15</span><br><span> doc_lc15_DATA = \</span><br><span style="color: hsl(0, 100%, 40%);">-        litecell15/osmo-bts.cfg \</span><br><span style="color: hsl(120, 100%, 40%);">+        litecell15/osmo-bts-lc15.cfg \</span><br><span>         litecell15/lc15bts-mgr.cfg</span><br><span> EXTRA_DIST += $(doc_lc15_DATA)</span><br><span style="color: hsl(120, 100%, 40%);">+OSMOCONF_FILES += litecell15/osmo-bts-lc15.cfg</span><br><span> endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+osmoconfdir = $(sysconfdir)/osmocom</span><br><span style="color: hsl(120, 100%, 40%);">+osmoconf_DATA = $(OSMOCONF_FILES)</span><br><span>diff --git a/doc/examples/litecell15/osmo-bts.cfg b/doc/examples/litecell15/osmo-bts-lc15.cfg</span><br><span>similarity index 100%</span><br><span>rename from doc/examples/litecell15/osmo-bts.cfg</span><br><span>rename to doc/examples/litecell15/osmo-bts-lc15.cfg</span><br><span>diff --git a/doc/examples/octphy/osmo-bts.cfg b/doc/examples/octphy/osmo-bts-octphy.cfg</span><br><span>similarity index 100%</span><br><span>rename from doc/examples/octphy/osmo-bts.cfg</span><br><span>rename to doc/examples/octphy/osmo-bts-octphy.cfg</span><br><span>diff --git a/doc/examples/sysmo/osmo-bts.cfg b/doc/examples/sysmo/osmo-bts-sysmo.cfg</span><br><span>similarity index 100%</span><br><span>rename from doc/examples/sysmo/osmo-bts.cfg</span><br><span>rename to doc/examples/sysmo/osmo-bts-sysmo.cfg</span><br><span>diff --git a/doc/examples/trx/osmo-bts.cfg b/doc/examples/trx/osmo-bts-trx.cfg</span><br><span>similarity index 100%</span><br><span>rename from doc/examples/trx/osmo-bts.cfg</span><br><span>rename to doc/examples/trx/osmo-bts-trx.cfg</span><br><span>diff --git a/doc/examples/virtual/osmobts-virtual.cfg b/doc/examples/virtual/osmo-bts-virtual.cfg</span><br><span>similarity index 100%</span><br><span>rename from doc/examples/virtual/osmobts-virtual.cfg</span><br><span>rename to doc/examples/virtual/osmo-bts-virtual.cfg</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10921">change 10921</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/10921"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I75fdd06cc52ce50628efb1f9b007d2e3926db27d </div>
<div style="display:none"> Gerrit-Change-Number: 10921 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>