Merge commit '33fe48f3b792563ad99d575750e36dffc9ac808a' into edison
This commit is contained in:
commit
a6f1cb82a7
|
@ -0,0 +1,37 @@
|
|||
#! /bin/sh
|
||||
#
|
||||
# cell-log This shell script starts and stops cell-log.
|
||||
#
|
||||
# chkconfig: 345 90 40
|
||||
# description: Cell-log monitors cell in the neighborhood.
|
||||
# processname: cell_log
|
||||
|
||||
PATH=/bin:/usr/bin:/sbin:/usr/sbin
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
echo -n "Starting cell-log: "
|
||||
start-stop-daemon -S -b -x /etc/gsmd-respawn.sh /usr/bin/cell_log
|
||||
|
||||
if [ $? = 0 ]; then
|
||||
echo "cell-log"
|
||||
else
|
||||
echo "(failed.)"
|
||||
fi
|
||||
;;
|
||||
stop)
|
||||
echo -n "Stopping GSM daemon: "
|
||||
start-stop-daemon -K -x /usr/bin/cell_log
|
||||
echo "cell-log."
|
||||
;;
|
||||
restart|force-reload)
|
||||
$0 stop
|
||||
$0 start
|
||||
;;
|
||||
*)
|
||||
echo "Usage: /etc/init.d/cell-log {start|stop|restart|force-reload}"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
|
@ -19,7 +19,7 @@ case "$1" in
|
|||
[ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 )
|
||||
|
||||
echo -n "Starting GSM daemon: "
|
||||
start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS -d -l syslog
|
||||
start-stop-daemon -S -b -x /etc/gsmd-respawn.sh /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS -l syslog
|
||||
|
||||
if [ $? = 0 ]; then
|
||||
echo "gsmd."
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
while true;
|
||||
do
|
||||
echo "Restarting not dealing well with spaces.."
|
||||
(exec $*) || true
|
||||
sleep 10s
|
||||
done
|
||||
|
|
@ -9,11 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
|
|||
# Fork with wavecom support
|
||||
SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \
|
||||
file://gsmd \
|
||||
file://cell-log \
|
||||
file://gsmd-respawn.sh \
|
||||
file://default"
|
||||
SRCREV = "28e25ae42da7d65face9ad2472075f7c4fc87e92"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
PR = "r8"
|
||||
PR = "r11.2"
|
||||
|
||||
inherit autotools pkgconfig update-rc.d
|
||||
|
||||
|
@ -21,17 +23,24 @@ inherit autotools pkgconfig update-rc.d
|
|||
# handle update-rc.d RDEPENDS_${PN} manually, we don't need it on
|
||||
# anything but gsmd
|
||||
|
||||
INITSCRIPT_NAME = "gsmd"
|
||||
INITSCRIPT_PARAMS = "defaults 35"
|
||||
INITSCRIPT_PACKAGES = "${PN} ${PN}-tools-cell-log"
|
||||
INITSCRIPT_NAME_${PN} = "gsmd"
|
||||
INITSCRIPT_PARAMS_${PN} = "defaults 35"
|
||||
|
||||
INITSCRIPT_NAME_${PN}-tools-cell-log = "cell-log"
|
||||
INITSCRIPT_PARAMS_${PN}-tools-cell-log = "defaults 40"
|
||||
|
||||
do_install_append() {
|
||||
install -d ${D}/${sysconfdir}/init.d
|
||||
install -m 0755 ${WORKDIR}/gsmd ${D}/${sysconfdir}/init.d/
|
||||
install -m 0755 ${WORKDIR}/cell-log ${D}/${sysconfdir}/init.d/
|
||||
install -d ${D}/${sysconfdir}/default
|
||||
install ${WORKDIR}/default ${D}/${sysconfdir}/default/gsmd
|
||||
install -m 0755 ${WORKDIR}/gsmd-respawn.sh ${D}/${sysconfdir}/
|
||||
}
|
||||
|
||||
PACKAGES =+ "\
|
||||
${PN}-tools-cell-log \
|
||||
${PN}-tools \
|
||||
${PN}-plugins \
|
||||
${PN}-plugin-machine-generic \
|
||||
|
@ -60,8 +69,10 @@ RDEPENDS_${PN}-plugins = "\
|
|||
"
|
||||
|
||||
RDEPENDS_${PN} += "update-rc.d"
|
||||
RDEPENDS_${PN}-tools-cell-log += "update-rc.d ${PN}"
|
||||
|
||||
FILES_${PN}-dbg += "${libdir}/gsmd/.debug/*"
|
||||
FILES_${PN}-tools-cell-log = "${bindir}/cell_log ${sysconfdir}/cell-log"
|
||||
FILES_${PN}-tools = "${bindir}/*"
|
||||
FILES_${PN}-plugins = ""
|
||||
FILES_${PN}-dev += " ${libdir}/gsmd/*.la "
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
require ${PN}.inc
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
SRCREV = "e5ae7f52175411a498ed30560624d0abed0feed7"
|
||||
SRC_URI = "git://git.osmocom.org/libosmo-abis.git;protocol=git"
|
||||
PR = "${INC_PR}.0"
|
||||
|
||||
# because "${WORKDIR}/git" is not a git repo, it can't figure out the version
|
||||
do_configure_prepend() {
|
||||
echo "${PV}" > ${S}/.tarball-version
|
||||
}
|
|
@ -1,7 +1,7 @@
|
|||
require ${PN}.inc
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
SRCREV = "81cd54a0c36cd9cf2bedd97221658a276aa2d84c"
|
||||
SRCREV = "c5f055f9e5aa58548b484345bd3bdc914e640d6c"
|
||||
SRC_URI = "git://git.osmocom.org/libosmocore.git;protocol=git"
|
||||
PV = "0.4.1+gitr${SRCPV}"
|
||||
PV = "0.5.2+gitr${SRCPV}"
|
||||
PR = "0"
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
require ${PN}.inc
|
||||
|
||||
PV = "0.10.1+gitr${SRCPV}"
|
||||
PV = "0.12.0+gitr${SRCPV}"
|
||||
PR = "${INC_PR}.1"
|
||||
|
||||
SRCREV = "09db1a44bc56e81780954555acfbc1bf2fb7cc81"
|
||||
SRCREV = "019f913ca383bda9256e273c06327041b1761330"
|
||||
SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git"
|
||||
|
||||
S = "${WORKDIR}/git/openbsc"
|
||||
|
|
Loading…
Reference in New Issue