[oe-commits] org.oe.dev merge of '93ecd3346baebbe99e4a2d92b718f5c6c1b1c887'
crofton commit
openembedded-commits at lists.openembedded.org
Thu Aug 23 16:05:31 UTC 2007
merge of '93ecd3346baebbe99e4a2d92b718f5c6c1b1c887'
and 'ca7f351c2182d8ceaaa964e33c74b9ec90ce64f5'
Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 9b3b2dfff550ab71102166ac73cb9b011707a51f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9b3b2dfff550ab71102166ac73cb9b011707a51f
Files:
1
packages/linux/linux.inc
packages/asterisk/asterisk-1.2.18
packages/asterisk/asterisk-1.2.18/asterisk.patch
packages/asterisk/asterisk-1.2.18/enable-speex.patch
packages/asterisk/asterisk-1.2.18/uclibc-compat-getloadavg.patch
packages/asterisk/asterisk-1.2.18/uclibc-dsn.patch
packages/asterisk/asterisk-1.2.23
packages/asterisk/asterisk-1.2.23/asterisk.patch
packages/asterisk/asterisk-1.2.23/enable-speex.patch
packages/asterisk/asterisk-1.2.23/uclibc-compat-getloadavg.patch
packages/asterisk/asterisk-1.2.23/uclibc-dns.patch
packages/asterisk/asterisk_1.2.18.bb
packages/asterisk/asterisk_1.2.23.bb
packages/asterisk/asterisk-1.4.11
packages/asterisk/asterisk-1.4.11/Makefile.patch
packages/asterisk/asterisk-1.4.11/init
packages/asterisk/asterisk-1.4.11/logrotate
packages/asterisk/asterisk-1.4.11/sounds.xml.patch
packages/asterisk/asterisk-1.4.11/volatiles
packages/asterisk/asterisk_1.4.11.bb
Diffs:
#
# mt diff -r93ecd3346baebbe99e4a2d92b718f5c6c1b1c887 -r9b3b2dfff550ab71102166ac73cb9b011707a51f
#
#
#
# patch "packages/linux/linux.inc"
# from [0fd536ead5a1cb0f8d0786facd63f921b9feaaa7]
# to [dc3b9967453c0f1b6a4df03cd2af7dcb8f517b02]
#
============================================================
--- packages/linux/linux.inc 0fd536ead5a1cb0f8d0786facd63f921b9feaaa7
+++ packages/linux/linux.inc dc3b9967453c0f1b6a4df03cd2af7dcb8f517b02
@@ -8,7 +8,8 @@ DEPENDS_sarge-at91 = "u-boot-mkimage-ope
DEPENDS_atngw100 = "u-boot-mkimage-openmoko-native"
DEPENDS_at91sam9263ek = "u-boot-mkimage-openmoko-native"
DEPENDS_sarge-at91 = "u-boot-mkimage-openmoko-native"
-DEPENDS_gumstix = "u-boot-mkimage-openmoko-native"
+DEPENDS_gumstix-connex = "u-boot-mkimage-openmoko-native"
+DEPENDS_gumstix-verdex = "u-boot-mkimage-openmoko-native"
inherit kernel
#
# mt diff -rca7f351c2182d8ceaaa964e33c74b9ec90ce64f5 -r9b3b2dfff550ab71102166ac73cb9b011707a51f
#
#
#
# delete "packages/asterisk/asterisk-1.2.18"
#
# delete "packages/asterisk/asterisk-1.2.18/asterisk.patch"
#
# delete "packages/asterisk/asterisk-1.2.18/enable-speex.patch"
#
# delete "packages/asterisk/asterisk-1.2.18/uclibc-compat-getloadavg.patch"
#
# delete "packages/asterisk/asterisk-1.2.18/uclibc-dsn.patch"
#
# delete "packages/asterisk/asterisk-1.2.23"
#
# delete "packages/asterisk/asterisk-1.2.23/asterisk.patch"
#
# delete "packages/asterisk/asterisk-1.2.23/enable-speex.patch"
#
# delete "packages/asterisk/asterisk-1.2.23/uclibc-compat-getloadavg.patch"
#
# delete "packages/asterisk/asterisk-1.2.23/uclibc-dns.patch"
#
# delete "packages/asterisk/asterisk_1.2.18.bb"
#
# delete "packages/asterisk/asterisk_1.2.23.bb"
#
# add_dir "packages/asterisk/asterisk-1.4.11"
#
# add_file "packages/asterisk/asterisk-1.4.11/Makefile.patch"
# content [27eb251099e58f059255d07054eaad58d78587b9]
#
# add_file "packages/asterisk/asterisk-1.4.11/init"
# content [ab9f4c6af832cc4a94d2a5e256988be381675969]
#
# add_file "packages/asterisk/asterisk-1.4.11/logrotate"
# content [d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f]
#
# add_file "packages/asterisk/asterisk-1.4.11/sounds.xml.patch"
# content [17999e17bf9a130a9e6e8a7a687092b2231d86c7]
#
# add_file "packages/asterisk/asterisk-1.4.11/volatiles"
# content [66814aff0fd07e02c83bf90010a95c0845067557]
#
# add_file "packages/asterisk/asterisk_1.4.11.bb"
# content [c8d00d57639bbb867b0f3bab8775bb2375e7fd7a]
#
============================================================
--- packages/asterisk/asterisk-1.4.11/Makefile.patch 27eb251099e58f059255d07054eaad58d78587b9
+++ packages/asterisk/asterisk-1.4.11/Makefile.patch 27eb251099e58f059255d07054eaad58d78587b9
@@ -0,0 +1,20 @@
+--- asterisk-1.4.5/Makefile 2007-05-24 15:05:08.000000000 -0400
++++ asterisk-1.4.5/Makefile.new 2007-06-17 05:36:44.000000000 -0400
+@@ -115,7 +115,7 @@ else
+ ASTSBINDIR=$(sbindir)
+ ASTSPOOLDIR=$(localstatedir)/spool/asterisk
+ ASTLOGDIR=$(localstatedir)/log/asterisk
+- ASTVARRUNDIR=$(localstatedir)/run
++ ASTVARRUNDIR=$(localstatedir)/run/asterisk
+ ASTMANDIR=$(mandir)
+ ifeq ($(OSARCH),FreeBSD)
+ ASTVARLIBDIR=$(prefix)/share/asterisk
+@@ -468,7 +468,7 @@ oldmodcheck:
+ echo " WARNING WARNING WARNING" ;\
+ fi
+
+-install: datafiles bininstall $(SUBDIRS_INSTALL)
++install: datafiles bininstall $(SUBDIRS_INSTALL) samples
+ @if [ -x /usr/sbin/asterisk-post-install ]; then \
+ /usr/sbin/asterisk-post-install $(DESTDIR) . ; \
+ fi
============================================================
--- packages/asterisk/asterisk-1.4.11/init ab9f4c6af832cc4a94d2a5e256988be381675969
+++ packages/asterisk/asterisk-1.4.11/init ab9f4c6af832cc4a94d2a5e256988be381675969
@@ -0,0 +1,77 @@
+#! /bin/sh
+#
+# This is an init script for openembedded
+# Copy it to /etc/init.d/openpbx and type
+# > update-rc.d asterisk defaults 60
+#
+asterisk=/usr/sbin/asterisk
+pidfile=/var/run/asterisk/asterisk.pid
+asterisk_args="-npqT -U asterisk -G asterisk"
+
+test -x "$asterisk" || exit 0
+
+case "$1" in
+ start)
+ echo -n "Starting Asterisk"
+ start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping Asterisk"
+ $asterisk -rx "stop gracefully"
+ sleep 4
+ if [ -f $pidfile ]; then
+ start-stop-daemon --stop --quiet --pidfile $pidfile
+ fi
+ echo "."
+ ;;
+ force-stop)
+ echo -n "Stopping Asterisk"
+ $asterisk -rx "stop now"
+ sleep 2
+ if [ -f $pidfile ]; then
+ start-stop-daemon --stop --quiet --pidfile $pidfile
+ fi
+ echo "."
+ ;;
+ restart)
+ echo -n "Restarting Asterisk"
+ if [ -f $pidfile ]; then
+ $asterisk -rx "restart gracefully"
+ sleep 2
+ else
+ start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args
+ fi
+ echo "."
+ ;;
+ force-restart)
+ echo -n "Forcibly Restarting Asterisk"
+ if [ -f $pidfile ]; then
+ $asterisk -rx "restart now"
+ sleep 2
+ else
+ start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args
+ fi
+ echo "."
+ ;;
+ reload)
+ echo -n "Reloading Asterisk Configuration"
+ if [ -f $pidfile ]; then
+ $asterisk -rx "reload"
+ else
+ start-stop-daemon --start --quiet --exec $asterisk -- $asterisk_args
+ fi
+ echo "."
+ ;;
+ logger-reload)
+ if [ -f $pidfile ]; then
+ $asterisk -rx "logger reload"
+ fi
+ ;;
+ *)
+ echo "Usage: /etc/init.d/asterisk {start|stop|force-stop|restart|force-restart|reload|logger-reload}"
+ exit 1
+esac
+
+exit 0
+
============================================================
--- packages/asterisk/asterisk-1.4.11/logrotate d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f
+++ packages/asterisk/asterisk-1.4.11/logrotate d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f
@@ -0,0 +1,12 @@
+/var/log/asterisk/cdr-csv/Master.csv /var/log/asterisk/cdr-custom/Master.csv /var/log/asterisk/queue_log /var/log/asterisk/event_log /var/log/asterisk/messages {
+ daily
+ missingok
+ compress
+ delaycompress
+ rotate 30
+ sharedscripts
+ postrotate
+ /etc/init.d/asterisk logger-reload
+ endscript
+}
+
============================================================
--- packages/asterisk/asterisk-1.4.11/sounds.xml.patch 17999e17bf9a130a9e6e8a7a687092b2231d86c7
+++ packages/asterisk/asterisk-1.4.11/sounds.xml.patch 17999e17bf9a130a9e6e8a7a687092b2231d86c7
@@ -0,0 +1,18 @@
+--- asterisk-1.4.4/sounds/sounds.xml 2007-05-24 17:00:45.000000000 -0400
++++ asterisk-1.4.4/sounds/sounds.xml.new 2007-05-25 13:23:41.000000000 -0400
+@@ -6,7 +6,6 @@
+ <member name="CORE-SOUNDS-EN-ALAW" displayname="English, a-Law format">
+ </member>
+ <member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" >
+- <defaultenabled>yes</defaultenabled>
+ </member>
+ <member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
+ </member>
+@@ -39,7 +38,6 @@
+ </category>
+ <category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
+ <member name="MOH-FREEPLAY-WAV" displayname="FreePlay Music On Hold Files, WAV format" >
+- <defaultenabled>yes</defaultenabled>
+ </member>
+ <member name="MOH-FREEPLAY-ULAW" displayname="FreePlay Music On Hold Files, mu-Law format" >
+ </member>
============================================================
--- packages/asterisk/asterisk-1.4.11/volatiles 66814aff0fd07e02c83bf90010a95c0845067557
+++ packages/asterisk/asterisk-1.4.11/volatiles 66814aff0fd07e02c83bf90010a95c0845067557
@@ -0,0 +1,7 @@
+d asterisk asterisk 0775 /var/run/asterisk none
+d asterisk asterisk 0775 /var/lib/asterisk none
+d asterisk asterisk 0775 /var/log/asterisk none
+d asterisk asterisk 0775 /var/log/asterisk/cdr-csv none
+d asterisk asterisk 0775 /var/log/asterisk/cdr-custom none
+d asterisk asterisk 0775 /var/spool/asterisk/outgoing none
+d asterisk asterisk 0775 /var/spool/asterisk/voicemail none
============================================================
--- packages/asterisk/asterisk_1.4.11.bb c8d00d57639bbb867b0f3bab8775bb2375e7fd7a
+++ packages/asterisk/asterisk_1.4.11.bb c8d00d57639bbb867b0f3bab8775bb2375e7fd7a
@@ -0,0 +1,173 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+DESCRIPTION = "The Asterisk open source software PBX"
+HOMEPAGE = "http://www.asterisk.org"
+SECTION = "voip"
+LICENSE = "GPLv2"
+PRIORITY = "optional"
+SECTION = "console/telephony"
+DEPENDS = "speex readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
+#RRECOMMENDS_${PN} = "logrotate"
+PR = "r0"
+
+#DEFAULT_PREFERENCE = "-1"
+
+SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz\
+ file://sounds.xml.patch;patch=1\
+ file://Makefile.patch;patch=1\
+ file://logrotate \
+ 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}/${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}/${TARGET_SYS}\
+ --without-imap\
+ --without-netsnmp\
+ --without-odbc\
+ --without-osptk\
+ --without-nbs\
+ --without-pwlib\
+ --without-radius\
+ --without-tds\
+ --without-postgres\
+ --without-zaptel\
+ "
+
+#export NOISY_BUILD=yes
+
+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
+ sed -i 's:/etc/init.d:${sysconfdir}/init.d:' ${WORKDIR}/logrotate
+ sed -i 's:/var:${localstatedir}:' ${WORKDIR}/volatiles
+}
+
+do_configure () {
+ # Looks like rebuilding configure doesn't work, so we are skipping
+ # that and are just using the shipped one
+ gnu-configize
+ libtoolize --force
+ 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
+ install -c -D -m 644 ${WORKDIR}/logrotate ${D}${sysconfdir}/logrotate.d/asterisk
+ install -c -D -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/asterisk
+}
+
+pkg_postinst_prepend() {
+ grep -q asterisk ${sysconfdir}/group || addgroup --system asterisk
+ grep -q asterisk ${sysconfdir}/passwd || adduser --system --home ${localstatedir}/run/asterisk --no-create-home --disabled-password --ingroup asterisk -s ${base_bindir}/false asterisk
+ chown -R asterisk:asterisk ${libdir}/asterisk ${localstatedir}/lib/asterisk ${localstatedir}/spool/asterisk ${localstatedir}/log/asterisk ${localstatedir}/run/asterisk ${sysconfdir}/asterisk
+}
+
+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"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/agents.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/alarmreceiver.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/alsa.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/amd.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/asterisk.adsi"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/asterisk.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_custom.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_manager.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_odbc.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_pgsql.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_tds.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/codecs.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/dnsmgr.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/dundi.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/enum.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/extconfig.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/extensions.ael"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/extensions.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/features.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/festival.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/followme.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/func_odbc.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/gtalk.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/h323.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/http.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/iax.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/iaxprov.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/indications.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/jabber.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/logger.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/manager.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/meetme.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/mgcp.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/misdn.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/modem.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/modules.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/musiconhold.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/muted.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/osp.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/oss.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/phone.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/privacy.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/queues.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/res_odbc.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/res_snmp.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/rpt.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/rtp.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/say.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/sip.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/sip_notify.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/skinny.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/sla.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/smdi.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/telcordia-1.adsi"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/udptl.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/users.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/voicemail.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/vpb.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/zapata.conf"
+CONFFILES_${PN} += "${sysconfdir}/logrotate.d/asterisk"
More information about the Openembedded-commits
mailing list