merge of '8dccbf106093aaa7b62b2a96962945185534c923'

     and 'c50825ba187c292f591cf43c91216cebffb5e290'

11 files changed, 30 insertions, 54 deletions

diff --git a/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb b/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.8.bb
index f1b3d12cd7..f1b3d12cd7 100644
--- a/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.8.bb
diff --git a/packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb b/packages/asterisk/asterisk-core-sounds-en-g729_1.4.8.bb
index 205c8ff067..205c8ff067 100644
--- a/packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-g729_1.4.8.bb
diff --git a/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb b/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.8.bb
index 2a46c74f84..2a46c74f84 100644
--- a/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.8.bb
diff --git a/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb b/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.8.bb
index c29ae60f99..c29ae60f99 100644
--- a/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.8.bb
diff --git a/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb b/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb
index f18d46258f..2bea38c99b 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb
@@ -10,8 +10,6 @@ SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extr
 do_install() {
 	install -d ${D}${localstatedir}/lib/asterisk/sounds
 	# HACK: moving the files in chunkes (too many of them)
-	rm ${WORKDIR}/conf-thereare.alaw
-	rm ${WORKDIR}/invalid.alaw
 	mv ${WORKDIR}/[a-d]*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
 	mv ${WORKDIR}/[e-l]*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
 	mv ${WORKDIR}/*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
@@ -21,10 +19,6 @@ do_install() {
 	#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
 	mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
 
-	#install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
-	#install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
-	mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
-
 	#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
 	#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
 	mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
diff --git a/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb b/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb
index 48fabbbdc4..0656ff1a95 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb
@@ -10,8 +10,6 @@ SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extr
 do_install() {
 	install -d ${D}${localstatedir}/lib/asterisk/sounds
 	# HACK: moving the files in chunks (too many files)
-	rm ${WORKDIR}/conf-thereare.g729
-	rm ${WORKDIR}/invalid.g729
 	mv ${WORKDIR}/[a-d]*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
 	mv ${WORKDIR}/[e-l]*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
 	mv ${WORKDIR}/*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
@@ -21,10 +19,6 @@ do_install() {
 	#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
 	mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
 
-	#install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
-	#install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
-	mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
-
 	#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
 	#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
 	mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
diff --git a/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb b/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb
index da463391b1..2d74d27996 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb
@@ -10,8 +10,6 @@ SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extr
 do_install() {
 	install -d ${D}${localstatedir}/lib/asterisk/sounds
 	# HACK: moving the files in chunks (too many files)
-	rm ${WORKDIR}/conf-thereare.gsm
-	rm ${WORKDIR}/invalid.gsm
 	mv ${WORKDIR}/[a-d]*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
 	mv ${WORKDIR}/[e-l]*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
 	mv ${WORKDIR}/*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
@@ -21,10 +19,6 @@ do_install() {
 	#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
 	mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
 
-	#install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
-	#install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
-	mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
-
 	#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
 	#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
 	mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
diff --git a/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb b/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb
index 6a6f3f5fba..6d35c65177 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb
@@ -10,8 +10,6 @@ SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extr
 do_install() {
 	install -d ${D}${localstatedir}/lib/asterisk/sounds
 	# HACK: moving the files in chunkes (too many of them)
-	rm ${WORKDIR}/conf-thereare.ulaw
-	rm ${WORKDIR}/invalid.ulaw
 	mv ${WORKDIR}/[a-d]*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
 	mv ${WORKDIR}/[e-l]*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
 	mv ${WORKDIR}/*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
@@ -21,10 +19,6 @@ do_install() {
 	#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
 	mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
 
-	#install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
-	#install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
-	mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
-
 	#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
 	#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
 	mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
diff --git a/packages/asterisk/asterisk_1.4.10.bb b/packages/asterisk/asterisk_1.4.10.bb
index 4110f01930..416495a0b8 100644
--- a/packages/asterisk/asterisk_1.4.10.bb
+++ b/packages/asterisk/asterisk_1.4.10.bb
@@ -30,17 +30,17 @@ INITSCRIPT_PARAMS = "defaults 60"
 
 inherit autotools update-rc.d
 
-EXTRA_OECONF =  "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-z=${STAGING_DIR}/${TARGET_SYS}\
-			--with-curl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-termcap=${STAGING_DIR}/${TARGET_SYS}\
-			--with-ogg=${STAGING_DIR}/${TARGET_SYS}\
-			--with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
-			--with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
-			--with-popt=${STAGING_DIR}/${TARGET_SYS}\
-			--with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF =  "--with-ssl=${STAGING_EXECPREFIXDIR} \
+			--with-z=${STAGING_EXECPREFIXDIR} \
+			--with-curl=${STAGING_EXECPREFIXDIR} \
+			--with-termcap=${STAGING_EXECPREFIXDIR} \
+			--with-ogg=${STAGING_EXECPREFIXDIR} \
+			--with-vorbis=${STAGING_EXECPREFIXDIR} \
+			--with-sqlite=${STAGING_EXECPREFIXDIR} \
+			--with-popt=${STAGING_EXECPREFIXDIR} \
+			--with-gnutls=${STAGING_EXECPREFIXDIR} \
 			--without-curses\
-			--with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+			--with-ncurses=${STAGING_EXECPREFIXDIR} \
 			--without-imap\
 			--without-netsnmp\
 			--without-odbc\
diff --git a/packages/asterisk/asterisk_1.4.11.bb b/packages/asterisk/asterisk_1.4.11.bb
index 0d4f30aef9..2f116864e4 100644
--- a/packages/asterisk/asterisk_1.4.11.bb
+++ b/packages/asterisk/asterisk_1.4.11.bb
@@ -32,17 +32,17 @@ INITSCRIPT_PARAMS = "defaults 60"
 
 inherit autotools update-rc.d
 
-EXTRA_OECONF =  "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-z=${STAGING_DIR}/${TARGET_SYS}\
-			--with-curl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-termcap=${STAGING_DIR}/${TARGET_SYS}\
-			--with-ogg=${STAGING_DIR}/${TARGET_SYS}\
-			--with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
-			--with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
-			--with-popt=${STAGING_DIR}/${TARGET_SYS}\
-			--with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF =  "--with-ssl=${STAGING_EXECPREFIXDIR}\
+			--with-z=${STAGING_EXECPREFIXDIR}\
+			--with-curl=${STAGING_EXECPREFIXDIR}\
+			--with-termcap=${STAGING_EXECPREFIXDIR}\
+			--with-ogg=${STAGING_EXECPREFIXDIR}\
+			--with-vorbis=${STAGING_EXECPREFIXDIR}\
+			--with-sqlite=${STAGING_EXECPREFIXDIR}\
+			--with-popt=${STAGING_EXECPREFIXDIR}\
+			--with-gnutls=${STAGING_EXECPREFIXDIR}\
 			--without-curses\
-			--with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+			--with-ncurses=${STAGING_EXECPREFIXDIR}\
 			--without-imap\
 			--without-netsnmp\
 			--without-odbc\
diff --git a/packages/asterisk/asterisk_1.4.17.bb b/packages/asterisk/asterisk_1.4.17.bb
index 0ea808af7f..46bc90b25f 100644
--- a/packages/asterisk/asterisk_1.4.17.bb
+++ b/packages/asterisk/asterisk_1.4.17.bb
@@ -31,17 +31,17 @@ INITSCRIPT_PARAMS = "defaults 60"
 
 inherit autotools update-rc.d
 
-EXTRA_OECONF =  "--with-ssl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-z=${STAGING_DIR}/${TARGET_SYS}\
-			--with-curl=${STAGING_DIR}/${TARGET_SYS}\
-			--with-termcap=${STAGING_DIR}/${TARGET_SYS}\
-			--with-ogg=${STAGING_DIR}/${TARGET_SYS}\
-			--with-vorbis=${STAGING_DIR}/${TARGET_SYS}\
-			--with-sqlite=${STAGING_DIR}/${TARGET_SYS}\
-			--with-popt=${STAGING_DIR}/${TARGET_SYS}\
-			--with-gnutls=${STAGING_DIR}/${TARGET_SYS}\
+EXTRA_OECONF =  "--with-ssl=${STAGING_EXECPREFIXDIR} \
+			--with-z=${STAGING_EXECPREFIXDIR} \
+			--with-curl=${STAGING_EXECPREFIXDIR} \
+			--with-termcap=${STAGING_EXECPREFIXDIR} \
+			--with-ogg=${STAGING_EXECPREFIXDIR} \
+			--with-vorbis=${STAGING_EXECPREFIXDIR} \
+			--with-sqlite=${STAGING_EXECPREFIXDIR} \
+			--with-popt=${STAGING_EXECPREFIXDIR} \
+			--with-gnutls=${STAGING_EXECPREFIXDIR} \
 			--without-curses\
-			--with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
+			--with-ncurses=${STAGING_EXECPREFIXDIR} \
 			--without-imap\
 			--without-netsnmp\
 			--without-odbc\