[oe-commits] org.oe.dev merge of '444297a3111a94b97335747038fe18af35d24735'

[crofton commit]

merge of '444297a3111a94b97335747038fe18af35d24735'
     and '54b1077143d5e39c27829e8ac9f7ce627a908844'

Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 2ec5354eb1575edde0d06e9cc4bc6b80a32a2ea3
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2ec5354eb1575edde0d06e9cc4bc6b80a32a2ea3
Files:
1
packages/asterisk/asterisk_1.4.10.bb
classes/insane.bbclass
Diffs:

#
# mt diff -r444297a3111a94b97335747038fe18af35d24735 -r2ec5354eb1575edde0d06e9cc4bc6b80a32a2ea3
#
# 
# 
# patch "packages/asterisk/asterisk_1.4.10.bb"
#  from [f658577b91f45d2c8533a82aa266f793570be87d]
#    to [2d51154605b0ca7b662304502f3cb12e7330014e]
# 
============================================================
--- packages/asterisk/asterisk_1.4.10.bb	f658577b91f45d2c8533a82aa266f793570be87d
+++ packages/asterisk/asterisk_1.4.10.bb	2d51154605b0ca7b662304502f3cb12e7330014e
@@ -1,10 +1,12 @@ PRIORITY = "optional"
 DESCRIPTION = "The Asterisk open source software PBX"
 HOMEPAGE = "http://www.asterisk.org"
 SECTION = "voip"
 LICENSE = "GPLv2"
 PRIORITY = "optional"
-DEPENDS = "speex ncurses readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
+SECTION = "console/telephony"
+DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
 RRECOMMENDS_${PN} = "logrotate"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -15,23 +17,30 @@ SRC_URI="http://ftp.digium.com/pub/aster
 	file://volatiles \
 	file://init"
 
+ARCH_efika="ppc"
+ARCH_dht-walnut="ppc"
+ARCH_magicbox="ppc"
+ARCH_sequoia="ppc"
 
+
+
+
 INITSCRIPT_NAME = "asterisk"
 INITSCRIPT_PARAMS = "defaults 60"
 
 inherit autotools update-rc.d
 
-EXTRA_OECONF =  "--with-ssl=${STAGING_DIR}/${HOST_SYS}\
-			--with-z=${STAGING_DIR}/${HOST_SYS}\
-			--with-curl=${STAGING_DIR}/${HOST_SYS}\
-			--with-termcap=${STAGING_DIR}/${HOST_SYS}\
-			--with-ogg=${STAGING_DIR}/${HOST_SYS}\
-			--with-vorbis=${STAGING_DIR}/${HOST_SYS}\
-			--with-sqlite=${STAGING_DIR}/${HOST_SYS}\
-			--with-popt=${STAGING_DIR}/${HOST_SYS}\
-			--with-gnutls=${STAGING_DIR}/${HOST_SYS}\
+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}\
 			--without-curses\
-			--with-ncurses=${STAGING_DIR}/${HOST_SYS}\
+			--with-ncurses=${STAGING_DIR}/${TARGET_SYS}\
 			--without-imap\
 			--without-netsnmp\
 			--without-odbc\
@@ -48,6 +57,7 @@ export ASTLDFLAGS="${LDFLAGS} -lpthread 
 
 export ASTCFLAGS = "-fsigned-char -I${STAGING_INCDIR} -DPATH_MAX=4096"
 export ASTLDFLAGS="${LDFLAGS} -lpthread -ldl -lresolv "
+export PROC="${ARCH}"
 
 do_configure_prepend () {
 	sed -i 's:/var:${localstatedir}:' ${WORKDIR}/logrotate
@@ -63,6 +73,22 @@ do_configure () {
 	oe_runconf
 }
 
+
+do_compile() {
+        (
+         #make sure that menuselect gets build using host toolchain
+         unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
+         cd menuselect 
+         ./configure
+         oe_runmake
+         cd ../
+        ) || exit 1
+        oe_runmake
+}
+
+
+
+
 do_install_append() {
         install -d ${D}${sysconfdir}/init.d/
 	install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/asterisk
@@ -142,4 +168,4 @@ CONFFILES_${PN} += "${sysconfdir}/asteri
 CONFFILES_${PN} += "${sysconfdir}/asterisk/voicemail.conf"
 CONFFILES_${PN} += "${sysconfdir}/asterisk/vpb.conf"
 CONFFILES_${PN} += "${sysconfdir}/asterisk/zapata.conf"
+CONFFILES_${PN} += "${sysconfdir}/logrotate.d/asterisk"
-


#
# mt diff -r54b1077143d5e39c27829e8ac9f7ce627a908844 -r2ec5354eb1575edde0d06e9cc4bc6b80a32a2ea3
#
# 
# 
# patch "classes/insane.bbclass"
#  from [557b5c25d786d84547e9c219702f18aff3fef499]
#    to [b551af84399a32d80cacf9e2dcb59c334037034a]
# 
============================================================
--- classes/insane.bbclass	557b5c25d786d84547e9c219702f18aff3fef499
+++ classes/insane.bbclass	b551af84399a32d80cacf9e2dcb59c334037034a
@@ -61,7 +61,7 @@ def package_qa_get_machine_dict():
 			"avr32":      (6317,     0,    0,          False,         True),
                       },
             "uclinux-uclibc" : {
-                        "bfin":       (   0,     0,    0,          True,         True),
+                        "bfin":       ( 106,     0,    0,          True,         True),
                       }, 
             "linux-gnueabi" : {
                         "arm" :       (40,     0,    0,          True,          True),
@@ -233,7 +233,7 @@ def package_qa_check_rpath(file,name,d):
             bb.error("QA Issue package %s contains bad RPATH %s in file %s" % (name, line, file))
             #bb.note("Fixing RPATH for you in %s" % file)
             #os.popen("%s -r /lib %s" % (chrpath,file))
-            return False
+            #return False
     return True
 
 def package_qa_check_devdbg(path, name,d):