diff --git a/meta-telephony/recipes-isdn/asterisk/asterisk_1.8.8.1.bb b/meta-telephony/recipes-isdn/asterisk/asterisk_1.8.8.1.bb deleted file mode 100644 index 5162853881..0000000000 --- a/meta-telephony/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/meta-telephony/recipes-isdn/asterisk/files/asterisk.init b/meta-telephony/recipes-isdn/asterisk/files/asterisk.init deleted file mode 100755 index 8ef76aa2f6..0000000000 --- a/meta-telephony/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/meta-telephony/recipes-isdn/asterisk/files/modules.conf b/meta-telephony/recipes-isdn/asterisk/files/modules.conf deleted file mode 100644 index 68db67fbd9..0000000000 --- a/meta-telephony/recipes-isdn/asterisk/files/modules.conf +++ /dev/null @@ -1,2 +0,0 @@ -[modules] -autoload=yes diff --git a/meta-telephony/recipes-isdn/asterisk/files/stop-crash.patch b/meta-telephony/recipes-isdn/asterisk/files/stop-crash.patch deleted file mode 100644 index 3fe0d5e4a9..0000000000 --- a/meta-telephony/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/meta-telephony/recipes-isdn/lcr/files/lcr.init b/meta-telephony/recipes-isdn/lcr/files/lcr.init index f9924c5ebc..3bf79809ab 100644 --- a/meta-telephony/recipes-isdn/lcr/files/lcr.init +++ b/meta-telephony/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/meta-telephony/recipes-isdn/lcr/lcr_git.bb b/meta-telephony/recipes-isdn/lcr/lcr_git.bb index a5d71e42fb..d08dbf11a4 100644 --- a/meta-telephony/recipes-isdn/lcr/lcr_git.bb +++ b/meta-telephony/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 +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() { diff --git a/meta-telephony/recipes-misc/ortp/ortp_0.16.5.bb b/meta-telephony/recipes-misc/ortp/ortp_0.16.5.bb index 79996a20ce..919405fdfb 100644 --- a/meta-telephony/recipes-misc/ortp/ortp_0.16.5.bb +++ b/meta-telephony/recipes-misc/ortp/ortp_0.16.5.bb @@ -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 \ diff --git a/meta-telephony/recipes-osmocom/osmo-service-respawn/osmo-service-respawn_1.0.bb b/meta-telephony/recipes-osmocom/osmo-service-respawn/osmo-service-respawn_1.0.bb index 8779f34fd9..52d1031ccc 100644 --- a/meta-telephony/recipes-osmocom/osmo-service-respawn/osmo-service-respawn_1.0.bb +++ b/meta-telephony/recipes-osmocom/osmo-service-respawn/osmo-service-respawn_1.0.bb @@ -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" diff --git a/meta-telephony/recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb b/meta-telephony/recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb index da0e1050b2..a1e9558aa5 100644 --- a/meta-telephony/recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb +++ b/meta-telephony/recipes-osmocom/osmocom-tcpdump/osmocom-tcpdump_1.0.bb @@ -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 \ diff --git a/meta-telephony/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb b/meta-telephony/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb index 6eb5d21b38..41a95b120a 100644 --- a/meta-telephony/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb +++ b/meta-telephony/recipes-osmocom/tasks/task-core-standalone-osmo-sdk-target.bb @@ -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" diff --git a/meta-telephony/recipes-osmocom/tasks/task-osmocom.bb b/meta-telephony/recipes-osmocom/tasks/task-osmocom.bb index eb6216d729..1cec91fe59 100644 --- a/meta-telephony/recipes-osmocom/tasks/task-osmocom.bb +++ b/meta-telephony/recipes-osmocom/tasks/task-osmocom.bb @@ -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" diff --git a/meta-telephony/recipes-telephony/tasks/task-telephony-all.bb b/meta-telephony/recipes-telephony/tasks/task-telephony-all.bb index 1899a9cbcb..284d66904b 100644 --- a/meta-telephony/recipes-telephony/tasks/task-telephony-all.bb +++ b/meta-telephony/recipes-telephony/tasks/task-telephony-all.bb @@ -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 \