org.openembedded.dev: e070428bf461734f728a0ba9bd213180134be662
oe at monotone.openmoko.org
oe at monotone.openmoko.org
Fri May 2 21:06:37 CEST 2008
revision: e070428bf461734f728a0ba9bd213180134be662
date: 2008-05-01T10:29:54
author: mickeyl at openembedded.org
branch: org.openembedded.dev
changelog:
merge of '77e6de1879d8cb9e2cedcd283c5c43e8c333cc65'
and 'a73b62bfa46dd3bec609e1b1307c59a93f4a4469'
manifest:
format_version "1"
new_manifest [e405bb5cbaf0813f4201c779aa0c9e3a69e222cd]
old_revision [77e6de1879d8cb9e2cedcd283c5c43e8c333cc65]
delete "packages/asterisk/asterisk-1.4.10"
delete "packages/asterisk/asterisk-1.4.10/Makefile.patch"
delete "packages/asterisk/asterisk-1.4.10/init"
delete "packages/asterisk/asterisk-1.4.10/logrotate"
delete "packages/asterisk/asterisk-1.4.10/sounds.xml.patch"
delete "packages/asterisk/asterisk-1.4.10/volatiles"
delete "packages/asterisk/asterisk-1.4.11"
delete "packages/asterisk/asterisk-1.4.11/Makefile.patch"
delete "packages/asterisk/asterisk-1.4.11/init"
delete "packages/asterisk/asterisk-1.4.11/logrotate"
delete "packages/asterisk/asterisk-1.4.11/sounds.xml.patch"
delete "packages/asterisk/asterisk-1.4.11/volatiles"
delete "packages/asterisk/asterisk-1.6.0-beta6"
delete "packages/asterisk/asterisk-1.6.0-beta6/Makefile.patch"
delete "packages/asterisk/asterisk-1.6.0-beta6/init"
delete "packages/asterisk/asterisk-1.6.0-beta6/logrotate"
delete "packages/asterisk/asterisk-1.6.0-beta6/sounds.xml.patch"
delete "packages/asterisk/asterisk-1.6.0-beta6/volatiles"
delete "packages/asterisk/asterisk_1.4.10.bb"
delete "packages/asterisk/asterisk_1.4.11.bb"
delete "packages/asterisk/asterisk_1.6.0-beta6.bb"
add_dir "packages/asterisk/asterisk-1.2.28"
add_dir "packages/asterisk/asterisk-1.4.19.1"
add_dir "packages/asterisk/asterisk-1.6.0-beta8"
add_file "conf/machine/d201gly2.conf"
content [7e34b9738d6c1869f61708e1fec04db2564f9d89]
add_file "conf/machine/include/tune-pentium4c.inc"
content [6d4588e5e8c363a3883c76fc49befb8c4e75864d]
add_file "packages/asterisk/asterisk-1.2.28/asterisk.patch"
content [cd980f6cc48c01f2394a731d2cf247809e5c2231]
add_file "packages/asterisk/asterisk-1.2.28/enable-speex.patch"
content [123420f2bb25f198d687ae8cfad1eef6e90725bb]
add_file "packages/asterisk/asterisk-1.2.28/uclibc-compat-getloadavg.patch"
content [750cd99592c157b993f2ccb9f63edbe274d9edd1]
add_file "packages/asterisk/asterisk-1.2.28/uclibc-dns.patch"
content [9dbcc47d6cfeefd0f4c1071f982806f49ffc262d]
add_file "packages/asterisk/asterisk-1.4.19.1/Makefile.patch"
content [ce55873b5855c020f4d4e987a386223d1a211911]
add_file "packages/asterisk/asterisk-1.4.19.1/init"
content [66ddc677ff3831fb4be746a9222e69f65a2c6a22]
add_file "packages/asterisk/asterisk-1.4.19.1/logrotate"
content [d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f]
add_file "packages/asterisk/asterisk-1.4.19.1/sounds.xml.patch"
content [17999e17bf9a130a9e6e8a7a687092b2231d86c7]
add_file "packages/asterisk/asterisk-1.4.19.1/volatiles"
content [66814aff0fd07e02c83bf90010a95c0845067557]
add_file "packages/asterisk/asterisk-1.6.0-beta8/Makefile.patch"
content [83b3bcf804f60d8438696a8b8e54698c9c1dff09]
add_file "packages/asterisk/asterisk-1.6.0-beta8/init"
content [ab9f4c6af832cc4a94d2a5e256988be381675969]
add_file "packages/asterisk/asterisk-1.6.0-beta8/logrotate"
content [d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f]
add_file "packages/asterisk/asterisk-1.6.0-beta8/sounds.xml.patch"
content [17999e17bf9a130a9e6e8a7a687092b2231d86c7]
add_file "packages/asterisk/asterisk-1.6.0-beta8/volatiles"
content [66814aff0fd07e02c83bf90010a95c0845067557]
add_file "packages/asterisk/asterisk_1.2.28.bb"
content [59adcd07ce9843da6a5209dbe439320b4e024fbc]
add_file "packages/asterisk/asterisk_1.4.19.1.bb"
content [04072cabaeacd15aab238077b9b08e107ebec94b]
add_file "packages/asterisk/asterisk_1.6.0-beta8.bb"
content [8fbf9884c3ab370083c2125640d541c7f0fc0388]
add_file "packages/gpsd/gpsd_2.37.bb"
content [fcf9fa136398ac80a6cb1c8408ac6df26d0ddeaf]
old_revision [a73b62bfa46dd3bec609e1b1307c59a93f4a4469]
add_file "packages/python/python-setuptools-native_0.6c6.bb"
content [37e35eebe4105610cad978ad7a92f12a2b9095d1]
patch "classes/setuptools.bbclass"
from [f0a6d602e9af754216e3616efb17302d0116fe3b]
to [de18f3769a72fd6890b414d5ad97471bd58ce683]
patch "packages/python/python-2.5-manifest.inc"
from [ce2d4136b474c7f902281410e54cde0b27751287]
to [44f072a13c8f6a6aa74b1da25b3ccfb6be2ace3e]
patch "packages/python/python-setuptools_0.6c6.bb"
from [57994d92ba3eec5b7d6f145f3d08241becb3a6dc]
to [074cb8e81cb89426c6d897caeb5fd18c68571c9a]
patch "packages/python/python_2.5.2.bb"
from [43c9ad955282b5022b3a3db8b5b179589957f666]
to [3ca57f8a30e412707c0107dff460e0343840d9f1]
-------------- next part --------------
#
#
# delete "packages/asterisk/asterisk-1.4.10"
#
# delete "packages/asterisk/asterisk-1.4.10/Makefile.patch"
#
# delete "packages/asterisk/asterisk-1.4.10/init"
#
# delete "packages/asterisk/asterisk-1.4.10/logrotate"
#
# delete "packages/asterisk/asterisk-1.4.10/sounds.xml.patch"
#
# delete "packages/asterisk/asterisk-1.4.10/volatiles"
#
# delete "packages/asterisk/asterisk-1.4.11"
#
# delete "packages/asterisk/asterisk-1.4.11/Makefile.patch"
#
# delete "packages/asterisk/asterisk-1.4.11/init"
#
# delete "packages/asterisk/asterisk-1.4.11/logrotate"
#
# delete "packages/asterisk/asterisk-1.4.11/sounds.xml.patch"
#
# delete "packages/asterisk/asterisk-1.4.11/volatiles"
#
# delete "packages/asterisk/asterisk-1.6.0-beta6"
#
# delete "packages/asterisk/asterisk-1.6.0-beta6/Makefile.patch"
#
# delete "packages/asterisk/asterisk-1.6.0-beta6/init"
#
# delete "packages/asterisk/asterisk-1.6.0-beta6/logrotate"
#
# delete "packages/asterisk/asterisk-1.6.0-beta6/sounds.xml.patch"
#
# delete "packages/asterisk/asterisk-1.6.0-beta6/volatiles"
#
# delete "packages/asterisk/asterisk_1.4.10.bb"
#
# delete "packages/asterisk/asterisk_1.4.11.bb"
#
# delete "packages/asterisk/asterisk_1.6.0-beta6.bb"
#
# add_dir "packages/asterisk/asterisk-1.2.28"
#
# add_dir "packages/asterisk/asterisk-1.4.19.1"
#
# add_dir "packages/asterisk/asterisk-1.6.0-beta8"
#
# add_file "conf/machine/d201gly2.conf"
# content [7e34b9738d6c1869f61708e1fec04db2564f9d89]
#
# add_file "conf/machine/include/tune-pentium4c.inc"
# content [6d4588e5e8c363a3883c76fc49befb8c4e75864d]
#
# add_file "packages/asterisk/asterisk-1.2.28/asterisk.patch"
# content [cd980f6cc48c01f2394a731d2cf247809e5c2231]
#
# add_file "packages/asterisk/asterisk-1.2.28/enable-speex.patch"
# content [123420f2bb25f198d687ae8cfad1eef6e90725bb]
#
# add_file "packages/asterisk/asterisk-1.2.28/uclibc-compat-getloadavg.patch"
# content [750cd99592c157b993f2ccb9f63edbe274d9edd1]
#
# add_file "packages/asterisk/asterisk-1.2.28/uclibc-dns.patch"
# content [9dbcc47d6cfeefd0f4c1071f982806f49ffc262d]
#
# add_file "packages/asterisk/asterisk-1.4.19.1/Makefile.patch"
# content [ce55873b5855c020f4d4e987a386223d1a211911]
#
# add_file "packages/asterisk/asterisk-1.4.19.1/init"
# content [66ddc677ff3831fb4be746a9222e69f65a2c6a22]
#
# add_file "packages/asterisk/asterisk-1.4.19.1/logrotate"
# content [d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f]
#
# add_file "packages/asterisk/asterisk-1.4.19.1/sounds.xml.patch"
# content [17999e17bf9a130a9e6e8a7a687092b2231d86c7]
#
# add_file "packages/asterisk/asterisk-1.4.19.1/volatiles"
# content [66814aff0fd07e02c83bf90010a95c0845067557]
#
# add_file "packages/asterisk/asterisk-1.6.0-beta8/Makefile.patch"
# content [83b3bcf804f60d8438696a8b8e54698c9c1dff09]
#
# add_file "packages/asterisk/asterisk-1.6.0-beta8/init"
# content [ab9f4c6af832cc4a94d2a5e256988be381675969]
#
# add_file "packages/asterisk/asterisk-1.6.0-beta8/logrotate"
# content [d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f]
#
# add_file "packages/asterisk/asterisk-1.6.0-beta8/sounds.xml.patch"
# content [17999e17bf9a130a9e6e8a7a687092b2231d86c7]
#
# add_file "packages/asterisk/asterisk-1.6.0-beta8/volatiles"
# content [66814aff0fd07e02c83bf90010a95c0845067557]
#
# add_file "packages/asterisk/asterisk_1.2.28.bb"
# content [59adcd07ce9843da6a5209dbe439320b4e024fbc]
#
# add_file "packages/asterisk/asterisk_1.4.19.1.bb"
# content [04072cabaeacd15aab238077b9b08e107ebec94b]
#
# add_file "packages/asterisk/asterisk_1.6.0-beta8.bb"
# content [8fbf9884c3ab370083c2125640d541c7f0fc0388]
#
# add_file "packages/gpsd/gpsd_2.37.bb"
# content [fcf9fa136398ac80a6cb1c8408ac6df26d0ddeaf]
#
============================================================
--- conf/machine/d201gly2.conf 7e34b9738d6c1869f61708e1fec04db2564f9d89
+++ conf/machine/d201gly2.conf 7e34b9738d6c1869f61708e1fec04db2564f9d89
@@ -0,0 +1,33 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@NAME: D201GLY2
+#@DESCRIPTION: Machine configuration for Intel D201GLY2 board
+
+
+TARGET_ARCH = "i686"
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586 i686 i686p4c"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux
+KERNEL_IMAGETYPE = "bzImage"
+OLDEST_KERNEL = "2.6.17"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER="xserver-kdrive-sis"
+
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+
+IMAGE_FSTYPES = "ext2.gz"
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+MACHINE_TASK_PROVIDER = "task-base"
+
+udevdir = "/dev"
+
+
+#tune for P4 celeron cpu
+require conf/machine/include/tune-pentium4c.inc
============================================================
--- conf/machine/include/tune-pentium4c.inc 6d4588e5e8c363a3883c76fc49befb8c4e75864d
+++ conf/machine/include/tune-pentium4c.inc 6d4588e5e8c363a3883c76fc49befb8c4e75864d
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-march=prescott"
+PACKAGE_ARCH = "i686p4c"
+
============================================================
--- packages/asterisk/asterisk-1.2.28/asterisk.patch cd980f6cc48c01f2394a731d2cf247809e5c2231
+++ packages/asterisk/asterisk-1.2.28/asterisk.patch cd980f6cc48c01f2394a731d2cf247809e5c2231
@@ -0,0 +1,221 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- asterisk-1.2.9.1/./Makefile~asterisk
++++ asterisk-1.2.9.1/./Makefile
+@@ -331,7 +331,7 @@
+ ASTCFLAGS+= $(TRACE_FRAMES)
+ ASTCFLAGS+= $(MALLOC_DEBUG)
+ ASTCFLAGS+= $(BUSYDETECT)
+-ASTCFLAGS+= $(OPTIONS)
++#ASTCFLAGS+= $(OPTIONS)
+ ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
+ ASTCFLAGS+= -fomit-frame-pointer
+ endif
+@@ -347,12 +347,12 @@
+ netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
+ cryptostub.o
+
+-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),)
++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/sys/poll.h),)
+ OBJS+= poll.o
+ ASTCFLAGS+=-DPOLLCOMPAT
+ endif
+
+-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/dlfcn.h),)
++ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/include/dlfcn.h),)
+ OBJS+= dlfcn.o
+ ASTCFLAGS+=-DDLFCNCOMPAT
+ endif
+@@ -397,7 +397,7 @@
+ endif
+
+ ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
+- CFLAGS+=$(ASTCFLAGS)
++override CFLAGS+=$(ASTCFLAGS)
+ endif
+
+ # This is used when generating the doxygen documentation
+@@ -519,7 +519,7 @@
+ fi
+ rm -f include/asterisk/build.h.tmp
+ $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
+- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
++ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LDFLAGS) $(LIBS)
+
+ muted: muted.o
+ $(CC) $(AUDIO_LIBS) -o muted muted.o
+--- asterisk-1.2.9.1/codecs/gsm/Makefile~asterisk
++++ asterisk-1.2.9.1/codecs/gsm/Makefile
+@@ -51,7 +51,7 @@
+ ifneq (${PROC},ppc)
+ ifneq (${PROC},ppc64)
+ ifneq (${PROC},s390)
+-OPTIMIZE+=-march=$(PROC)
++#OPTIMIZE+=-march=$(PROC)
+ endif
+ endif
+ endif
+@@ -243,7 +243,7 @@
+ ifneq (${PROC},arm)
+ ifneq ($(shell uname -m), parisc)
+ ifneq ($(shell uname -m),s390)
+-GSM_SOURCES+= $(SRC)/k6opt.s
++#GSM_SOURCES+= $(SRC)/k6opt.s
+ endif
+ endif
+ endif
+@@ -309,7 +309,7 @@
+ ifneq ($(shell uname -m), armv4l)
+ ifneq ($(shell uname -m), parisc)
+ ifneq ($(shell uname -m),s390)
+-GSM_OBJECTS+= $(SRC)/k6opt.o
++#GSM_OBJECTS+= $(SRC)/k6opt.o
+ endif
+ endif
+ endif
+--- asterisk-1.2.9.1/res/Makefile~asterisk
++++ asterisk-1.2.9.1/res/Makefile
+@@ -89,7 +89,7 @@
+ fi
+
+ res_crypto.so: res_crypto.o
+- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS)
++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} $(CRYPTO_LIBS)
+
+ clean:
+ rm -f *.so *.o .depend
+--- asterisk-1.2.9.1/channels/Makefile~asterisk
++++ asterisk-1.2.9.1/channels/Makefile
+@@ -73,7 +73,7 @@
+ SOLINK+=-lrt
+ endif
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/linux/ixjuser.h),)
+ CHANNEL_LIBS+=chan_phone.so
+ endif
+
+@@ -88,16 +88,16 @@
+
+ CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/alsa/asoundlib.h),)
+ CHANNEL_LIBS+=chan_alsa.so
+ endif
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libpri.so.1),)
+ CFLAGS+=-DZAPATA_PRI
+ ZAPPRI=-lpri
+ endif
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/lib/libmfcr2.so.1),)
+ CFLAGS+=-DZAPATA_R2
+ ZAPR2=-lmfcr2
+ endif
+@@ -110,7 +110,7 @@
+ endif
+
+ ifndef WITHOUT_ZAPTEL
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/linux/zaptel.h),)
+ ifeq (${OSARCH},NetBSD)
+ SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
+ endif
+@@ -122,7 +122,7 @@
+ endif
+ endif # WITHOUT_ZAPTEL
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vpbapi.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/vpbapi.h),)
+ CHANNEL_LIBS+=chan_vpb.so
+ CFLAGS+=-DLINUX
+ endif
+@@ -137,7 +137,7 @@
+
+ ZAPDIR=/usr/lib
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/nbs.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/nbs.h),)
+ CHANNEL_LIBS+=chan_nbs.so
+ endif
+
+@@ -158,7 +158,7 @@
+ rm -f busy.h ringtone.h gentone gentone-ulaw
+
+ %.so : %.o
+- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${LIBS}
++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< $(LDFLAGS) ${CYGSOLIB} ${LIBS}
+
+ ifneq ($(wildcard .depend),)
+ include .depend
+@@ -215,7 +215,7 @@
+ chan_alsa.o: $(ALSA_SRC)
+
+ chan_alsa.so: chan_alsa.o
+- $(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl
++ $(CC) $(SOLINK) -o $@ $< -lasound -lm -ldl $(LDFLAGS)
+
+ chan_nbs.so: chan_nbs.o
+ $(CC) $(SOLINK) -o $@ $< -lnbs
+--- asterisk-1.2.9.1/pbx/Makefile~asterisk
++++ asterisk-1.2.9.1/pbx/Makefile
+@@ -59,7 +59,7 @@
+ $(CC) $(SOLINK) -o $@ $(KDE_CONSOLE_OBJS) $(KDE_LIBS)
+
+ pbx_dundi.so: dundi-parser.o pbx_dundi.o
+- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB}
++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} pbx_dundi.o dundi-parser.o -lz ${CYGSOLIB} $(LDFLAGS)
+
+ %.moc : %.h
+ $(MOC) $< -o $@
+--- asterisk-1.2.9.1/formats/Makefile~asterisk
++++ asterisk-1.2.9.1/formats/Makefile
+@@ -25,7 +25,7 @@
+ #
+ # OGG/Vorbis format
+ #
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/vorbis/codec.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/vorbis/codec.h),)
+ FORMAT_LIBS+=format_ogg_vorbis.so
+ endif
+
+@@ -57,7 +57,7 @@
+ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lm
+
+ format_ogg_vorbis.so : format_ogg_vorbis.o
+- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm
++ $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -logg -lvorbis -lvorbisenc -lm $(LDFLAGS)
+
+ install: all
+ for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+--- asterisk-1.2.9.1/utils/Makefile~asterisk
++++ asterisk-1.2.9.1/utils/Makefile
+@@ -22,11 +22,11 @@
+
+ TARGET=stereorize streamplayer
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/popt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/popt.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/popt.h),)
+ TARGET+=smsq
+ endif
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/newt.h)$(wildcard -f $(CROSS_COMPILE_TARGET)/usr/local/include/newt.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/include/newt.h),)
+ TARGET+=astman
+ endif
+
+@@ -64,7 +64,7 @@
+ $(CC) $(CFLAGS) -o $@ $^
+
+ smsq: smsq.o
+- $(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt
++ $(CC) $(CFLAGS) -o smsq ${SOL} smsq.o -lpopt $(LDFLAGS)
+
+ streamplayer: streamplayer.o
+ $(CC) $(CFLAGS) -o streamplayer ${SOL} streamplayer.o ${SOLLIBS}
============================================================
--- packages/asterisk/asterisk-1.2.28/enable-speex.patch 123420f2bb25f198d687ae8cfad1eef6e90725bb
+++ packages/asterisk/asterisk-1.2.28/enable-speex.patch 123420f2bb25f198d687ae8cfad1eef6e90725bb
@@ -0,0 +1,21 @@
+--- /codecs/orig-Makefile 2005-11-29 13:24:39.000000000 -0500
++++ /codecs/Makefile 2007-02-28 09:54:42.000000000 -0500
+@@ -29,7 +29,7 @@
+ endif
+
+ UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h)
+-UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h)
++UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/include/speex/speex.h)
+ ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex.h)
+ ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex/speex.h)
+ ifneq (${UI_SPEEX},)
+@@ -38,7 +38,8 @@
+ endif
+ ifneq (${UIS_SPEEX},)
+ MODSPEEX=codec_speex.so
+- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/include/speex
++ CFLAGS+=-I$(CROSS_COMPILE_TARGET)/include/speex
++ LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/lib
+ LIBSPEEX+=-lspeex -lm
+ endif
+ ifneq (${ULI_SPEEX},)
============================================================
--- packages/asterisk/asterisk-1.2.28/uclibc-compat-getloadavg.patch 750cd99592c157b993f2ccb9f63edbe274d9edd1
+++ packages/asterisk/asterisk-1.2.28/uclibc-compat-getloadavg.patch 750cd99592c157b993f2ccb9f63edbe274d9edd1
@@ -0,0 +1,13 @@
+diff -ruN asterisk-1.2.0-old/include/asterisk/compat.h asterisk-1.2.0-new/include/asterisk/compat.h
+--- asterisk-1.2.0-old/include/asterisk/compat.h 2005-11-08 05:13:19.000000000 +0100
++++ asterisk-1.2.0-new/include/asterisk/compat.h 2005-12-04 05:32:31.000000000 +0100
+@@ -75,7 +75,9 @@
+ #define HAVE_STRTOQ
+
+ #ifdef _BSD_SOURCE
++#ifndef __UCLIBC__
+ #define HAVE_GETLOADAVG
++#endif /* __UCLIBC__ */
+ #endif
+
+ #ifdef __linux__
============================================================
--- packages/asterisk/asterisk-1.2.28/uclibc-dns.patch 9dbcc47d6cfeefd0f4c1071f982806f49ffc262d
+++ packages/asterisk/asterisk-1.2.28/uclibc-dns.patch 9dbcc47d6cfeefd0f4c1071f982806f49ffc262d
@@ -0,0 +1,18 @@
+--- /orig-dns.c 2007-07-16 23:46:58.000000000 +0300
++++ /dns.c 2007-07-26 16:29:44.000000000 +0300
+@@ -237,7 +237,14 @@
+ #if defined(res_ndestroy)
+ #define HAS_RES_NDESTROY
+ #endif
+-#else
++#endif
++
++#ifdef __UCLIBC__
++#undef HAS_RES_NINIT
++#undef HAS_RES_NDESTROY
++#endif
++
++#ifndef HAS_RES_NINIT
+ AST_MUTEX_DEFINE_STATIC(res_lock);
+ #if 0
+ #warning "Warning, res_ninit is missing... Could have reentrancy issues"
============================================================
--- packages/asterisk/asterisk-1.4.19.1/Makefile.patch ce55873b5855c020f4d4e987a386223d1a211911
+++ packages/asterisk/asterisk-1.4.19.1/Makefile.patch ce55873b5855c020f4d4e987a386223d1a211911
@@ -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: badshell datafiles bininstall $(SUBDIRS_INSTALL)
++install: badshell 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.19.1/init 66ddc677ff3831fb4be746a9222e69f65a2c6a22
+++ packages/asterisk/asterisk-1.4.19.1/init 66ddc677ff3831fb4be746a9222e69f65a2c6a22
@@ -0,0 +1,77 @@
+#! /bin/sh
+#
+# This is an init script for openembedded
+# Copy it to /etc/init.d/callweaver 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.19.1/logrotate d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f
+++ packages/asterisk/asterisk-1.4.19.1/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.19.1/sounds.xml.patch 17999e17bf9a130a9e6e8a7a687092b2231d86c7
+++ packages/asterisk/asterisk-1.4.19.1/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.19.1/volatiles 66814aff0fd07e02c83bf90010a95c0845067557
+++ packages/asterisk/asterisk-1.4.19.1/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.6.0-beta8/Makefile.patch 83b3bcf804f60d8438696a8b8e54698c9c1dff09
+++ packages/asterisk/asterisk-1.6.0-beta8/Makefile.patch 83b3bcf804f60d8438696a8b8e54698c9c1dff09
@@ -0,0 +1,20 @@
+--- asterisk-1.6.0/Makefile 2008-03-18 11:58:50.000000000 -0400
++++ asterisk-1.6.0.new/Makefile 2008-03-28 12:11:32.137042768 -0400
+@@ -142,7 +142,7 @@ else
+ ASTSBINDIR=$(sbindir)
+ ASTSPOOLDIR=$(localstatedir)/spool/asterisk
+ ASTLOGDIR=$(localstatedir)/log/asterisk
+- ASTVARRUNDIR=$(localstatedir)/run
++ ASTVARRUNDIR=$(localstatedir)/run/asterisk
+ ASTMANDIR=$(mandir)
+ ifneq ($(findstring BSD,$(OSARCH)),)
+ ASTVARLIBDIR=$(prefix)/share/asterisk
+@@ -571,7 +571,7 @@ ifneq ($(findstring ~,$(DESTDIR)),)
+ @exit 1
+ endif
+
+-install: badshell datafiles bininstall
++install: badshell datafiles bininstall samples
+ @if [ -x /usr/sbin/asterisk-post-install ]; then \
+ /usr/sbin/asterisk-post-install $(DESTDIR) . ; \
+ fi
============================================================
--- packages/asterisk/asterisk-1.6.0-beta8/init ab9f4c6af832cc4a94d2a5e256988be381675969
+++ packages/asterisk/asterisk-1.6.0-beta8/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.6.0-beta8/logrotate d1ec36f2b07760a1a2cd1c2b18215fc5e06b2f4f
+++ packages/asterisk/asterisk-1.6.0-beta8/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.6.0-beta8/sounds.xml.patch 17999e17bf9a130a9e6e8a7a687092b2231d86c7
+++ packages/asterisk/asterisk-1.6.0-beta8/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.6.0-beta8/volatiles 66814aff0fd07e02c83bf90010a95c0845067557
+++ packages/asterisk/asterisk-1.6.0-beta8/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.2.28.bb 59adcd07ce9843da6a5209dbe439320b4e024fbc
+++ packages/asterisk/asterisk_1.2.28.bb 59adcd07ce9843da6a5209dbe439320b4e024fbc
@@ -0,0 +1,46 @@
+# Copyright (C) 2007-2008, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="www.asterisk.org"
+LICENSE="GPL"
+DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis speex"
+SECTION = "console/telephony"
+PR = "r0"
+
+SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
+ file://uclibc-compat-getloadavg.patch;patch=1 \
+ file://uclibc-dns.patch;patch=1 \
+ file://asterisk.patch;patch=1 \
+ file://enable-speex.patch;patch=1"
+
+S = "${WORKDIR}/asterisk-${PV}"
+
+
+export CROSS_COMPILE="${CCACHE}${HOST_PREFIX}"
+export CROSS_COMPILE_BIN="${STAGING_BINDIR_CROSS}"
+export CROSS_COMPILE_TARGET="${STAGING_DIR_HOST}"
+
+export CROSS_ARCH="Linux"
+export CROSS_PROC="${TARGET_ARCH}"
+
+export MAKECMDGOALS="dont-optimize"
+
+# We will probably have to edit the CFLAG in the Makefile
+
+do_compile() {
+ oe_runmake
+}
+
+do_install() {
+ oe_runmake DESTDIR=${D} install
+}
+
+do_stage () {
+ install -d ${STAGING_INCDIR}/asterisk
+ install -m 0644 ${S}/include/asterisk/*.h ${STAGING_INCDIR}/asterisk/
+}
+
+
+FILES_${PN}-dbg += "${libdir}/asterisk/modules/.debug"
+FILES_${PN}-dbg += "/var/lib/asterisk/agi-bin/.debug"
+
============================================================
--- packages/asterisk/asterisk_1.4.19.1.bb 04072cabaeacd15aab238077b9b08e107ebec94b
+++ packages/asterisk/asterisk_1.4.19.1.bb 04072cabaeacd15aab238077b9b08e107ebec94b
@@ -0,0 +1,170 @@
+# Copyright (C) 2007-2008, 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"
+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="powerpc"
+ARCH_dht-walnut="powerpc"
+ARCH_magicbox="powerpc"
+ARCH_sequoia="powerpc"
+
+
+
+
+INITSCRIPT_NAME = "asterisk"
+INITSCRIPT_PARAMS = "defaults 60"
+
+inherit autotools update-rc.d
+
+EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR} \
+ --with-z=${STAGING_EXECPREFIXDIR} \
+ --with-curl=${STAGING_EXECPREFIXDIR} \
+ --with-termcap=${STAGING_EXECPREFIXDIR} \
+ --with-ogg=${STAGING_EXECPREFIXDIR} \
+ --with-vorbis=${STAGING_EXECPREFIXDIR} \
+ --with-sqlite=${STAGING_EXECPREFIXDIR} \
+ --with-popt=${STAGING_EXECPREFIXDIR} \
+ --with-gnutls=${STAGING_EXECPREFIXDIR} \
+ --without-curses\
+ --with-ncurses=${STAGING_EXECPREFIXDIR} \
+ --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 RANLIB
+ 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/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"
============================================================
--- packages/asterisk/asterisk_1.6.0-beta8.bb 8fbf9884c3ab370083c2125640d541c7f0fc0388
+++ packages/asterisk/asterisk_1.6.0-beta8.bb 8fbf9884c3ab370083c2125640d541c7f0fc0388
@@ -0,0 +1,184 @@
+# Copyright (C) 2008, Ovidiu Sas - VoIP Embedded Inc., All Rights Reserved
+# Copyright (C) 2008, 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"
+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="powerpc"
+ARCH_dht-walnut="powerpc"
+ARCH_magicbox="powerpc"
+ARCH_sequoia="powerpc"
+
+INITSCRIPT_NAME = "asterisk"
+INITSCRIPT_PARAMS = "defaults 60"
+
+inherit autotools update-rc.d
+
+EXTRA_OECONF = "--with-ssl=${STAGING_EXECPREFIXDIR}\
+ --with-z=${STAGING_EXECPREFIXDIR}\
+ --with-curl=${STAGING_EXECPREFIXDIR}\
+ --with-termcap=${STAGING_EXECPREFIXDIR}\
+ --with-ogg=${STAGING_EXECPREFIXDIR}\
+ --with-vorbis=${STAGING_EXECPREFIXDIR}\
+ --with-sqlite=${STAGING_EXECPREFIXDIR}\
+ --with-popt=${STAGING_EXECPREFIXDIR}\
+ --with-gnutls=${STAGING_EXECPREFIXDIR}\
+ --without-curses\
+ --with-ncurses=${STAGING_EXECPREFIXDIR}\
+ --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 RANLIB
+ cd menuselect
+ ./configure
+ oe_runmake
+ cd ../
+ ) || exit 1
+ oe_runmake
+}
+
+do_stage() {
+ autotools_stage_includes
+}
+
+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_adaptive_odbc.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_sqlite3_custom.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/cdr_tds.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/cli.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/codecs.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/console.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/extensions.lua"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/extensions_minivm.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/jingle.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/minivm.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/misdn.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/phoneprov.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/queuerules.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/queues.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/res_ldap.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/res_odbc.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/res_pgsql.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/unistim.conf"
+CONFFILES_${PN} += "${sysconfdir}/asterisk/usbradio.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"
============================================================
--- packages/gpsd/gpsd_2.37.bb fcf9fa136398ac80a6cb1c8408ac6df26d0ddeaf
+++ packages/gpsd/gpsd_2.37.bb fcf9fa136398ac80a6cb1c8408ac6df26d0ddeaf
@@ -0,0 +1,3 @@
+require gpsd.inc
+
+PR = "r0"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080502/b1041466/attachment.htm
-------------- next part --------------
#
#
# add_file "packages/python/python-setuptools-native_0.6c6.bb"
# content [37e35eebe4105610cad978ad7a92f12a2b9095d1]
#
# patch "classes/setuptools.bbclass"
# from [f0a6d602e9af754216e3616efb17302d0116fe3b]
# to [de18f3769a72fd6890b414d5ad97471bd58ce683]
#
# patch "packages/python/python-2.5-manifest.inc"
# from [ce2d4136b474c7f902281410e54cde0b27751287]
# to [44f072a13c8f6a6aa74b1da25b3ccfb6be2ace3e]
#
# patch "packages/python/python-setuptools_0.6c6.bb"
# from [57994d92ba3eec5b7d6f145f3d08241becb3a6dc]
# to [074cb8e81cb89426c6d897caeb5fd18c68571c9a]
#
# patch "packages/python/python_2.5.2.bb"
# from [43c9ad955282b5022b3a3db8b5b179589957f666]
# to [3ca57f8a30e412707c0107dff460e0343840d9f1]
#
============================================================
--- packages/python/python-setuptools-native_0.6c6.bb 37e35eebe4105610cad978ad7a92f12a2b9095d1
+++ packages/python/python-setuptools-native_0.6c6.bb 37e35eebe4105610cad978ad7a92f12a2b9095d1
@@ -0,0 +1,8 @@
+require python-setuptools_${PV}.bb
+
+DEPENDS = "python-native"
+
+do_stage() {
+ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+ ${STAGING_BINDIR_NATIVE}/python setup.py install
+}
============================================================
--- classes/setuptools.bbclass f0a6d602e9af754216e3616efb17302d0116fe3b
+++ classes/setuptools.bbclass de18f3769a72fd6890b414d5ad97471bd58ce683
@@ -1,6 +1,6 @@ inherit distutils
inherit distutils
-DEPENDS += "python-setuptools"
+DEPENDS += "python-setuptools-native"
DISTUTILS_INSTALL_ARGS = "--root=${D} \
--single-version-externally-managed \
============================================================
--- packages/python/python-2.5-manifest.inc ce2d4136b474c7f902281410e54cde0b27751287
+++ packages/python/python-2.5-manifest.inc 44f072a13c8f6a6aa74b1da25b3ccfb6be2ace3e
@@ -1,5 +1,5 @@
-########################################################################################################################
-### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer at vanille-media.de>] on Thu Apr 10 16:47:00 2008
+[?1034h########################################################################################################################
+### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer <mlauer at vanille-media.de>] on Thu May 1 12:24:55 2008
###
### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy
###
@@ -68,9 +68,9 @@ DESCRIPTION_python-compression="Python H
FILES_python-compiler="${libdir}/python2.5/compiler "
DESCRIPTION_python-compression="Python High Level Compression Support"
-PR_python-compression="ml0"
+PR_python-compression="ml1"
RDEPENDS_python-compression="python-core python-zlib"
-FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* "
+FILES_python-compression="${libdir}/python2.5/gzip.* ${libdir}/python2.5/zipfile.* ${libdir}/python2.5/tarfile.* "
DESCRIPTION_python-re="Python Regular Expression APIs"
PR_python-re="ml0"
============================================================
--- packages/python/python-setuptools_0.6c6.bb 57994d92ba3eec5b7d6f145f3d08241becb3a6dc
+++ packages/python/python-setuptools_0.6c6.bb 074cb8e81cb89426c6d897caeb5fd18c68571c9a
@@ -3,7 +3,7 @@ LICENSE = "MIT-like"
SECTION = "devel/python"
PRIORITY = "optional"
LICENSE = "MIT-like"
-RDEPENDS = "python-core python-zlib"
+RDEPENDS = "python-distutils python-compression"
SRCNAME = "setuptools"
PR = "ml1"
@@ -15,8 +15,3 @@ do_install_prepend() {
do_install_prepend() {
install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
}
-
-do_stage() {
- BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
- ${STAGING_BINDIR_NATIVE}/python setup.py install
-}
============================================================
--- packages/python/python_2.5.2.bb 43c9ad955282b5022b3a3db8b5b179589957f666
+++ packages/python/python_2.5.2.bb 3ca57f8a30e412707c0107dff460e0343840d9f1
@@ -6,7 +6,7 @@ DEPENDS_sharprom = "python-native readli
DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk"
DEPENDS_sharprom = "python-native readline zlib gdbm openssl"
# bump this on every change in contrib/python/generate-manifest-2.5.py
-PR = "ml2"
+PR = "ml3"
PYTHON_MAJMIN = "2.5"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.openmoko.org/pipermail/commitlog/attachments/20080502/b1041466/attachment-0001.htm
More information about the commitlog
mailing list