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