<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10958">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">openbsc: Drop untested sysvinit support<br><br>These bits come from times were sysvinit was used in stead of systemd in<br>yocto. Nowadays nobody is known to be using the recipes with sysvinit<br>instead of systemd, and anyway most osmocom recipes doesn't come with<br>sysvinit support, so let's drop it. If sysvinit support is required, it<br>should be added through autotools install process instead.<br><br>As update-rc.d was removed, it was noticied that systemd class inherit<br>was missing, so this commit adds it. As a result, it's not required to<br>define systemd service file paths in FILES_*.<br><br>Change-Id: I864e4a61aed7933c46b80aa26598234faba43395<br>---<br>M recipes-osmocom/openbsc/openbsc.inc<br>D recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init<br>D recipes-osmocom/openbsc/openbsc/osmo-nitb.init<br>M recipes-osmocom/openbsc/openbsc_git.bb<br>4 files changed, 2 insertions(+), 119 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/meta-telephony refs/changes/58/10958/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc</span><br><span>index ec130db..ca3b124 100644</span><br><span>--- a/recipes-osmocom/openbsc/openbsc.inc</span><br><span>+++ b/recipes-osmocom/openbsc/openbsc.inc</span><br><span>@@ -6,15 +6,11 @@</span><br><span> </span><br><span> RDEPENDS_osmo-nitb = "libdbd-sqlite3"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-SRC_URI = "file://osmo-nitb.init \</span><br><span style="color: hsl(0, 100%, 40%);">-      file://osmo-bsc-sccplite.init \</span><br><span style="color: hsl(0, 100%, 40%);">-         "</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> INC_PR = "r3.${META_TELEPHONY_OSMO_INC}"</span><br><span> </span><br><span> EXTRA_OECONF += "--enable-nat --enable-osmo-bsc --enable-smpp --enable-mgcp-transcoding --with-g729"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-inherit autotools update-rc.d pkgconfig</span><br><span style="color: hsl(120, 100%, 40%);">+inherit autotools systemd pkgconfig</span><br><span> </span><br><span> do_install_append() {</span><br><span>   install -d ${D}${sysconfdir}/osmocom</span><br><span>@@ -23,12 +19,6 @@</span><br><span>    install -m 0644 ${S}/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-nat.cfg</span><br><span>   install -m 0644 ${S}/doc/examples/osmo-bsc_mgcp/mgcp.cfg ${D}${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        # Install sysv-init files</span><br><span style="color: hsl(0, 100%, 40%);">-       install -d ${D}${sysconfdir}/init.d</span><br><span style="color: hsl(0, 100%, 40%);">-     install -d ${D}${sysconfdir}/rc5.d</span><br><span style="color: hsl(0, 100%, 40%);">-      install -m 0775 ${WORKDIR}/osmo-nitb.init ${D}${sysconfdir}/init.d/osmo-nitb</span><br><span style="color: hsl(0, 100%, 40%);">-    install -m 0775 ${WORKDIR}/osmo-bsc-sccplite.init ${D}${sysconfdir}/init.d/osmo-bsc-sccplite</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>         # Install systemd files and enable on sysinit</span><br><span>        install -d ${D}${systemd_system_unitdir}/</span><br><span>    install -m 0644 ${S}/contrib/systemd/osmo-nitb.service ${D}${systemd_system_unitdir}/</span><br><span>@@ -42,27 +32,18 @@</span><br><span> </span><br><span> PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp"</span><br><span> SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb osmo-bsc-mgcp"</span><br><span style="color: hsl(0, 100%, 40%);">-INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb"</span><br><span> </span><br><span> CONFFILES_osmo-bsc-sccplite = "${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg"</span><br><span> SYSTEMD_SERVICE_osmo-bsc-sccplite = "osmo-bsc-sccplite.service"</span><br><span style="color: hsl(0, 100%, 40%);">-INITSCRIPT_NAME_osmo-bsc-sccplite = "osmo-bsc-sccplite"</span><br><span style="color: hsl(0, 100%, 40%);">-INITSCRIPT_PARAMS_osmo-bsc-sccplite = "defaults 30 30"</span><br><span> FILES_osmo-bsc-sccplite = " ${bindir}/osmo-bsc-sccplite \</span><br><span>                 ${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg \</span><br><span style="color: hsl(0, 100%, 40%);">-           ${sysconfdir}/init.d/osmo-bsc-sccplite \</span><br><span style="color: hsl(0, 100%, 40%);">-                ${systemd_system_unitdir}/osmo-bsc-sccplite.service \</span><br><span>                "</span><br><span> </span><br><span> CONFFILES_osmo-nitb = "${sysconfdir}/osmocom/osmo-nitb.cfg"</span><br><span> SYSTEMD_SERVICE_osmo-nitb = "osmo-nitb.service"</span><br><span style="color: hsl(0, 100%, 40%);">-INITSCRIPT_NAME_osmo-nitb = "osmo-nitb"</span><br><span style="color: hsl(0, 100%, 40%);">-INITSCRIPT_PARAMS_osmo-nitb = "defaults 30 30"</span><br><span> FILES_osmo-nitb = " ${bindir}/osmo-nitb \</span><br><span>          /var/lib/osmocom \</span><br><span style="color: hsl(0, 100%, 40%);">-              ${sysconfdir}/init.d/osmo-nitb \</span><br><span>             ${sysconfdir}/osmocom/osmo-nitb.cfg \</span><br><span style="color: hsl(0, 100%, 40%);">-           ${systemd_system_unitdir}/osmo-nitb.service \</span><br><span>                "</span><br><span> </span><br><span> CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg"</span><br><span>@@ -70,7 +51,6 @@</span><br><span> FILES_osmo-bsc-nat = " \</span><br><span>               ${bindir}/osmo-bsc_nat \</span><br><span>             ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \</span><br><span style="color: hsl(0, 100%, 40%);">-                ${systemd_system_unitdir}/osmo-bsc-nat.service \</span><br><span>             "</span><br><span> </span><br><span> CONFFILES_osmo-bsc-mgcp = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg"</span><br><span>@@ -78,5 +58,4 @@</span><br><span> FILES_osmo-bsc-mgcp = " \</span><br><span>            ${bindir}/osmo-bsc_mgcp \</span><br><span>            ${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg \</span><br><span style="color: hsl(0, 100%, 40%);">-               ${systemd_system_unitdir}/osmo-bsc-mgcp.service \</span><br><span>            "</span><br><span>diff --git a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init b/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init</span><br><span>deleted file mode 100755</span><br><span>index 3186f6d..0000000</span><br><span>--- a/recipes-osmocom/openbsc/openbsc/osmo-bsc-sccplite.init</span><br><span>+++ /dev/null</span><br><span>@@ -1,48 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(0, 100%, 40%);">-### BEGIN INIT INFO</span><br><span style="color: hsl(0, 100%, 40%);">-# Provides:              osmo-bsc-sccplite</span><br><span style="color: hsl(0, 100%, 40%);">-# Required-Start:      $syslog $networking</span><br><span style="color: hsl(0, 100%, 40%);">-# Required-Stop:     $syslog</span><br><span style="color: hsl(0, 100%, 40%);">-# Default-Start: 5</span><br><span style="color: hsl(0, 100%, 40%);">-# Default-Stop:                1</span><br><span style="color: hsl(0, 100%, 40%);">-# Short-Description:   Osmocom GSM Base Station Controller (legacy, with SCCPLite)</span><br><span style="color: hsl(0, 100%, 40%);">-### END INIT INFO</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-DAEMON=/usr/bin/osmo-bsc-sccplite</span><br><span style="color: hsl(0, 100%, 40%);">-NAME=osmo-bsc-sccplite</span><br><span style="color: hsl(0, 100%, 40%);">-DESC="Osmocom GSM Base Station Controller"</span><br><span style="color: hsl(0, 100%, 40%);">-NORMAL_ARGS="-D -c /etc/osmocom/osmo-bsc-sccplite.cfg -r /var/run/openbsc.ctl"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-OSMOBTS_EXTRA_ARGS=""</span><br><span style="color: hsl(0, 100%, 40%);">-NO_START=1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-set -e</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-test ! -r /etc/default/osmo-bsc-sccplite || . /etc/default/osmo-bsc-sccplite</span><br><span style="color: hsl(0, 100%, 40%);">-test "$NO_START" = "0" || exit 0</span><br><span style="color: hsl(0, 100%, 40%);">-test -x "$DAEMON" || exit 0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-case "$1" in</span><br><span style="color: hsl(0, 100%, 40%);">-  start)</span><br><span style="color: hsl(0, 100%, 40%);">-       echo -n "Starting $DESC: "</span><br><span style="color: hsl(0, 100%, 40%);">-    start-stop-daemon -S \</span><br><span style="color: hsl(0, 100%, 40%);">-    -x "$DAEMON" -- $NORMAL_ARGS $OSMOBTS_EXTRA_ARGS</span><br><span style="color: hsl(0, 100%, 40%);">-    echo "$NAME."</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">-  stop)</span><br><span style="color: hsl(0, 100%, 40%);">-       echo -n "Stopping $DESC: "</span><br><span style="color: hsl(0, 100%, 40%);">-    start-stop-daemon -K -x "$DAEMON"</span><br><span style="color: hsl(0, 100%, 40%);">-     echo "$NAME."</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">-  restart)</span><br><span style="color: hsl(0, 100%, 40%);">-    $0 stop</span><br><span style="color: hsl(0, 100%, 40%);">- $0 start</span><br><span style="color: hsl(0, 100%, 40%);">-        ;;</span><br><span style="color: hsl(0, 100%, 40%);">-  *)</span><br><span style="color: hsl(0, 100%, 40%);">-  N=/etc/init.d/$NAME</span><br><span style="color: hsl(0, 100%, 40%);">-     echo "Usage: $N {start|stop|restart}" >&2</span><br><span style="color: hsl(0, 100%, 40%);">-      exit 1</span><br><span style="color: hsl(0, 100%, 40%);">-  ;;</span><br><span style="color: hsl(0, 100%, 40%);">-esac</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exit 0</span><br><span>diff --git a/recipes-osmocom/openbsc/openbsc/osmo-nitb.init b/recipes-osmocom/openbsc/openbsc/osmo-nitb.init</span><br><span>deleted file mode 100755</span><br><span>index bd74cc0..0000000</span><br><span>--- a/recipes-osmocom/openbsc/openbsc/osmo-nitb.init</span><br><span>+++ /dev/null</span><br><span>@@ -1,48 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(0, 100%, 40%);">-### BEGIN INIT INFO</span><br><span style="color: hsl(0, 100%, 40%);">-# Provides:                osmo-nitb</span><br><span style="color: hsl(0, 100%, 40%);">-# Required-Start:      $syslog $networking</span><br><span style="color: hsl(0, 100%, 40%);">-# Required-Stop:     $syslog</span><br><span style="color: hsl(0, 100%, 40%);">-# Default-Start: 5</span><br><span style="color: hsl(0, 100%, 40%);">-# Default-Stop:                1</span><br><span style="color: hsl(0, 100%, 40%);">-# Short-Description:   Osmocom GSM Network in the Box</span><br><span style="color: hsl(0, 100%, 40%);">-### END INIT INFO</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-DAEMON=/usr/bin/osmo-nitb</span><br><span style="color: hsl(0, 100%, 40%);">-NAME=osmo-nitb</span><br><span style="color: hsl(0, 100%, 40%);">-DESC="Osmocom GSM Network in the Box"</span><br><span style="color: hsl(0, 100%, 40%);">-NORMAL_ARGS="-C -D -c /etc/osmocom/osmo-nitb.cfg -l /var/lib/osmocom/hlr.sqlite3"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-OSMOBTS_EXTRA_ARGS=""</span><br><span style="color: hsl(0, 100%, 40%);">-NO_START=1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-set -e</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-test ! -r /etc/default/osmo-nitb || . /etc/default/osmo-nitb</span><br><span style="color: hsl(0, 100%, 40%);">-test "$NO_START" = "0" || exit 0</span><br><span style="color: hsl(0, 100%, 40%);">-test -x "$DAEMON" || exit 0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-case "$1" in</span><br><span style="color: hsl(0, 100%, 40%);">-  start)</span><br><span style="color: hsl(0, 100%, 40%);">-      echo -n "Starting $DESC: "</span><br><span style="color: hsl(0, 100%, 40%);">-    start-stop-daemon -S \</span><br><span style="color: hsl(0, 100%, 40%);">-    -x "$DAEMON" -- $NORMAL_ARGS $OSMOBTS_EXTRA_ARGS</span><br><span style="color: hsl(0, 100%, 40%);">-    echo "$NAME."</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">-  stop)</span><br><span style="color: hsl(0, 100%, 40%);">-       echo -n "Stopping $DESC: "</span><br><span style="color: hsl(0, 100%, 40%);">-    start-stop-daemon -K -x "$DAEMON"</span><br><span style="color: hsl(0, 100%, 40%);">-     echo "$NAME."</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">-  restart|force-reload)</span><br><span style="color: hsl(0, 100%, 40%);">-       $0 stop</span><br><span style="color: hsl(0, 100%, 40%);">- $0 start</span><br><span style="color: hsl(0, 100%, 40%);">-        ;;</span><br><span style="color: hsl(0, 100%, 40%);">-  *)</span><br><span style="color: hsl(0, 100%, 40%);">-  N=/etc/init.d/$NAME</span><br><span style="color: hsl(0, 100%, 40%);">-     echo "Usage: $N {start|stop|restart}" >&2</span><br><span style="color: hsl(0, 100%, 40%);">-      exit 1</span><br><span style="color: hsl(0, 100%, 40%);">-  ;;</span><br><span style="color: hsl(0, 100%, 40%);">-esac</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-exit 0</span><br><span>diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb</span><br><span>index 0d0dda9..7fc6308 100644</span><br><span>--- a/recipes-osmocom/openbsc/openbsc_git.bb</span><br><span>+++ b/recipes-osmocom/openbsc/openbsc_git.bb</span><br><span>@@ -5,6 +5,6 @@</span><br><span> PR = "${INC_PR}.0"</span><br><span> </span><br><span> SRCREV = "${AUTOREV}"</span><br><span style="color: hsl(0, 100%, 40%);">-SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git"</span><br><span style="color: hsl(120, 100%, 40%);">+SRC_URI = "git://git.osmocom.org/openbsc.git;protocol=git"</span><br><span> </span><br><span> S = "${WORKDIR}/git/openbsc"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10958">change 10958</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/10958"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: meta-telephony </div>
<div style="display:none"> Gerrit-Branch: laforge/nightly </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I864e4a61aed7933c46b80aa26598234faba43395 </div>
<div style="display:none"> Gerrit-Change-Number: 10958 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>