[oe-commits] org.oe.dev merge of '69101672fb51bbd0ee154a122221e376599481cc'

pfalcon commit openembedded-commits at lists.openembedded.org
Sun Jan 13 11:56:22 UTC 2008


merge of '69101672fb51bbd0ee154a122221e376599481cc'
     and 'bad02fc028d55fbb82c52c9bffe4bbfebf92fb83'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 37c39841f1cbbf2ca651ce71ff495b7bda859ae5
ViewMTN: http://monotone.openembedded.org/revision/info/37c39841f1cbbf2ca651ce71ff495b7bda859ae5
Files:
1
packages/supertux/files/supertux.desktop
packages/supertux/supertux_0.1.3.bb
packages/supertux/files/supertux.png
packages/supertux/supertux_0.1.2.bb
packages/xerces-c/xerces-c_2.6.0.bb
packages/xerces-c/xerces-c_2.7.0.bb
conf/machine/include/tune-strongarm.inc
conf/machine/include/tune-strongarm1100.inc
packages/asterisk/asterisk-1.4.17
packages/asterisk-core-sounds-en-alaw
packages/asterisk-core-sounds-en-g729
packages/asterisk-core-sounds-en-gsm
packages/asterisk-core-sounds-en-ulaw
packages/asterisk-extra-sounds-en-alaw
packages/asterisk-extra-sounds-en-g729
packages/asterisk-extra-sounds-en-gsm
packages/asterisk-extra-sounds-en-ulaw
packages/asterisk-moh-freeplay-alaw
packages/asterisk-moh-freeplay-g729
packages/asterisk-moh-freeplay-gsm
packages/asterisk-moh-freeplay-ulaw
packages/dtnrg
packages/asterisk/asterisk-1.4.17/Makefile.patch
packages/asterisk/asterisk-1.4.17/init
packages/asterisk/asterisk-1.4.17/logrotate
packages/asterisk/asterisk-1.4.17/sounds.xml.patch
packages/asterisk/asterisk-1.4.17/volatiles
packages/asterisk/asterisk_1.4.17.bb
packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb
packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb
packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb
packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb
packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb
packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb
packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb
packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb
packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb
packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb
packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb
packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb
packages/dtnrg/dtn_2.5.0.bb
packages/images/openmoko-python-devel-image.bb
packages/roadmap/files/roadmap_path.patch
packages/tasks/task-openmoko-python-devel.bb
packages/xerces-c/xerces-c_2.8.0.bb
classes/insane.bbclass
conf/machine/collie.conf
conf/machine/h3600.conf
conf/machine/htcwallaby.conf
conf/machine/jornada56x.conf
conf/machine/jornada7xx.conf
conf/machine/shark.conf
conf/machine/simpad.conf
packages/meta/slugos-packages.bb
packages/roadmap/roadmap-gtk2.inc
packages/roadmap/roadmap-gtk2_1.1.0.bb
packages/roadmap/roadmap-gtk2_cvs.bb
packages/roadmap/roadmap.inc
packages/roadmap/zroadmap.inc
packages/roadmap/zroadmap_1.1.0.bb
packages/roadmap/zroadmap_cvs.bb
packages/screen/screen_4.0.2.bb
Diffs:

#
# mt diff -r69101672fb51bbd0ee154a122221e376599481cc -r37c39841f1cbbf2ca651ce71ff495b7bda859ae5
#
# 
# 
# add_file "packages/supertux/files/supertux.desktop"
#  content [ca0d07025948eea625b61a4c138657fd300ff7ac]
# 
# add_file "packages/supertux/supertux_0.1.3.bb"
#  content [3bdf0dcd28c6bdec7e0869499bb81b27bbfb9d35]
# 
# patch "packages/supertux/files/supertux.png"
#  from [daa562a438fed2ba9a887bdc0f6e98b0b024d5e4]
#    to [95e94bf022d8fe098f34b15b577aa8c08b089bc3]
# 
# patch "packages/supertux/supertux_0.1.2.bb"
#  from [09cdf957a3989df2fcb1656badfab95e1da5adb2]
#    to [1cd0b4d5a1abca0a1dcb49ed472396347e0c7529]
# 
============================================================
--- packages/supertux/files/supertux.desktop	ca0d07025948eea625b61a4c138657fd300ff7ac
+++ packages/supertux/files/supertux.desktop	ca0d07025948eea625b61a4c138657fd300ff7ac
@@ -0,0 +1,21 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Encoding=UTF-8
+Name=SuperTux
+Name[en]=SuperTux
+Name[de]=SuperTux
+Name[cs]=SuperTux
+GenericName=A Platform Game
+GenericName[en]=A Platform Game
+GenericName[de]=Ein Jump&Run Spiel
+GenericName[cs]=Plošinová hra
+Comment=A Super Mario inspired penguin platform game
+Comment[en]=A Super Mario inspired penguin platform game
+Comment[de]=Ein von Super Mario inspiriertes Pinguin Jump&Run Spiel
+Comment[cs]=Plošinovka inspirovaná SuperMariem s tučňákem Tuxem v hlavní roli
+Icon=supertux.png
+Exec=supertux
+Terminal=false
+StartupNotify=false
+Categories=Application;Game;ArcadeGame
============================================================
--- packages/supertux/supertux_0.1.3.bb	3bdf0dcd28c6bdec7e0869499bb81b27bbfb9d35
+++ packages/supertux/supertux_0.1.3.bb	3bdf0dcd28c6bdec7e0869499bb81b27bbfb9d35
@@ -0,0 +1,22 @@
+DESCRIPTION = "SuperTux is a classic 2D jump'n'run sidescroller game \
+in a style similar to the original SuperMario games."
+SECTION = "games"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r1"
+
+APPIMAGE = "${WORKDIR}/supertux.png"
+APPDESKTOP = "${WORKDIR}/supertux.desktop"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/super-tux/supertux-${PV}.tar.bz2 \
+#           http://ssel.vub.ac.be/Members/DennisWagelaar/download/zaurus/supertux-0.1.2-fp.patch.gz;patch=1 \
+	   file://supertux.png \
+	   file://supertux.desktop \
+	   "
+
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+EXTRA_OECONF = "--disable-opengl"
+
+inherit autotools sdl
+
+DEFAULT_PREFERENCE = "-1"
============================================================
# packages/supertux/files/supertux.png is binary
============================================================
--- packages/supertux/supertux_0.1.2.bb	09cdf957a3989df2fcb1656badfab95e1da5adb2
+++ packages/supertux/supertux_0.1.2.bb	1cd0b4d5a1abca0a1dcb49ed472396347e0c7529
@@ -1,10 +1,13 @@ LICENSE = "GPL"
 DESCRIPTION = "SuperTux is a classic 2D jump'n'run sidescroller game \
 in a style similar to the original SuperMario games."
 SECTION = "games"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
+APPIMAGE = "${WORKDIR}/supertux.png"
+APPDESKTOP = "${WORKDIR}/supertux.desktop"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/super-tux/supertux-${PV}.tar.bz2 \
            http://ssel.vub.ac.be/Members/DennisWagelaar/download/zaurus/supertux-0.1.2-fp.patch.gz;patch=1 \
 	   file://supertux.png"
@@ -13,5 +16,3 @@ inherit autotools sdl
 EXTRA_OECONF = "--disable-opengl"
 
 inherit autotools sdl
-
-# FIXME: Add .desktop file for Opie/Qtopia


#
# mt diff -rbad02fc028d55fbb82c52c9bffe4bbfebf92fb83 -r37c39841f1cbbf2ca651ce71ff495b7bda859ae5
#
# 
# 
# delete "packages/xerces-c/xerces-c_2.6.0.bb"
# 
# delete "packages/xerces-c/xerces-c_2.7.0.bb"
# 
# rename "conf/machine/include/tune-strongarm.inc"
#     to "conf/machine/include/tune-strongarm1100.inc"
# 
# add_dir "packages/asterisk/asterisk-1.4.17"
# 
# add_dir "packages/asterisk-core-sounds-en-alaw"
# 
# add_dir "packages/asterisk-core-sounds-en-g729"
# 
# add_dir "packages/asterisk-core-sounds-en-gsm"
# 
# add_dir "packages/asterisk-core-sounds-en-ulaw"
# 
# add_dir "packages/asterisk-extra-sounds-en-alaw"
# 
# add_dir "packages/asterisk-extra-sounds-en-g729"
# 
# add_dir "packages/asterisk-extra-sounds-en-gsm"
# 
# add_dir "packages/asterisk-extra-sounds-en-ulaw"
# 
# add_dir "packages/asterisk-moh-freeplay-alaw"
# 
# add_dir "packages/asterisk-moh-freeplay-g729"
# 
# add_dir "packages/asterisk-moh-freeplay-gsm"
# 
# add_dir "packages/asterisk-moh-freeplay-ulaw"
# 
# add_dir "packages/dtnrg"
# 
# add_file "packages/asterisk/asterisk-1.4.17/Makefile.patch"
#  content [27eb251099e58f059255d07054eaad58d78587b9]
# 
# add_file "packages/asterisk/asterisk-1.4.17/init"
#  content [ab9f4c6af832cc4a94d2a5e256988be381675969]
# 
# add_file "packages/asterisk/asterisk-1.4.17/logrotate"
#  content [d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f]
# 
# add_file "packages/asterisk/asterisk-1.4.17/sounds.xml.patch"
#  content [17999e17bf9a130a9e6e8a7a687092b2231d86c7]
# 
# add_file "packages/asterisk/asterisk-1.4.17/volatiles"
#  content [66814aff0fd07e02c83bf90010a95c0845067557]
# 
# add_file "packages/asterisk/asterisk_1.4.17.bb"
#  content [060df18e986c1290e557ca7de184d66634bcb25a]
# 
# add_file "packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb"
#  content [5937b70427319f211e2c6e621c67920a55b30d26]
# 
# add_file "packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb"
#  content [3749a81c19bb6ece50291cfc1e8b8f51c743891d]
# 
# add_file "packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb"
#  content [9ee5cf5d0245b1883eaa997690cc72c7eac1df4c]
# 
# add_file "packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb"
#  content [cb70f337ec851d833b4772bb15bece0fcdd788fd]
# 
# add_file "packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb"
#  content [2cf4bac2b83ff6352cb4315ebe9bcea76fa47ce7]
# 
# add_file "packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb"
#  content [84fc3a38f5414cbd71aabdebd2df8cb422c94290]
# 
# add_file "packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb"
#  content [49e28cdbdf947670361e9bf063c2e5cb74702417]
# 
# add_file "packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb"
#  content [43abb0834bd9e900f53ffd78c329cdc8ba920e57]
# 
# add_file "packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb"
#  content [7c1bf1fa2e9f82ba101416c2950affac0d78270a]
# 
# add_file "packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb"
#  content [f02532baf8649b02c0bea6f21eaef543f76c44cd]
# 
# add_file "packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb"
#  content [98809f216b57bfaf8be2324c05315b99eeb80b24]
# 
# add_file "packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb"
#  content [3b80353861635af18fa9f1b070716a83b7a1c835]
# 
# add_file "packages/dtnrg/dtn_2.5.0.bb"
#  content [987af483064b66222040dae87a47b35f9a675f6f]
# 
# add_file "packages/images/openmoko-python-devel-image.bb"
#  content [314c670f5711b4e925e3261db65ca753dbbd5a78]
# 
# add_file "packages/roadmap/files/roadmap_path.patch"
#  content [a9de0d93760921a56341d70da42a7b27da04fc34]
# 
# add_file "packages/tasks/task-openmoko-python-devel.bb"
#  content [9e274c55cc6f029b3adec34e38bedeacbb8c2ca9]
# 
# add_file "packages/xerces-c/xerces-c_2.8.0.bb"
#  content [1bd7bf05dbfb2569fe7ca72425698a484c6741fa]
# 
# patch "classes/insane.bbclass"
#  from [f17809480bc525b37862480d1e30ae135d59385f]
#    to [00d6311affb65ec365a80a9b833de2945df35660]
# 
# patch "conf/machine/collie.conf"
#  from [8ec2568fe9cb9c9b5580adf5e26eb873400e040c]
#    to [a0553e914a9461a2f8f27c4cf8972dcebb056d0d]
# 
# patch "conf/machine/h3600.conf"
#  from [baccbbb3fd46dea023ff7dc49ac173b169688428]
#    to [946b47e617dd5bb30df3ee547902b05861e89f5b]
# 
# patch "conf/machine/htcwallaby.conf"
#  from [f536aa7626c709ec12492ce50cec7af6c4062a8c]
#    to [d6588b12e47e4671574a6a9f611ca56ed3e54a66]
# 
# patch "conf/machine/include/tune-strongarm1100.inc"
#  from [4bb1dc721e55061bb98b49bae4f57bd4ff088f02]
#    to [6b646008e17bfa06b0b28e48fd811701e7f4ea78]
# 
# patch "conf/machine/jornada56x.conf"
#  from [feef2730324948026b5302d47b01bae79fa6bc39]
#    to [6e67e41a8cb53163822499066dcf76e2ed17c3eb]
# 
# patch "conf/machine/jornada7xx.conf"
#  from [931f12408f78e84eaafc92103fd2590493bcd246]
#    to [b8d6ade022066bbe05995a96ff6dc4c32bb0c5ac]
# 
# patch "conf/machine/shark.conf"
#  from [8a744b9daf9db02c05297d317225e9f6d6cb012e]
#    to [45f471879704cfba13dd30daae06942e7bdd6716]
# 
# patch "conf/machine/simpad.conf"
#  from [9987d298771d159fd85308e85bdb5a82fd16832d]
#    to [b9316853a8b1c9a28a1c4df96b4166a416335cc3]
# 
# patch "packages/meta/slugos-packages.bb"
#  from [58d718f42f82fb421411dd42902041d9826d43d7]
#    to [1a2ceb929514b8bcf127cdcde0a9622c8ac4a28a]
# 
# patch "packages/roadmap/roadmap-gtk2.inc"
#  from [fc58e3e70037346d52758067318eda8023e6b2be]
#    to [2aa378d801945ff02bc3c939ba674715a280b763]
# 
# patch "packages/roadmap/roadmap-gtk2_1.1.0.bb"
#  from [bf65c63e6c550a015ebf7d3afe59f77c139cc5f3]
#    to [28151fbdab1200d9c37c380e25f9bca4cbc1bbaf]
# 
# patch "packages/roadmap/roadmap-gtk2_cvs.bb"
#  from [2790f799a13355e4ee5e15d33a9b0c737fde2269]
#    to [597e6c998d97edcfd8de17534c455b1476978cfa]
# 
# patch "packages/roadmap/roadmap.inc"
#  from [e3d443eff17119798c0c6deda17bf6ff8785c257]
#    to [46055702ecd5e97c7f30231e54b7f3d929ea0fad]
# 
# patch "packages/roadmap/zroadmap.inc"
#  from [6f4897b3cbc5a817995412a0c649a7fffc71554b]
#    to [5c038214b7769f0dee175ca4e846ccd293788c0e]
# 
# patch "packages/roadmap/zroadmap_1.1.0.bb"
#  from [deaa33e33e25e1c9b13a64473c53715a50f05d59]
#    to [b82c031b85848b13832c100afaa5d30d59685dd4]
# 
# patch "packages/roadmap/zroadmap_cvs.bb"
#  from [910020856a214de2ce5b21692e857806378508b4]
#    to [092c0da8140aa7558085ce631475d46da52b946f]
# 
# patch "packages/screen/screen_4.0.2.bb"
#  from [76988964798c087b4ffa5d74a69d3a434763254c]
#    to [21d38aa1d5e0bd6ed228e4441f0855e5755ba3e8]
# 
============================================================
--- packages/asterisk/asterisk-1.4.17/Makefile.patch	27eb251099e58f059255d07054eaad58d78587b9
+++ packages/asterisk/asterisk-1.4.17/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.17/init	ab9f4c6af832cc4a94d2a5e256988be381675969
+++ packages/asterisk/asterisk-1.4.17/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.17/logrotate	d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f
+++ packages/asterisk/asterisk-1.4.17/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.17/sounds.xml.patch	17999e17bf9a130a9e6e8a7a687092b2231d86c7
+++ packages/asterisk/asterisk-1.4.17/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.17/volatiles	66814aff0fd07e02c83bf90010a95c0845067557
+++ packages/asterisk/asterisk-1.4.17/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.17.bb	060df18e986c1290e557ca7de184d66634bcb25a
+++ packages/asterisk/asterisk_1.4.17.bb	060df18e986c1290e557ca7de184d66634bcb25a
@@ -0,0 +1,171 @@
+# 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"
+
+
+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} %s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list