[oe-commits] org.oe.dev merge of '9c8c9d1da282e7fa893b34c07ed5b5c73e0b1013'

cbrake commit openembedded-commits at lists.openembedded.org
Thu Aug 9 19:33:11 UTC 2007


merge of '9c8c9d1da282e7fa893b34c07ed5b5c73e0b1013'
     and 'a6f65a6f4f01acf2276466a1453ccd50184de22d'

Author: cbrake at openembedded.org
Branch: org.openembedded.dev
Revision: b69abe9c0e09f6f0d9ec145cc2d3a5edabb6fbf0
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b69abe9c0e09f6f0d9ec145cc2d3a5edabb6fbf0
Files:
1
conf/machine/compulab-pxa270.conf
packages/exmap-console/exmap-console_0.4.bb
packages/asterisk/asterisk-1.4.7
packages/cacao
packages/cacao/files
packages/midpath
packages/asterisk/asterisk-1.4.7/Makefile.patch
packages/asterisk/asterisk-1.4.7/init
packages/asterisk/asterisk-1.4.7/logrotate
packages/asterisk/asterisk-1.4.7/sounds.xml.patch
packages/asterisk/asterisk-1.4.7/volatiles
packages/asterisk/asterisk_1.4.7.bb
packages/cacao/cacao-cldc_0.98.bb
packages/cacao/cacao.inc
packages/cacao/cacaoh-cldc-native_0.98.bb
packages/cacao/files/arm_mmap.patch
packages/cacao/files/classpath_var.patch
packages/cacao/files/libmath.patch
packages/cacao/files/midpath.patch
packages/cacao/files/offset.h_arm.patch
packages/cacao/files/offsets_make.patch
packages/exmap-console/exmap-console_0.4.1.bb
packages/midpath/midpath-alsa_svn.bb
packages/midpath/midpath-cldc-x11_svn.bb
packages/midpath/midpath-gtk_svn.bb
packages/midpath/midpath-native_svn.bb
packages/midpath/midpath-qt3x11_svn.bb
packages/midpath/midpath-qte_svn.bb
packages/midpath/midpath_svn.bb
classes/base.bbclass
classes/gtk-icon-cache.bbclass
conf/bitbake.conf
packages/autoconf/autoconf-native_2.61.bb
packages/autoconf/autoconf_2.61.bb
packages/exmap-console/exmap-console.inc
packages/exmap-console/exmap-console_svn.bb
packages/fluxbox/fluxbox_0.99+1.0rc.bb
packages/fluxbox/fluxbox_svn.bb
packages/lsof/lsof_4.78.bb
packages/openmoko2/neod_svn.bb
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2.bb
packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb
packages/opie-help-en/opie-help-en_cvs.bb
packages/opie-i18n/opie-i18n_cvs.bb
packages/opie-i18n/opie-lrelease-native_cvs.bb
packages/opie-i18n/opie-lupdate-native_cvs.bb
packages/opie-keytabs/opie-keytabs_cvs.bb
packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb
packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb
packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb
packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb
packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
packages/opie-pics/opie-pics_cvs.bb
packages/opie-sh-snes/opie-sh-snes_cvs.bb
packages/opie-sounds/opie-sounds_cvs.bb
packages/tasks/task-boot.bb
Diffs:

#
# mt diff -r9c8c9d1da282e7fa893b34c07ed5b5c73e0b1013 -rb69abe9c0e09f6f0d9ec145cc2d3a5edabb6fbf0
#
# 
# 
# patch "conf/machine/compulab-pxa270.conf"
#  from [d9dda180b32b678bbc7dc3203f202d0227bd7798]
#    to [d1c4d22022e1eaefa1637b8babd925a8cb738cde]
# 
============================================================
--- conf/machine/compulab-pxa270.conf	d9dda180b32b678bbc7dc3203f202d0227bd7798
+++ conf/machine/compulab-pxa270.conf	d1c4d22022e1eaefa1637b8babd925a8cb738cde
@@ -1,9 +1,9 @@ TARGET_ARCH = "arm"
 #@TYPE: Machine
 #@Name: Compulab PXA270 system
 #@DESCRIPTION: Machine configuration for Compulab PXA270 system
 #OLDEST_KERNEL = "2.6.16"
 TARGET_ARCH = "arm"
-PREFERRED_VERSION_compulab-pxa270 = "2.6.16"
+PREFERRED_VERSION_compulab-pxa270 = "2.6.22"
 GUI_MACHINE_CLASS ?= "bigscreen"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"


#
# mt diff -ra6f65a6f4f01acf2276466a1453ccd50184de22d -rb69abe9c0e09f6f0d9ec145cc2d3a5edabb6fbf0
#
# 
# 
# delete "packages/exmap-console/exmap-console_0.4.bb"
# 
# add_dir "packages/asterisk/asterisk-1.4.7"
# 
# add_dir "packages/cacao"
# 
# add_dir "packages/cacao/files"
# 
# add_dir "packages/midpath"
# 
# add_file "packages/asterisk/asterisk-1.4.7/Makefile.patch"
#  content [27eb251099e58f059255d07054eaad58d78587b9]
# 
# add_file "packages/asterisk/asterisk-1.4.7/init"
#  content [ab9f4c6af832cc4a94d2a5e256988be381675969]
# 
# add_file "packages/asterisk/asterisk-1.4.7/logrotate"
#  content [d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f]
# 
# add_file "packages/asterisk/asterisk-1.4.7/sounds.xml.patch"
#  content [17999e17bf9a130a9e6e8a7a687092b2231d86c7]
# 
# add_file "packages/asterisk/asterisk-1.4.7/volatiles"
#  content [66814aff0fd07e02c83bf90010a95c0845067557]
# 
# add_file "packages/asterisk/asterisk_1.4.7.bb"
#  content [36d84a0fd7f485ff0d23cfde00b1419c931a5d1a]
# 
# add_file "packages/cacao/cacao-cldc_0.98.bb"
#  content [638b504328b4b00e7847c72728b8fd48190cd126]
# 
# add_file "packages/cacao/cacao.inc"
#  content [850a3631e55de6c25da31b955be07c7b8c2a42e3]
# 
# add_file "packages/cacao/cacaoh-cldc-native_0.98.bb"
#  content [80dbefd60462f32de95373690a2c248477fe9183]
# 
# add_file "packages/cacao/files/arm_mmap.patch"
#  content [45dbc46941b95102aa800f44e7356566d102196c]
# 
# add_file "packages/cacao/files/classpath_var.patch"
#  content [c04e83ae51270d3ebec918b295178a033c94e4be]
# 
# add_file "packages/cacao/files/libmath.patch"
#  content [1d4cb756e5ac08cb73324e178057ad65823a9f0b]
# 
# add_file "packages/cacao/files/midpath.patch"
#  content [39901dc0bb8c438d3b35d8dd264a4a45f4f5e75e]
# 
# add_file "packages/cacao/files/offset.h_arm.patch"
#  content [c08ba4ebdc4862d862425c5621819991c19fcd8e]
# 
# add_file "packages/cacao/files/offsets_make.patch"
#  content [ef9ca31e88c88aae677d9160a0019830f3aa4b19]
# 
# add_file "packages/exmap-console/exmap-console_0.4.1.bb"
#  content [fcf738744d19e6d33be29ce3ffffb13dcd080b4a]
# 
# add_file "packages/midpath/midpath-alsa_svn.bb"
#  content [fb00f08dd7e21b0915d61bc4f5da08d449c042dd]
# 
# add_file "packages/midpath/midpath-cldc-x11_svn.bb"
#  content [4508d47ae521121138c38ca1c627bbe1b03a38b0]
# 
# add_file "packages/midpath/midpath-gtk_svn.bb"
#  content [8b8dbd9444e83c2f45d5646af02cfd5654a87113]
# 
# add_file "packages/midpath/midpath-native_svn.bb"
#  content [d5f1cdf7fe2c541f753f4b5bd7a09e6524916905]
# 
# add_file "packages/midpath/midpath-qt3x11_svn.bb"
#  content [ae69b147de0f7b04618b3b2d35131bc7ce9c9adc]
# 
# add_file "packages/midpath/midpath-qte_svn.bb"
#  content [3712d85d8c5ae1385fb2ed8a6b0631a4fbac2839]
# 
# add_file "packages/midpath/midpath_svn.bb"
#  content [746724449d034c259adac0c1deb3a12a0c152ea9]
# 
# patch "classes/base.bbclass"
#  from [814ca4a03b3d5ea4596ae040b150a92ea3076a42]
#    to [1fa503b3ccef56a6f8b086ebe3645e7d155c31d3]
# 
# patch "classes/gtk-icon-cache.bbclass"
#  from [2c00130ba17205e8f5cc856de7067a2448120604]
#    to [75b805566ae03614fdfdd691b5b9542ed54bf96c]
# 
# patch "conf/bitbake.conf"
#  from [d7da259bfd8ea8f8052f4258ba7b9c6e58a864ef]
#    to [913268fdd4af9c8f090f039d3c1dfe172bb3b59f]
# 
# patch "packages/autoconf/autoconf-native_2.61.bb"
#  from [d2d5ff88d7322226f5bcfa5b3c4f3044d6b4b993]
#    to [5b5e460d1ae2d2c23c9ee23969e82124c681c4c0]
# 
# patch "packages/autoconf/autoconf_2.61.bb"
#  from [2649340a39fc22ba02826daeab7d0a79afaad42e]
#    to [c54a5aee52046432870f167d5f80009f6bf44115]
# 
# patch "packages/exmap-console/exmap-console.inc"
#  from [a823d75578539d9482a2b8059eeffb92c9ad576a]
#    to [63d7774ca1ed640b50ead734368313117dad3a6c]
# 
# patch "packages/exmap-console/exmap-console_svn.bb"
#  from [692eef7c990b82df32abcf1541536e75d0e09f8a]
#    to [9e500fd9df5191ba71310c281219b5b3dd9ab532]
# 
# patch "packages/fluxbox/fluxbox_0.99+1.0rc.bb"
#  from [1bf3de6d5d4616f42d88d761121233bddcb8fc8e]
#    to [d176450b6c987ffa0fd0a593403eaa78b75a1a29]
# 
# patch "packages/fluxbox/fluxbox_svn.bb"
#  from [766f47e85737e1e906366b19cd83e449f9d3ea90]
#    to [ee989d5e2090dd853128c293ca78ed2787b0bbf8]
# 
# patch "packages/lsof/lsof_4.78.bb"
#  from [640af5049a67188f7b6dc3cf7e6d8f5278cbf90c]
#    to [55bdf5b9a09628e6fdbbe964be08106dd3ce06d6]
# 
# patch "packages/openmoko2/neod_svn.bb"
#  from [61a99e0c0ac9b7759063f228df9d061a46cf36a1]
#    to [1a65c15befb7c079bbe46943fda29a440e45ab5c]
# 
# patch "packages/openmoko2/openmoko-session2/etc/matchbox/session"
#  from [e398e656f610ac2f0f3a133d0382426f823245ab]
#    to [917f5caeabbd29912246a902cb4d3458f7febf57]
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [547b4c85468fe2a49b7ccf02bcd3340678ff487b]
#    to [172c156032ce87fb7210144f8b5f5a05cd2ec05c]
# 
# patch "packages/opie-bluetoothapplet/opie-bluetoothapplet_cvs.bb"
#  from [443275132f3add35d98b435b96f7cc6865c2210c]
#    to [9e69c08c4d3dafe0040fce4094a659f68c3c46ce]
# 
# patch "packages/opie-help-en/opie-help-en_cvs.bb"
#  from [49f33e4023a62a38ae6175f0eba501418bcbd057]
#    to [f0ad04f83f412c4a232b14c8d422ee7b963f4463]
# 
# patch "packages/opie-i18n/opie-i18n_cvs.bb"
#  from [5d2dcf5fdaa6c2eee13607b35e13b3111d11c82c]
#    to [6deb4ccefc6131fda59eef77b5c3b6a241f7fe2d]
# 
# patch "packages/opie-i18n/opie-lrelease-native_cvs.bb"
#  from [dc3436f6bd47bf8a836210a5897b5ee5eeac5ee3]
#    to [0bf1bcebc65add2b13e7b34eae92a0b4c2ed7752]
# 
# patch "packages/opie-i18n/opie-lupdate-native_cvs.bb"
#  from [30cd7309dbd1555fcbec63ea09a684e4d1fa86d5]
#    to [3c8da7d9333adb48b7c6d9048844b24d0ba09d85]
# 
# patch "packages/opie-keytabs/opie-keytabs_cvs.bb"
#  from [5098bbcde31922f94115bc5e249247b8f41fe414]
#    to [72e34191406b160822f7713cf647c844e1dd6fa9]
# 
# patch "packages/opie-mediaplayer2/opie-mediaplayer2-skin-default-landscape_cvs.bb"
#  from [a5b08a44997523011c8e46d16d5c1c8152219b7c]
#    to [17aa968f91654df545f3a3f79433d2f1be6a72a9]
# 
# patch "packages/opie-mediaplayer2/opie-mediaplayer2-skin-default_cvs.bb"
#  from [bedc03d4f2f3e13ef17f60eaf67cfe0a25ec9a4a]
#    to [ccdb830a96c0319a5a775db3563d977e2703c028]
# 
# patch "packages/opie-mediaplayer2/opie-mediaplayer2-skin-pod_cvs.bb"
#  from [592afc461fc6a36c698616ead6abe1c795ec88f7]
#    to [95fe65e7e313bf13c10bf6b214f3640ba27fcd72]
# 
# patch "packages/opie-mediaplayer2/opie-mediaplayer2-skin-techno_cvs.bb"
#  from [aaed0cb19a1e4e394a615c906fdf3cbb89323432]
#    to [807978276bfd1a9e0ab9531fc8cc594d1c6869f8]
# 
# patch "packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb"
#  from [d78bca8ee68f7c5093c2f48be7983f9f79563ecd]
#    to [142cde2ab17630ad483b7559f5ddedb48b77efd0]
# 
# patch "packages/opie-pics/opie-pics_cvs.bb"
#  from [86e5165575f82db88046b8b58180c83268743c14]
#    to [532fe14bcff3cba7f28dcc599b5f2c9de3b367c3]
# 
# patch "packages/opie-sh-snes/opie-sh-snes_cvs.bb"
#  from [1f37baf6478ea90cf33f0feaf8ccd39c286687dc]
#    to [0a9b10460931529f3ac73846d1703550ca5f2aa1]
# 
# patch "packages/opie-sounds/opie-sounds_cvs.bb"
#  from [0b1d7e78e4d569491aac3c1d35c7cddf4510e636]
#    to [efdf32fa57705cdea7cf2deeb876d71cb2fd808f]
# 
# patch "packages/tasks/task-boot.bb"
#  from [f0102706fa429388765dd03fb5cbad2d98527a2f]
#    to [0a607d5e5b7ae509d565fbbb3b925a3b21b28292]
# 
============================================================
--- packages/asterisk/asterisk-1.4.7/Makefile.patch	27eb251099e58f059255d07054eaad58d78587b9
+++ packages/asterisk/asterisk-1.4.7/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.7/init	ab9f4c6af832cc4a94d2a5e256988be381675969
+++ packages/asterisk/asterisk-1.4.7/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.7/logrotate	d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f
+++ packages/asterisk/asterisk-1.4.7/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.7/sounds.xml.patch	17999e17bf9a130a9e6e8a7a687092b2231d86c7
+++ packages/asterisk/asterisk-1.4.7/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.7/volatiles	66814aff0fd07e02c83bf90010a95c0845067557
+++ packages/asterisk/asterisk-1.4.7/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.7.bb	36d84a0fd7f485ff0d23cfde00b1419c931a5d1a
+++ packages/asterisk/asterisk_1.4.7.bb	36d84a0fd7f485ff0d23cfde00b1419c931a5d1a
@@ -0,0 +1,142 @@
+DESCRIPTION = "The Asterisk open source software PBX"
+HOMEPAGE = "http://www.asterisk.org"
+SECTION = "voip"
+LICENSE = "GPLv2"
+PRIORITY = "optional"
+DEPENDS = "ncurses readline zlib openssl curl popt gnutls sqlite libogg libvorbis"
+RRECOMMENDS_${PN} = "logrotate"
+
+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"
+
+
+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}\
+			--without-curses\
+			--with-ncurses=${STAGING_DIR}/${HOST_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}"
+
+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_install_append() {
+	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/*"
+
+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_${%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list