<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10951">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-ggsn: 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>Change-Id: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6<br>---<br>D recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init<br>M recipes-osmocom/osmo-ggsn/osmo-ggsn.inc<br>M recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb<br>3 files changed, 3 insertions(+), 179 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/51/10951/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init b/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init</span><br><span>deleted file mode 100755</span><br><span>index 157d6dd..0000000</span><br><span>--- a/recipes-osmocom/osmo-ggsn/files/osmo-ggsn.init</span><br><span>+++ /dev/null</span><br><span>@@ -1,169 +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-ggsn</span><br><span style="color: hsl(0, 100%, 40%);">-# Required-Start: $network $local_fs</span><br><span style="color: hsl(0, 100%, 40%);">-# Required-Stop:</span><br><span style="color: hsl(0, 100%, 40%);">-# Default-Start: 2 3 4 5</span><br><span style="color: hsl(0, 100%, 40%);">-# Default-Stop: 0 1 6</span><br><span style="color: hsl(0, 100%, 40%);">-# Short-Description: Osmocom GSM network-in-a-box</span><br><span style="color: hsl(0, 100%, 40%);">-# Description: A minimal implementation of the GSM Base Station Controller,</span><br><span style="color: hsl(0, 100%, 40%);">-# Mobile Switching Center, Home Location regster and all other</span><br><span style="color: hsl(0, 100%, 40%);">-# components to run a self-contained GSM network.</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%);">-# Author: Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# PATH should only include /usr/* if it runs after the mountnfs.sh script</span><br><span style="color: hsl(0, 100%, 40%);">-PATH=/sbin:/usr/sbin:/bin:/usr/bin</span><br><span style="color: hsl(0, 100%, 40%);">-DESC="Osmocom GGSN implementation"</span><br><span style="color: hsl(0, 100%, 40%);">-NAME=osmo-ggsn</span><br><span style="color: hsl(0, 100%, 40%);">-DAEMON=/usr/bin/ggsn</span><br><span style="color: hsl(0, 100%, 40%);">-DAEMON_ARGS="" # Arguments to run the daemon with</span><br><span style="color: hsl(0, 100%, 40%);">-PIDFILE=/var/run/$NAME.pid</span><br><span style="color: hsl(0, 100%, 40%);">-SCRIPTNAME=/etc/init.d/$NAME</span><br><span style="color: hsl(0, 100%, 40%);">-CONFIG_FILE=/etc/ggsn.conf</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# Exit if the package is not installed</span><br><span style="color: hsl(0, 100%, 40%);">-[ -x $DAEMON ] || exit 0</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# Read configuration variable file if it is present</span><br><span style="color: hsl(0, 100%, 40%);">-[ -r /etc/default/$NAME ] && . /etc/default/$NAME</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# Load the VERBOSE setting and other rcS variables</span><br><span style="color: hsl(0, 100%, 40%);">-# . /lib/init/vars.sh</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# Define LSB log_* functions.</span><br><span style="color: hsl(0, 100%, 40%);">-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.</span><br><span style="color: hsl(0, 100%, 40%);">-# . /lib/lsb/init-functions</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-DAEMON_ARGS="$DAEMON_ARGS -c $CONFIG_FILE"</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%);">-# Function that starts the daemon/service</span><br><span style="color: hsl(0, 100%, 40%);">-#</span><br><span style="color: hsl(0, 100%, 40%);">-do_start()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- # Return</span><br><span style="color: hsl(0, 100%, 40%);">- # 0 if daemon has been started</span><br><span style="color: hsl(0, 100%, 40%);">- # 1 if daemon was already running</span><br><span style="color: hsl(0, 100%, 40%);">- # 2 if daemon could not be started</span><br><span style="color: hsl(0, 100%, 40%);">- /sbin/modprobe tun</span><br><span style="color: hsl(0, 100%, 40%);">- start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \</span><br><span style="color: hsl(0, 100%, 40%);">- || return 1</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # Check for runtime directory of nonvolatile data</span><br><span style="color: hsl(0, 100%, 40%);">- if [ ! -d /var/lib/ggsn ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- mkdir /var/lib/ggsn</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- # Check for GTP restart counter</span><br><span style="color: hsl(0, 100%, 40%);">- if [ ! -f /var/lib/ggsn/gsn_restart ]; then</span><br><span style="color: hsl(0, 100%, 40%);">- echo 0 > /var/lib/ggsn/gsn_restart</span><br><span style="color: hsl(0, 100%, 40%);">- fi</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \</span><br><span style="color: hsl(0, 100%, 40%);">- $DAEMON_ARGS \</span><br><span style="color: hsl(0, 100%, 40%);">- || return 2</span><br><span style="color: hsl(0, 100%, 40%);">- # Add code here, if necessary, that waits for the process to be ready</span><br><span style="color: hsl(0, 100%, 40%);">- # to handle requests from services started subsequently which depend</span><br><span style="color: hsl(0, 100%, 40%);">- # on this one. As a last resort, sleep for some time.</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%);">-#</span><br><span style="color: hsl(0, 100%, 40%);">-# Function that stops the daemon/service</span><br><span style="color: hsl(0, 100%, 40%);">-#</span><br><span style="color: hsl(0, 100%, 40%);">-do_stop()</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- # Return</span><br><span style="color: hsl(0, 100%, 40%);">- # 0 if daemon has been stopped</span><br><span style="color: hsl(0, 100%, 40%);">- # 1 if daemon was already stopped</span><br><span style="color: hsl(0, 100%, 40%);">- # 2 if daemon could not be stopped</span><br><span style="color: hsl(0, 100%, 40%);">- # other if a failure occurred</span><br><span style="color: hsl(0, 100%, 40%);">- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME</span><br><span style="color: hsl(0, 100%, 40%);">- RETVAL="$?"</span><br><span style="color: hsl(0, 100%, 40%);">- [ "$RETVAL" = 2 ] && return 2</span><br><span style="color: hsl(0, 100%, 40%);">- # Wait for children to finish too if this is a daemon that forks</span><br><span style="color: hsl(0, 100%, 40%);">- # and if the daemon is only ever run from this initscript.</span><br><span style="color: hsl(0, 100%, 40%);">- # If the above conditions are not satisfied then add some other code</span><br><span style="color: hsl(0, 100%, 40%);">- # that waits for the process to drop all resources that could be</span><br><span style="color: hsl(0, 100%, 40%);">- # needed by services started subsequently. A last resort is to</span><br><span style="color: hsl(0, 100%, 40%);">- # sleep for some time.</span><br><span style="color: hsl(0, 100%, 40%);">- start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON</span><br><span style="color: hsl(0, 100%, 40%);">- [ "$?" = 2 ] && return 2</span><br><span style="color: hsl(0, 100%, 40%);">- # Many daemons don't delete their pidfiles when they exit.</span><br><span style="color: hsl(0, 100%, 40%);">- rm -f $PIDFILE</span><br><span style="color: hsl(0, 100%, 40%);">- return "$RETVAL"</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%);">-#</span><br><span style="color: hsl(0, 100%, 40%);">-# Function that sends a SIGHUP to the daemon/service</span><br><span style="color: hsl(0, 100%, 40%);">-#</span><br><span style="color: hsl(0, 100%, 40%);">-do_reload() {</span><br><span style="color: hsl(0, 100%, 40%);">- #</span><br><span style="color: hsl(0, 100%, 40%);">- # If the daemon can reload its configuration without</span><br><span style="color: hsl(0, 100%, 40%);">- # restarting (for example, when it is sent a SIGHUP),</span><br><span style="color: hsl(0, 100%, 40%);">- # then implement that here.</span><br><span style="color: hsl(0, 100%, 40%);">- #</span><br><span style="color: hsl(0, 100%, 40%);">- start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME</span><br><span style="color: hsl(0, 100%, 40%);">- return 0</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%);">-case "$1" in</span><br><span style="color: hsl(0, 100%, 40%);">- start)</span><br><span style="color: hsl(0, 100%, 40%);">- #[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"</span><br><span style="color: hsl(0, 100%, 40%);">- do_start</span><br><span style="color: hsl(0, 100%, 40%);">- #case "$?" in</span><br><span style="color: hsl(0, 100%, 40%);">- # 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;</span><br><span style="color: hsl(0, 100%, 40%);">- # 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;</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%);">- stop)</span><br><span style="color: hsl(0, 100%, 40%);">- #[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"</span><br><span style="color: hsl(0, 100%, 40%);">- do_stop</span><br><span style="color: hsl(0, 100%, 40%);">- #case "$?" in</span><br><span style="color: hsl(0, 100%, 40%);">- # 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;</span><br><span style="color: hsl(0, 100%, 40%);">- # 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;</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%);">- status)</span><br><span style="color: hsl(0, 100%, 40%);">- status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?</span><br><span style="color: hsl(0, 100%, 40%);">- ;;</span><br><span style="color: hsl(0, 100%, 40%);">- #reload|force-reload)</span><br><span style="color: hsl(0, 100%, 40%);">- #</span><br><span style="color: hsl(0, 100%, 40%);">- # If do_reload() is not implemented then leave this commented out</span><br><span style="color: hsl(0, 100%, 40%);">- # and leave 'force-reload' as an alias for 'restart'.</span><br><span style="color: hsl(0, 100%, 40%);">- #</span><br><span style="color: hsl(0, 100%, 40%);">- #log_daemon_msg "Reloading $DESC" "$NAME"</span><br><span style="color: hsl(0, 100%, 40%);">- #do_reload</span><br><span style="color: hsl(0, 100%, 40%);">- #log_end_msg $?</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%);">- #</span><br><span style="color: hsl(0, 100%, 40%);">- # If the "reload" option is implemented then remove the</span><br><span style="color: hsl(0, 100%, 40%);">- # 'force-reload' alias</span><br><span style="color: hsl(0, 100%, 40%);">- #</span><br><span style="color: hsl(0, 100%, 40%);">- #log_daemon_msg "Restarting $DESC" "$NAME"</span><br><span style="color: hsl(0, 100%, 40%);">- do_stop</span><br><span style="color: hsl(0, 100%, 40%);">- case "$?" in</span><br><span style="color: hsl(0, 100%, 40%);">- 0|1)</span><br><span style="color: hsl(0, 100%, 40%);">- do_start</span><br><span style="color: hsl(0, 100%, 40%);">- #case "$?" in</span><br><span style="color: hsl(0, 100%, 40%);">- # 0) log_end_msg 0 ;;</span><br><span style="color: hsl(0, 100%, 40%);">- # 1) log_end_msg 1 ;; # Old process is still running</span><br><span style="color: hsl(0, 100%, 40%);">- # *) log_end_msg 1 ;; # Failed to start</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%);">- *)</span><br><span style="color: hsl(0, 100%, 40%);">- # Failed to stop</span><br><span style="color: hsl(0, 100%, 40%);">- #log_end_msg 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%);">- *)</span><br><span style="color: hsl(0, 100%, 40%);">- #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2</span><br><span style="color: hsl(0, 100%, 40%);">- echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2</span><br><span style="color: hsl(0, 100%, 40%);">- exit 3</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%);">-:</span><br><span>diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc</span><br><span>index 49dd1ee..fe0170f 100644</span><br><span>--- a/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc</span><br><span>+++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn.inc</span><br><span>@@ -5,30 +5,24 @@</span><br><span> </span><br><span> DEPENDS = "libosmocore"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-INC_PR="r0.${META_TELEPHONY_OSMO_INC}"</span><br><span style="color: hsl(120, 100%, 40%);">+INC_PR="r1.${META_TELEPHONY_OSMO_INC}"</span><br><span> </span><br><span> PACKAGES =+ " libgtp libgtp-dev libgtp-staticdev osmo-sgsnemu"</span><br><span> RDEPENDS_${PN} += "iptables"</span><br><span> RRECOMMENDS_${PN} += "kernel-module-ipt-masquerade kernel-module-tun"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-inherit autotools update-rc.d pkgconfig systemd</span><br><span style="color: hsl(120, 100%, 40%);">+inherit autotools pkgconfig systemd</span><br><span> </span><br><span> do_install_append() {</span><br><span style="color: hsl(0, 100%, 40%);">- install -d ${D}${sysconfdir}/init.d</span><br><span> install -d ${D}${systemd_system_unitdir}/</span><br><span> install -d ${D}/${sysconfdir}/osmocom/</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- install -m 0776 ${WORKDIR}/osmo-ggsn.init ${D}${sysconfdir}/init.d/osmo-ggsn</span><br><span> install -m 0644 ${S}/contrib/osmo-ggsn.service ${D}${systemd_system_unitdir}/</span><br><span> install -m 0644 ${S}/doc/examples/osmo-ggsn.cfg ${D}${sysconfdir}/osmocom/</span><br><span> }</span><br><span> </span><br><span> SYSTEMD_SERVICE_osmo-ggsn = "osmo-ggsn.service"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-INITSCRIPT_PACKAGES = "osmo-ggsn"</span><br><span style="color: hsl(0, 100%, 40%);">-INITSCRIPT_NAME_osmo-ggsn = "osmo-ggsn"</span><br><span style="color: hsl(0, 100%, 40%);">-INITSCRIPT_PARAMS_osmo-ggsn = "defaults 29 29"</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> CONFFILES_osmo-ggsn = "${sysconfdir}/osmocom/osmo-ggsn.cfg"</span><br><span> </span><br><span> FILES_libgtp = "${libdir}/*${SOLIBS}"</span><br><span>diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb</span><br><span>index a12925d..da46975 100644</span><br><span>--- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb</span><br><span>+++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb</span><br><span>@@ -3,8 +3,7 @@</span><br><span> S = "${WORKDIR}/git"</span><br><span> SRCREV = "${AUTOREV}"</span><br><span> SRC_URI = "git://git.osmocom.org/osmo-ggsn \</span><br><span style="color: hsl(0, 100%, 40%);">- file://osmo-ggsn.init \</span><br><span> file://libgtp-queue_depth_32.patch \</span><br><span> "</span><br><span> PV = "1.2.2+gitr${SRCPV}"</span><br><span style="color: hsl(0, 100%, 40%);">-PR = "${INC_PR}.0"</span><br><span style="color: hsl(120, 100%, 40%);">+PR = "${INC_PR}.1"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10951">change 10951</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/10951"/><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: I303ea210e14e0e6e9a18b1bb4c25d470924d80c6 </div>
<div style="display:none"> Gerrit-Change-Number: 10951 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>