asterisk: make 1.4.10 build on arm and fix packaging

7 files changed, 5 insertions, 2 deletions

diff --git a/packages/asterisk/asterisk-1.4.7/.mtn2git_empty b/packages/asterisk/asterisk-1.4.10/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/asterisk/asterisk-1.4.7/.mtn2git_empty
+++ b/packages/asterisk/asterisk-1.4.10/.mtn2git_empty
diff --git a/packages/asterisk/asterisk-1.4.7/Makefile.patch b/packages/asterisk/asterisk-1.4.10/Makefile.patch
index a6d630949e..a6d630949e 100644
--- a/packages/asterisk/asterisk-1.4.7/Makefile.patch
+++ b/packages/asterisk/asterisk-1.4.10/Makefile.patch
diff --git a/packages/asterisk/asterisk-1.4.7/init b/packages/asterisk/asterisk-1.4.10/init
index f26ad38db3..f26ad38db3 100644
--- a/packages/asterisk/asterisk-1.4.7/init
+++ b/packages/asterisk/asterisk-1.4.10/init
diff --git a/packages/asterisk/asterisk-1.4.7/logrotate b/packages/asterisk/asterisk-1.4.10/logrotate
index dfd25ee55c..dfd25ee55c 100644
--- a/packages/asterisk/asterisk-1.4.7/logrotate
+++ b/packages/asterisk/asterisk-1.4.10/logrotate
diff --git a/packages/asterisk/asterisk-1.4.7/sounds.xml.patch b/packages/asterisk/asterisk-1.4.10/sounds.xml.patch
index b549fea132..b549fea132 100644
--- a/packages/asterisk/asterisk-1.4.7/sounds.xml.patch
+++ b/packages/asterisk/asterisk-1.4.10/sounds.xml.patch
diff --git a/packages/asterisk/asterisk-1.4.7/volatiles b/packages/asterisk/asterisk-1.4.10/volatiles
index c68e786c90..c68e786c90 100644
--- a/packages/asterisk/asterisk-1.4.7/volatiles
+++ b/packages/asterisk/asterisk-1.4.10/volatiles
diff --git a/packages/asterisk/asterisk_1.4.7.bb b/packages/asterisk/asterisk_1.4.10.bb
index 3973ff41dd..e3f7db2f71 100644
--- a/packages/asterisk/asterisk_1.4.7.bb
+++ b/packages/asterisk/asterisk_1.4.10.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.asterisk.org"
 SECTION = "voip"
 LICENSE = "GPLv2"
 PRIORITY = "optional"
-DEPENDS = "ncurses readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
+DEPENDS = "speex ncurses readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
 RRECOMMENDS_${PN} = "logrotate"
 
 DEFAULT_PREFERENCE = "-1"
@@ -47,7 +47,7 @@ EXTRA_OECONF =  "--with-ssl=${STAGING_DIR}/${HOST_SYS}\
 #export NOISY_BUILD=yes
 
 export ASTCFLAGS = "-fsigned-char -I${STAGING_INCDIR} -DPATH_MAX=4096"
-export ASTLDFLAGS="${LDFLAGS}"
+export ASTLDFLAGS="${LDFLAGS} -lpthread -ldl -lresolv "
 
 do_configure_prepend () {
 	sed -i 's:/var:${localstatedir}:' ${WORKDIR}/logrotate
@@ -64,6 +64,7 @@ do_configure () {
 }
 
 do_install_append() {
+        install -d ${D}${sysconfdir}/init.d/
 	install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/asterisk
 	install -c -D -m 644 ${WORKDIR}/logrotate ${D}${sysconfdir}/logrotate.d/asterisk
 	install -c -D -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/asterisk
@@ -76,6 +77,8 @@ pkg_postinst_prepend() {
 }
 
 FILES_${PN} += "${libdir}/asterisk/modules/*"
+FILES_${PN}-dbg += "${libdir}/asterisk/modules/.debug \
+                    ${localstatedir}/lib/asterisk/*/.debug"
 
 CONFFILES_${PN} += "${sysconfdir}/asterisk/adsi.conf"
 CONFFILES_${PN} += "${sysconfdir}/asterisk/adtranvofr.conf"