[oe-commits] org.oe.dev merge of 'c171a0d7bd9dab6cbbf1d894d770fab51475bd07'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sun Jan 13 13:50:13 UTC 2008
merge of 'c171a0d7bd9dab6cbbf1d894d770fab51475bd07'
and 'd6039fc8233d21dd9be5522f8986b26912e70b0e'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: ddf19be04dc093567b9efce1687a5f9127ecc608
ViewMTN: http://monotone.openembedded.org/revision/info/ddf19be04dc093567b9efce1687a5f9127ecc608
Files:
1
packages/u-boot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb
packages/u-boot/files/fix-data-abort-from-sd-ombug799.patch
packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
packages/u-boot/u-boot-openmoko_svn.bb
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/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/imagemagick/imagemagick-native_6.3.5-10.bb
packages/roadmap/files/roadmap_path.patch
packages/supertux/files/supertux.desktop
packages/supertux/supertux_0.1.3.bb
packages/libsdl/libsdl-mixer_1.2.6.bb
packages/linux/linux/simpad/defconfig
packages/linux/linux_2.6.21.bb
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/supertux/files/supertux.png
packages/supertux/supertux_0.1.2.bb
Diffs:
#
# mt diff -rc171a0d7bd9dab6cbbf1d894d770fab51475bd07 -rddf19be04dc093567b9efce1687a5f9127ecc608
#
#
#
# rename "packages/u-boot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb"
# to "packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb"
#
# add_file "packages/u-boot/files/fix-data-abort-from-sd-ombug799.patch"
# content [bd915dc287d002b9db3f2531ecbd27dadbb7d336]
#
# add_file "packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb"
# content [5906c2607fc6aca5a48fa0b21942c425013f9722]
#
# patch "packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb"
# from [0c0171c90503926242288f89cf359ffc1a9f7b2c]
# to [64f842298e8ea505bac76d4278cd6ec3ab3bba9c]
#
# patch "packages/u-boot/u-boot-openmoko_svn.bb"
# from [728dd133bb54e3b77f041e6046fba6405c2a6b2e]
# to [a358024ed5438a158981212e49cdd6e959bb6594]
#
============================================================
--- packages/u-boot/files/fix-data-abort-from-sd-ombug799.patch bd915dc287d002b9db3f2531ecbd27dadbb7d336
+++ packages/u-boot/files/fix-data-abort-from-sd-ombug799.patch bd915dc287d002b9db3f2531ecbd27dadbb7d336
@@ -0,0 +1,11 @@
+--- git.orig/fs/ext2/ext2fs.c 2007-12-13 23:16:13.000000000 -0800
++++ git/fs/ext2/ext2fs.c 2007-12-13 23:16:41.000000000 -0800
+@@ -472,7 +472,7 @@
+ return (0);
+ }
+ if (dirent.namelen != 0) {
+- char filename[dirent.namelen + 1];
++ char filename[256];
+ ext2fs_node_t fdiro;
+ int type = FILETYPE_UNKNOWN;
+
============================================================
--- packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb 5906c2607fc6aca5a48fa0b21942c425013f9722
+++ packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb 5906c2607fc6aca5a48fa0b21942c425013f9722
@@ -0,0 +1,85 @@
+DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support"
+AUTHOR = "Harald Welte <laforge at openmoko.org>, OpenMoko <openmoko-kernel at lists.openmoko.org>"
+LICENSE = "GPL"
+SECTION = "bootloader"
+PRIORITY = "optional"
+
+UBOOT_UPSTREAM_REV = "0ec595243dc99edcd248bbcfbfd5a1dc860bde89"
+UBOOT_OPENMOKO_REV = "3817"
+UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4"
+LOCALVERSION = "+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}"
+PV = "1.3.1${LOCALVERSION}"
+PR = "r1"
+
+PROVIDES = "virtual/bootloader"
+S = "${WORKDIR}/git"
+
+SRC_URI = "\
+ git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV} \
+ svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \
+ file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
+ file://makefile-no-dirafter.patch;patch=1 \
+ file://fix-data-abort-from-sd-ombug799.patch;patch=1 \
+"
+
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
+TARGET_LDFLAGS = ""
+
+do_quilt() {
+ mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
+ rm -Rf patches .pc
+}
+
+do_svnrev() {
+ mv -f tools/setlocalversion tools/setlocalversion.old
+ echo "echo ${LOCALVERSION}" >>tools/setlocalversion
+}
+
+do_configure_prepend() {
+ find . -name "*.mk" -exec sed -i 's,-mabi=apcs-gnu,,' {} \;
+ find . -name "Makefile" -exec sed -i 's,-mabi=apcs-gnu,,' {} \;
+ cat ${WORKDIR}/uboot-eabi-fix-HACK.patch |patch -p1
+}
+
+do_compile () {
+ chmod +x board/neo1973/gta*/split_by_variant.sh
+ for mach in ${UBOOT_MACHINES}
+ do
+ oe_runmake ${mach}_config
+ oe_runmake clean
+ find board -name lowlevel_foo.bin -exec rm '{}' \;
+ oe_runmake all
+ oe_runmake u-boot.udfu
+ if [ -f u-boot.udfu ]; then
+ mv u-boot.udfu u-boot_${mach}.bin
+ else
+ mv u-boot.bin u-boot_${mach}.bin
+ fi
+ if [ -f board/${mach}/lowlevel_foo.bin ]; then
+ mv board/${mach}/lowlevel_foo.bin \
+ lowlevel_foo_${mach}.bin
+ else
+ find board -name lowlevel_foo.bin \
+ -exec mv '{}' lowlevel_foo_${mach}.bin \;
+ fi
+ done
+}
+
+do_deploy () {
+ install -d ${DEPLOY_DIR_IMAGE}
+ for mach in ${UBOOT_MACHINES}
+ do
+ install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin
+ ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin
+ if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then
+ install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin
+ ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin
+ fi
+ done
+ install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage
+}
+
+do_deploy[dirs] = "${S}"
+addtask deploy before do_package after do_install
+addtask quilt before do_patch after do_unpack
+addtask svnrev before do_patch after do_quilt
============================================================
--- packages/u-boot/u-boot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb 0c0171c90503926242288f89cf359ffc1a9f7b2c
+++ packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb 64f842298e8ea505bac76d4278cd6ec3ab3bba9c
@@ -1,5 +1,5 @@ DESCRIPTION = "U-boot bootloader w/ Neo1
DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) support"
-AUTHOR = "Harald Welte <laforge at openmoko.org>"
+AUTHOR = "Harald Welte <laforge at openmoko.org>, OpenMoko <openmoko-kernel at lists.openmoko.org>"
LICENSE = "GPL"
SECTION = "bootloader"
PRIORITY = "optional"
@@ -8,8 +8,9 @@ UBOOT_MACHINES = "gta01bv2 gta01bv3 gta0
UBOOT_OPENMOKO_REV = "2943"
UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4"
-PV = "1.2.0+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}"
-PR = "r1"
+LOCALVERSION = "+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}"
+PV = "1.2.0${LOCALVERSION}"
+PR = "r2"
PROVIDES = "virtual/bootloader"
S = "${WORKDIR}/git"
@@ -32,8 +33,7 @@ do_svnrev() {
do_svnrev() {
mv -f tools/setlocalversion tools/setlocalversion.old
- echo -n "echo " >>tools/setlocalversion
- echo ${PV} >>tools/setlocalversion
+ echo "echo ${LOCALVERSION}" >>tools/setlocalversion
}
do_configure_prepend() {
============================================================
--- packages/u-boot/u-boot-openmoko_svn.bb 728dd133bb54e3b77f041e6046fba6405c2a6b2e
+++ packages/u-boot/u-boot-openmoko_svn.bb a358024ed5438a158981212e49cdd6e959bb6594
@@ -1,4 +1,4 @@
-DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) support"
+DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support"
AUTHOR = "Harald Welte <laforge at openmoko.org>"
LICENSE = "GPL"
SECTION = "bootloader"
@@ -10,7 +10,7 @@ SRCREV_FORMAT = "patches"
SRCREV_FORMAT = "patches"
-UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 smdk2440 hxd8 qt2410 gta02v1 gta02v2 gta02v3 gta02v4"
+UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v1 gta02v2 gta02v3 gta02v4"
DEFAULT_PREFERENCE = "-1"
#
# mt diff -rd6039fc8233d21dd9be5522f8986b26912e70b0e -rddf19be04dc093567b9efce1687a5f9127ecc608
#
#
#
# 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_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/imagemagick/imagemagick-native_6.3.5-10.bb"
# content [12767989ecd51eae729f7a561f0b330a9ac11994]
#
# add_file "packages/roadmap/files/roadmap_path.patch"
# content [a9de0d93760921a56341d70da42a7b27da04fc34]
#
# add_file "packages/supertux/files/supertux.desktop"
# content [ca0d07025948eea625b61a4c138657fd300ff7ac]
#
# add_file "packages/supertux/supertux_0.1.3.bb"
# content [3bdf0dcd28c6bdec7e0869499bb81b27bbfb9d35]
#
# patch "packages/libsdl/libsdl-mixer_1.2.6.bb"
# from [cfee648682c7559cf233d5a7d0ae67430f94a636]
# to [8866166728bbf910308433bf453a286adc1fa2ec]
#
# patch "packages/linux/linux/simpad/defconfig"
# from [9b2a926304e0d3f59c4cc79fc6222c11947ed80f]
# to [ac1e360a7cdda71682cd334f3c0a28dc02b59533]
#
# patch "packages/linux/linux_2.6.21.bb"
# from [ea3e4abd8395bae51a2fa300c1079ee0a5041860]
# to [446a2c08dfcbb88e02f958f8e29adc438c0e9c2d]
#
# 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/supertux/files/supertux.png"
# from [daa562a438fed2ba9a887bdc0f6e98b0b024d5e4]
# to [95e94bf022d8fe098f34b15b577aa8c08b089bc3]
#
# patch "packages/supertux/supertux_0.1.2.bb"
# from [09cdf957a3989df2fcb1656badfab95e1da5adb2]
# to [1cd0b4d5a1abca0a1dcb49ed472396347e0c7529]
#
============================================================
--- 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} += "${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%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list