aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2014-11-02 11:04:21 +0100
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2014-11-02 11:04:21 +0100
commitb2daa5e888c2b307db4859db19058128fa22f399 (patch)
treee29830381f94fcd36d0891b6b94f03fcb5cd5911
parent563dd4e6e3f8a819d9c275fbbdc129c93a0af1b5 (diff)
asterisk: Drop the very old version from meta-telephony
We used asterisk to be able to speak SIP with the outside. LCR has gained this capability in the past and we haven't used asterisk in more than two years. Asterisk doesn't seem to compile with master/dizzy and there is little point in figuring out why.
-rw-r--r--recipes-isdn/asterisk/asterisk_1.8.8.1.bb89
-rwxr-xr-xrecipes-isdn/asterisk/files/asterisk.init21
-rw-r--r--recipes-isdn/asterisk/files/modules.conf2
-rw-r--r--recipes-isdn/asterisk/files/stop-crash.patch13
-rw-r--r--recipes-isdn/lcr/files/lcr.init2
-rw-r--r--recipes-isdn/lcr/lcr_git.bb11
-rw-r--r--recipes-telephony/tasks/task-telephony-all.bb3
7 files changed, 6 insertions, 135 deletions
diff --git a/recipes-isdn/asterisk/asterisk_1.8.8.1.bb b/recipes-isdn/asterisk/asterisk_1.8.8.1.bb
deleted file mode 100644
index 5162853..0000000
--- a/recipes-isdn/asterisk/asterisk_1.8.8.1.bb
+++ /dev/null
@@ -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
-}
diff --git a/recipes-isdn/asterisk/files/asterisk.init b/recipes-isdn/asterisk/files/asterisk.init
deleted file mode 100755
index 8ef76aa..0000000
--- a/recipes-isdn/asterisk/files/asterisk.init
+++ /dev/null
@@ -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
diff --git a/recipes-isdn/asterisk/files/modules.conf b/recipes-isdn/asterisk/files/modules.conf
deleted file mode 100644
index 68db67f..0000000
--- a/recipes-isdn/asterisk/files/modules.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[modules]
-autoload=yes
diff --git a/recipes-isdn/asterisk/files/stop-crash.patch b/recipes-isdn/asterisk/files/stop-crash.patch
deleted file mode 100644
index 3fe0d5e..0000000
--- a/recipes-isdn/asterisk/files/stop-crash.patch
+++ /dev/null
@@ -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],
diff --git a/recipes-isdn/lcr/files/lcr.init b/recipes-isdn/lcr/files/lcr.init
index f9924c5..3bf7980 100644
--- a/recipes-isdn/lcr/files/lcr.init
+++ b/recipes-isdn/lcr/files/lcr.init
@@ -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"
diff --git a/recipes-isdn/lcr/lcr_git.bb b/recipes-isdn/lcr/lcr_git.bb
index a5d71e4..58ad482 100644
--- a/recipes-isdn/lcr/lcr_git.bb
+++ b/recipes-isdn/lcr/lcr_git.bb
@@ -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
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() {
diff --git a/recipes-telephony/tasks/task-telephony-all.bb b/recipes-telephony/tasks/task-telephony-all.bb
index ebef4fa..284d669 100644
--- a/recipes-telephony/tasks/task-telephony-all.bb
+++ b/recipes-telephony/tasks/task-telephony-all.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
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 \