Merge commit '07c37e9902a278779a0312b4ac2b2437424ec38d' into dora

This commit is contained in:
Holger Hans Peter Freyther 2014-11-09 14:40:36 +01:00
commit 4760757960
12 changed files with 13 additions and 144 deletions

View File

@ -1,89 +0,0 @@
# Copyright (C) 2007-2008, Stelios Koroneos - Digital OPSiS, All Rights Reserved
# Copyright (C) 2011-2012, sysmocom - systems for mobile communications GmbH
# Released under the MIT license (see packages/COPYING)
DESCRITOPN = "asterisk PBX"
DEPENDS = "openssl ncurses"
HOMEPAGE = "http://www.asterisk.org"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=3c6764ffcbe996d1d8f919b393ccdd67"
PR = "r4"
SRC_URI = "http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-${PV}.tar.gz \
file://modules.conf \
file://asterisk.init \
file://stop-crash.patch "
SRC_URI[md5sum] = "783b2da2036745edeea8885c62bbc8bf"
SRC_URI[sha256sum] = "ed98204f6261e1362c673e595823c668ae39b9833daec9127a4936cf9f4890e1"
EXTRA_OECONF = " \
--without-curses \
--with-sm=internal \
--without-gtk \
--without-gtk2 \
--without-isdnnet \
--without-kde \
--without-misdn \
--without-nbs \
--with-ncurses \
--without-netsnmp \
--without-newt \
--without-odbc \
--without-ogg \
--without-osptk \
--without-popt \
--without-pri \
--without-qt \
--without-radius \
--without-sdl \
--without-spandsp \
--without-suppserv \
--without-tds \
--without-termcap \
--without-tinfo \
--without-vorbis \
--without-vpb \
--without-postgres \
--without-openais \
--without-lua \
--disable-xmldoc"
inherit autotools update-rc.d
FILES_${PN}-dbg += "${libdir}/asterisk/modules/.debug"
do_configure_prepend() {
# Due to menuselect below we want to save off these configures
mv ${S}/menuselect/configure ${S}/menuselect/configure.SAVE
mv ${S}/menuselect/mxml/configure ${S}/menuselect/mxml/configure.SAVE
mv ${S}/main/editline/configure ${S}/main/editline/configure.SAVE
}
do_configure_append() {
# Put this back
mv ${S}/menuselect/configure.SAVE ${S}/menuselect/configure
mv ${S}/menuselect/mxml/configure.SAVE ${S}/menuselect/mxml/configure
mv ${S}/main/editline/configure.SAVE ${S}/main/editline/configure
}
INITSCRIPT_PACKAGES = "${PN}"
INITSCRIPT_NAME_${PN} = "asterisk"
INITSCRIPT_PARAMS_${PN} = "defaults 29 29"
PACKAGES =+ "${PN}-moh"
DESCRIPTION_${PN}-moh = "Asterisk MusicOnHold sound"
FILES_${PN}-moh = "${localstatedir}/lib/${PN}/moh"
do_install_append() {
install -d ${D}${sysconfdir}/init.d
install -d ${D}${sysconfdir}/asterisk
install -m 0775 ${WORKDIR}/asterisk.init ${D}${sysconfdir}/init.d/asterisk
install -m 0660 ${WORKDIR}/modules.conf ${D}${sysconfdir}/asterisk/
rm -rf ${D}/var/run
}

View File

@ -1,21 +0,0 @@
#!/bin/sh
NAME=asterisk
set -e
case "$1" in
start)
/usr/sbin/asterisk
echo "Forked asterisk"
;;
stop)
echo "Can not stop it"
;;
*)
N=/etc/init.d/$NAME
echo "Usage: $N {start|stop|restart|force-reload}" >&2
exit 1
esac
exit 0

View File

@ -1,2 +0,0 @@
[modules]
autoload=yes

View File

@ -1,13 +0,0 @@
Index: asterisk-1.8.8.1/res/res_rtp_asterisk.c
===================================================================
--- asterisk-1.8.8.1.orig/res/res_rtp_asterisk.c 2011-09-20 08:56:20.000000000 +0800
+++ asterisk-1.8.8.1/res/res_rtp_asterisk.c 2012-01-16 02:45:57.227713136 +0800
@@ -1902,7 +1902,7 @@
"IAJitter: %u\r\n"
"LastSR: %lu.%010lu\r\n"
"DLSR: %4.4f(sec)\r\n",
- ast_sockaddr_stringify(&addr),
+ "NA" /*ast_sockaddr_stringify(&addr)*/,
pt, (pt == 200) ? "Sender Report" : (pt == 201) ? "Receiver Report" : (pt == 192) ? "H.261 FUR" : "Unknown",
rc,
rtcpheader[i + 1],

View File

@ -7,7 +7,7 @@ set -e
case "$1" in
start)
/usr/sbin/lcr fork
echo "Forked asterisk"
echo "Forked LCR"
;;
stop)
echo "Can not stop it"

View File

@ -1,11 +1,11 @@
DESCRITOPN = "Linux Call Router"
DEPENDS = "asterisk libgsm libopencore-amr sofia-sip"
DEPENDS = "libgsm libopencore-amr sofia-sip"
HOMEPAGE = "http://isdn.eversberg.eu/"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=de9327a12ae1ccc94dade892a360f996"
PV = "1.14+gitr${SRCPV}"
PR = "r3"
PR = "r4"
SRCREV = "38fce218f8897d120aeba56e811ef7dada898c2c"
SRC_URI = "git://git.misdn.eu/lcr.git \
@ -13,13 +13,12 @@ SRC_URI = "git://git.misdn.eu/lcr.git \
file://lcr.init "
S = "${WORKDIR}/git"
EXTRA_OECONF = "--with-gsm-bs --with-asterisk --without-misdn --with-sip"
EXTRA_OECONF = "--with-gsm-bs --without-asterisk --without-misdn --with-sip"
inherit autotools update-rc.d
inherit autotools update-rc.d pkgconfig
PACKAGES =+ "${PN}-tones-de ${PN}-vbox-de \
${PN}-tones-en ${PN}-vbox-en \
${PN}-asterisk-dbg ${PN}-asterisk"
${PN}-tones-en ${PN}-vbox-en"
CONFFILES_${PN} = "${sysconfdir}/lcr/options.conf"
INITSCRIPT_PACKAGES = "${PN}"
@ -30,8 +29,6 @@ FILES_${PN}-tones-de = "/usr/share/lcr/tones_german"
FILES_${PN}-tones-en = "/usr/share/lcr/tones_american"
FILES_${PN}-vbox-de = "/usr/share/lcr/vbox_german"
FILES_${PN}-vbox-en = "/usr/share/lcr/vbox_english"
FILES_${PN}-asterisk = "/usr/lib/asterisk/modules/chan_lcr.so"
FILES_${PN}-asterisk-dbg = "/usr/lib/asterisk/modules/.debug/chan_lcr.so"
do_install_append() {

View File

@ -1,5 +1,5 @@
require ortp.inc
DEPENDS = "glib-2.0 "
DEPENDS = "glib-2.0 openssl"
PR = "${INC_PR}.1"
SRC_URI += "file://0001-fix-unused-variables.patch;patch=1 \

View File

@ -1,7 +1,7 @@
DESCRIPTION = "Shell script to start, nice and respawn services"
HOMEPAGE = "http://openbsc.osmocom.org/"
LICENSE = "AGPLv3+"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
SRC_URI = "file://osmo-service-respawn.sh"

View File

@ -3,7 +3,7 @@ LICENSE = "GPLv3+"
RDEPENDS_${PN} = "tcpdump bash"
PR = "r11"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
SRC_URI = " \
file://osmocom-tcpdump \

View File

@ -4,8 +4,7 @@
DESCRIPTION = "Software Development Kit for Osmocom devices"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PR = "r5"
ALLOW_EMPTY_${PN} = "1"

View File

@ -1,7 +1,6 @@
DESCRIPTION = "Task for Osmocom tools and header files"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
DEPENDS = "virtual/kernel"
ALLOW_EMPTY_${PN} = "1"
PR = "r2"

View File

@ -1,9 +1,9 @@
DESCRIPTION = "Task for the meta-telephony layer. This is to build everything"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
ALLOW_EMPTY_${PN} = "1"
PR = "r2"
PR = "r3"
DEPENDS = "\
libosmo-abis \
@ -16,7 +16,6 @@ DEPENDS = "\
dahdi-linux \
dahdi-tools \
lcr \
asterisk \
libgsm \
ortp \
libdbi \