From 61fc2558227783fe8553783cf3cfbb3a2732577e Mon Sep 17 00:00:00 2001
From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Sat, 12 Jan 2008 14:13:20 +0000
Subject: conf/machine/: fix configuration for Strongarm devices * replace
 erroneous TARGET_CC_ARCH line optimising for xscale instead of strongarm *
 remove inclusion of tune-strongarm.inc from collie.conf and replace it with
 the   correct TARGET_CC_ARCH.  Collie is the only Strongarm 1110 device in OE
 and thus   needs special treatment * rename tune-strongarm.inc to
 tune-strongarm1100.inc and leave a short note to   make it clear the file
 only applies to Strongarm 1100 devices.

---
 conf/machine/collie.conf                    | 5 +----
 conf/machine/h3600.conf                     | 2 +-
 conf/machine/htcwallaby.conf                | 2 +-
 conf/machine/include/tune-strongarm.inc     | 2 --
 conf/machine/include/tune-strongarm1100.inc | 5 +++++
 conf/machine/jornada56x.conf                | 2 +-
 conf/machine/jornada7xx.conf                | 2 +-
 conf/machine/shark.conf                     | 2 +-
 conf/machine/simpad.conf                    | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 conf/machine/include/tune-strongarm.inc
 create mode 100644 conf/machine/include/tune-strongarm1100.inc

diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index c91bdcfc92..b9e6f6e6aa 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -3,6 +3,7 @@
 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
 
 TARGET_ARCH = "arm"
+TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1110"
 
 MACHINE_KERNEL_VERSION ?= "2.6"
 require conf/machine/include/collie-${MACHINE_KERNEL_VERSION}.inc
@@ -13,13 +14,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 MACHINE_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
 
 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
-
 IMAGE_LINGUAS = ""
-
 IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
-require conf/machine/include/tune-strongarm.inc
-
 ROOT_FLASH_SIZE = "14"
 # actually 14680064, see EXTRA_IMAGECMD above
 
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index c037226154..6f0e37b803 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 "
 
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 # h3700, h3800 have 32, but let that be the bonus
 ROOT_FLASH_SIZE = "16"
diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf
index 34255a1536..515700d9e6 100644
--- a/conf/machine/htcwallaby.conf
+++ b/conf/machine/htcwallaby.conf
@@ -8,7 +8,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv4 "
 
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 ROOT_FLASH_SIZE = "16" 
 VOLATILE_STORAGE_SIZE = "32"
diff --git a/conf/machine/include/tune-strongarm.inc b/conf/machine/include/tune-strongarm.inc
deleted file mode 100644
index 8654c996ef..0000000000
--- a/conf/machine/include/tune-strongarm.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET_CC_ARCH = "-march=armv4 -mtune=xscale"
-
diff --git a/conf/machine/include/tune-strongarm1100.inc b/conf/machine/include/tune-strongarm1100.inc
new file mode 100644
index 0000000000..f136710409
--- /dev/null
+++ b/conf/machine/include/tune-strongarm1100.inc
@@ -0,0 +1,5 @@
+# This machine lists common configuration options for Strongarm 1100 devices
+# NOTE: The Zaurus Collie also has a Strongarm processor, but uses the 1110 type
+
+TARGET_CC_ARCH = "-march=armv4 -mtune=strongarm1100"
+
diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf
index 72fff1ed5e..a42dd8c127 100644
--- a/conf/machine/jornada56x.conf
+++ b/conf/machine/jornada56x.conf
@@ -12,4 +12,4 @@ EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p"
 
 SERIAL_CONSOLE = "115200 ttySA0"
 
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf
index 8741eb4ff6..ee9117e406 100644
--- a/conf/machine/jornada7xx.conf
+++ b/conf/machine/jornada7xx.conf
@@ -4,7 +4,7 @@
 
 TARGET_ARCH = "arm"
 
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada7xx"
 PCMCIA_MANAGER = "pcmciautils"
diff --git a/conf/machine/shark.conf b/conf/machine/shark.conf
index d7d35cfda1..87c260856d 100644
--- a/conf/machine/shark.conf
+++ b/conf/machine/shark.conf
@@ -15,7 +15,7 @@ SERIAL_CONSOLE = "ttySA0 115200 vt100"
 ROOT_FLASH_SIZE = "16"
 USE_VT = "0"
 
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 MACHINE_FEATURES = "kernel26 apm alsa pcmcia keyboard ext2"
 MACHINE_EXTRA_RDEPENDS_append = " mpg321 mpd madplay "
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 6334d34171..e187ee1e75 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -9,7 +9,7 @@ TARGET_ARCH = "arm"
 MACHINE_FEATURES = "apm pcmcia irda screen touchscreen vfat"
 
 include conf/machine/include/simpad-${MACHINE_KERNEL_VERSION}.inc
-require conf/machine/include/tune-strongarm.inc
+require conf/machine/include/tune-strongarm1100.inc
 
 
 ROOT_FLASH_SIZE = "16"
-- 
cgit v1.2.3


From 96320328ecb8f2bdaaf1949a78aa462239192ea2 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 12 Jan 2008 14:18:26 +0000
Subject: insane.bbclass: fix formatting of fatal include error

---
 classes/insane.bbclass | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index 840ebf6eff..97cf036dd9 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -464,7 +464,6 @@ python do_qa_configure() {
                     os.path.join(root,"config.log")
         if "config.log" in files:
             if os.system(statement) == 0:
-                bb.fatal("This autoconf log indicates errors, it looked at \
-                          host includes. Rerun configure task after fixing this. \
-                          Path was '%s'" % root)
+                bb.fatal("""This autoconf log indicates errors, it looked at host includes.
+Rerun configure task after fixing this. The path was '%s'""" % root)
 }
-- 
cgit v1.2.3


From 292e12127c645974278f5be07416861e1955896c Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 12 Jan 2008 14:19:41 +0000
Subject: xerces-c 2.8.0 add, remove non-working 2.6.0 and 2.7.0

---
 packages/xerces-c/xerces-c_2.6.0.bb | 47 -------------------------------------
 packages/xerces-c/xerces-c_2.7.0.bb | 47 -------------------------------------
 packages/xerces-c/xerces-c_2.8.0.bb | 30 +++++++++++++++++++++++
 3 files changed, 30 insertions(+), 94 deletions(-)
 delete mode 100644 packages/xerces-c/xerces-c_2.6.0.bb
 delete mode 100644 packages/xerces-c/xerces-c_2.7.0.bb
 create mode 100644 packages/xerces-c/xerces-c_2.8.0.bb

diff --git a/packages/xerces-c/xerces-c_2.6.0.bb b/packages/xerces-c/xerces-c_2.6.0.bb
deleted file mode 100644
index fe0677f54f..0000000000
--- a/packages/xerces-c/xerces-c_2.6.0.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-DESCRIPTION = "Xerces-c xml"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "MIT"
-
-S = "${WORKDIR}/xerces-c-src_2_6_0"
-
-SRC_URI = "http://www.axint.net/apache/xml/xerces-c/xerces-c-src_2_6_0.tar.gz"
-
-inherit pkgconfig
-
-
-#
-# Warning: BITSTOBUILD will default to 32 bits
-#
-export TRANSCODER="NATIVE"
-export MESSAGELOADER="INMEM"
-export NETACCESSOR="Socket"
-export THREADS="pthread"
-export BITSTOBUILD="32"
-export LIBS = " -lpthread "
-CFLAGS_append = " -DPROJ_XMLPARSER -DPROJ_XMLUTIL -DPROJ_PARSERS -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_DEPRECATED_DOM -DPROJ_VALIDATORS -DXML_USE_NATIVE_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER -DXML_USE_PTHREADS -DXML_USE_NETACCESSOR_SOCKET "
-CXXFLAGS_append = " -DPROJ_XMLPARSER -DPROJ_XMLUTIL -DPROJ_PARSERS -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_DEPRECATED_DOM -DPROJ_VALIDATORS -DXML_USE_NATIVE_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER -DXML_USE_PTHREADS -DXML_USE_NETACCESSOR_SOCKET "
-
-do_configure() {
-    export XERCESCROOT=${S}
-    cd src/xercesc
-    ./configure
-}
-
-do_compile () {
-    export XERCESCROOT=${S}
-    cd src/xercesc
-    oe_runmake
-}
-
-do_stage () {
-    oe_libinstall -C lib libxerces-c ${STAGING_LIBDIR}
-    oe_libinstall -C lib libxerces-depdom ${STAGING_LIBDIR}
-
-    cp -pPR include/xercesc ${STAGING_INCDIR}
-}
-
-do_install () {
-    oe_libinstall -C lib libxerces-c ${D}${libdir}
-    oe_libinstall -C lib libxerces-depdom ${D}${libdir}
-}
diff --git a/packages/xerces-c/xerces-c_2.7.0.bb b/packages/xerces-c/xerces-c_2.7.0.bb
deleted file mode 100644
index 8fdab80180..0000000000
--- a/packages/xerces-c/xerces-c_2.7.0.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-DESCRIPTION = "Xerces-c xml"
-SECTION =  "libs"
-PRIORITY = "optional"
-LICENSE = "MIT"
-
-S = "${WORKDIR}/xerces-c-src_2_7_0"
-
-SRC_URI = "http://www.axint.net/apache/xml/xerces-c/source/xerces-c-src_2_7_0.tar.gz"
-
-inherit pkgconfig
-
-
-#
-# Warning: BITSTOBUILD will default to 32 bits
-#
-export TRANSCODER="NATIVE"
-export MESSAGELOADER="INMEM"
-export NETACCESSOR="Socket"
-export THREADS="pthread"
-export BITSTOBUILD="32"
-export LIBS = " -lpthread "
-CFLAGS_append = " -DPROJ_XMLPARSER -DPROJ_XMLUTIL -DPROJ_PARSERS -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_DEPRECATED_DOM -DPROJ_VALIDATORS -DXML_USE_NATIVE_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER -DXML_USE_PTHREADS -DXML_USE_NETACCESSOR_SOCKET "
-CXXFLAGS_append = " -DPROJ_XMLPARSER -DPROJ_XMLUTIL -DPROJ_PARSERS -DPROJ_SAX4C -DPROJ_SAX2 -DPROJ_DOM -DPROJ_DEPRECATED_DOM -DPROJ_VALIDATORS -DXML_USE_NATIVE_TRANSCODER -DXML_USE_INMEM_MESSAGELOADER -DXML_USE_PTHREADS -DXML_USE_NETACCESSOR_SOCKET "
-
-do_configure() {
-    export XERCESCROOT=${S}
-    cd src/xercesc
-    ./configure
-}
-
-do_compile () {
-    export XERCESCROOT=${S}
-    cd src/xercesc
-    oe_runmake
-}
-
-do_stage () {
-    oe_libinstall -C lib libxerces-c ${STAGING_LIBDIR}
-    oe_libinstall -C lib libxerces-depdom ${STAGING_LIBDIR}
-
-    cp -pPR include/xercesc ${STAGING_INCDIR}
-}
-
-do_install () {
-    oe_libinstall -C lib libxerces-c ${D}${libdir}
-    oe_libinstall -C lib libxerces-depdom ${D}${libdir}
-}
diff --git a/packages/xerces-c/xerces-c_2.8.0.bb b/packages/xerces-c/xerces-c_2.8.0.bb
new file mode 100644
index 0000000000..9f911bdb4d
--- /dev/null
+++ b/packages/xerces-c/xerces-c_2.8.0.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Xerces-c is a validating xml parser written in C++"
+SECTION =  "libs"
+PRIORITY = "optional"
+LICENSE = "MIT"
+
+SRC_URI = "http://mirror.serversupportforum.de/apache/xerces/c/sources/xerces-c-src_2_8_0.tar.gz"
+S = "${WORKDIR}/xerces-c-src_2_8_0/src/xercesc"
+
+inherit pkgconfig
+
+CCACHE = ""
+export XERCESCROOT="${WORKDIR}/xerces-c-src_2_8_0"
+
+do_configure() {
+	./runConfigure -plinux -c"${BUILD_CC}" -x"${BUILD_CXX}" -minmem -nsocket -tnative -rpthread -P${D}${prefix}
+}
+
+do_compile() {
+	${MAKE}
+}
+
+do_stage () {
+    oe_libinstall -C ${XERCESCROOT}/lib libxerces-c ${STAGING_LIBDIR}
+    oe_libinstall -C ${XERCESCROOT}/lib libxerces-depdom ${STAGING_LIBDIR}
+    cp -pPR ${XERCESCROOT}/include/xercesc ${STAGING_INCDIR}
+}
+
+do_install () {
+	${MAKE} install
+}
-- 
cgit v1.2.3


From a517ea6a648846d845040be42b024666e6782915 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 12 Jan 2008 15:10:04 +0000
Subject: xerces-c 2.8.0 make it compile for the target architecture *cough*

---
 packages/xerces-c/xerces-c_2.8.0.bb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/xerces-c/xerces-c_2.8.0.bb b/packages/xerces-c/xerces-c_2.8.0.bb
index 9f911bdb4d..4f72e9dc77 100644
--- a/packages/xerces-c/xerces-c_2.8.0.bb
+++ b/packages/xerces-c/xerces-c_2.8.0.bb
@@ -1,18 +1,24 @@
 DESCRIPTION = "Xerces-c is a validating xml parser written in C++"
+HOMEPAGE = "http://xerces.apache.org/xerces-c/"
 SECTION =  "libs"
 PRIORITY = "optional"
 LICENSE = "MIT"
+PR = "r1"
 
 SRC_URI = "http://mirror.serversupportforum.de/apache/xerces/c/sources/xerces-c-src_2_8_0.tar.gz"
 S = "${WORKDIR}/xerces-c-src_2_8_0/src/xercesc"
 
-inherit pkgconfig
+inherit autotools pkgconfig
 
 CCACHE = ""
 export XERCESCROOT="${WORKDIR}/xerces-c-src_2_8_0"
+export cross_compiling = "yes"
 
 do_configure() {
-	./runConfigure -plinux -c"${BUILD_CC}" -x"${BUILD_CXX}" -minmem -nsocket -tnative -rpthread -P${D}${prefix}
+	./runConfigure -plinux -c"${CC}" -x"${CXX}" -minmem -nsocket -tnative -rpthread -P${D}${prefix} \
+                    -C--build=${BUILD_SYS} \
+                    -C--host=${HOST_SYS} \
+                    -C--target=${TARGET_SYS} \
 }
 
 do_compile() {
-- 
cgit v1.2.3


From 3ad50ef778fcdc29cb5fd48109e95d7a8a73fab8 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 12 Jan 2008 15:22:07 +0000
Subject: add dtn, from the Delay Tolerant Networking Research Group yes, this
 includes python-dtn (of course :)

---
 packages/dtnrg/.mtn2git_empty |  0
 packages/dtnrg/dtn_2.5.0.bb   | 58 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 packages/dtnrg/.mtn2git_empty
 create mode 100644 packages/dtnrg/dtn_2.5.0.bb

diff --git a/packages/dtnrg/.mtn2git_empty b/packages/dtnrg/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/dtnrg/dtn_2.5.0.bb b/packages/dtnrg/dtn_2.5.0.bb
new file mode 100644
index 0000000000..a1111f18e7
--- /dev/null
+++ b/packages/dtnrg/dtn_2.5.0.bb
@@ -0,0 +1,58 @@
+DESCRIPTION = "Delay Tolerant Networking Package"
+HOMEPAGE = "http://www.dtnrg.org/wiki"
+SECTION = "libs"
+DEPENDS = "db openssl python-native xerces-c"
+LICENSE = "Apache"
+SRC_URI = "http://www.dtnrg.org/docs/code/dtn_${PV}.tgz"
+
+inherit autotools
+
+EXTRA_OECONF = "\
+  --with-python=${STAGING_BINDIR_NATIVE}/python \
+  --with-db=${STAGING_DIR} \
+  --with-tcl=${STAGING_DIR} \
+  --without-google-perftools \
+  --without-bluez \
+  --without-bonjour \
+  --with-expat=${STAGING_DIR} \
+  --with-xerces-c=${STAGING_DIR} \
+  --without-tclreadline \
+  --with-zlib=${STAGING_DIR} \
+  --without-xsd-tool \
+  --with-db=${STAGING_DIR} \
+  --enable-ecl \
+  --enable-edp \
+  --without-mysql \
+  --without-postgres \
+  --with-openssl=${STAGING_DIR} \
+"
+
+def python_dir(d):
+        import os, bb
+        staging_incdir = bb.data.getVar( "STAGING_INCDIR", d, 1 )
+        if os.path.exists( "%s/python2.5" % staging_incdir ): return "python2.5"
+        if os.path.exists( "%s/python2.4" % staging_incdir ): return "python2.4"
+        if os.path.exists( "%s/python2.3" % staging_incdir ): return "python2.3"
+        raise "No Python in STAGING_INCDIR. Forgot to build python-native ?"
+
+PYTHON_DIR = "${@python_dir(d)}"
+
+export BUILD_SYS
+export HOST_SYS
+
+do_configure_prepend() {
+	for i in aclocal/*.ac oasys/aclocal/*.ac; do
+		install -m 0644 $i ${STAGING_DATADIR}/aclocal/`basename $i`.m4
+	done
+	autotools_do_configure
+}
+
+do_install_append() {
+	cd applib/python
+	INCDIR=../.. LIBDIR=.. VERSION=${PV} python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir}
+}
+
+PACKAGES += "${PN}-python"
+FILES_${PN}-python = "${libdir}/${PYTHON_DIR}"
+RDEPENDS_${PN}-python = "python-core"
+FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug"
-- 
cgit v1.2.3


From a654aff11ac98764ad472c3ccabcc6fda2be23eb Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 12 Jan 2008 15:49:07 +0000
Subject: add task-openmoko-python-devel and corresponding
 openmoko-python-devel-image

---
 packages/images/openmoko-python-devel-image.bb |  6 ++++++
 packages/tasks/task-openmoko-python-devel.bb   | 11 +++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 packages/images/openmoko-python-devel-image.bb
 create mode 100644 packages/tasks/task-openmoko-python-devel.bb

diff --git a/packages/images/openmoko-python-devel-image.bb b/packages/images/openmoko-python-devel-image.bb
new file mode 100644
index 0000000000..9d2a8db2c6
--- /dev/null
+++ b/packages/images/openmoko-python-devel-image.bb
@@ -0,0 +1,6 @@
+require openmoko-image.bb
+
+IMAGE_INSTALL += "\
+  task-openmoko-python-devel \
+"
+
diff --git a/packages/tasks/task-openmoko-python-devel.bb b/packages/tasks/task-openmoko-python-devel.bb
new file mode 100644
index 0000000000..37d64847f6
--- /dev/null
+++ b/packages/tasks/task-openmoko-python-devel.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "OpenMoko: Python Development Tools"
+SECTION = "openmoko/devel"
+LICENSE = "MIT"
+PR = "r1"
+
+inherit task
+
+RDEPENDS_task-openmoko-python-devel = "\
+  python-efl \
+  python-pygtk \
+"
-- 
cgit v1.2.3


From a22c25bf6ae9a401687a0fad1e9e84221825c75f Mon Sep 17 00:00:00 2001
From: Cyril Romain <cyril.romain@gmail.com>
Date: Sat, 12 Jan 2008 15:49:49 +0000
Subject: screen_4.0.2.bb : Resolve bugg 3663 by updating patch location.

---
 packages/screen/screen_4.0.2.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/screen/screen_4.0.2.bb b/packages/screen/screen_4.0.2.bb
index b915a5f72b..29681304ec 100644
--- a/packages/screen/screen_4.0.2.bb
+++ b/packages/screen/screen_4.0.2.bb
@@ -4,10 +4,10 @@ processes, typically interactive shells."
 LICENSE = "GPL"
 SECTION = "console/utils"
 DEPENDS = "ncurses"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
-           ${DEBIAN_MIRROR}/main/s/screen/screen_4.0.2-4.1.diff.gz;patch=1 \
+           ${DEBIAN_MIRROR}/main/s/screen/screen_4.0.2-4.1sarge1.diff.gz;patch=1 \
            file://configure.patch;patch=1"
 
 inherit autotools
-- 
cgit v1.2.3


From d46d07f9d1781f0dc27dd50c8a76ef2428039d92 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 12 Jan 2008 15:54:10 +0000
Subject: dtn 2.5.0 change package name for python bindings

---
 packages/dtnrg/dtn_2.5.0.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/dtnrg/dtn_2.5.0.bb b/packages/dtnrg/dtn_2.5.0.bb
index a1111f18e7..0b4043bbc2 100644
--- a/packages/dtnrg/dtn_2.5.0.bb
+++ b/packages/dtnrg/dtn_2.5.0.bb
@@ -52,7 +52,9 @@ do_install_append() {
 	INCDIR=../.. LIBDIR=.. VERSION=${PV} python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir}
 }
 
-PACKAGES += "${PN}-python"
-FILES_${PN}-python = "${libdir}/${PYTHON_DIR}"
-RDEPENDS_${PN}-python = "python-core"
+PACKAGES += "python-dtn"
+DESCRIPTION_python-dtn = "Python bindings to the DTN API"
+PR_python-dtn = "ml1"
+FILES_python-dtn = "${libdir}/${PYTHON_DIR}"
+RDEPENDS_python-dtn = "python-core"
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug"
-- 
cgit v1.2.3


From aad34e853c331b32d5a74532c766877e79bdae6d Mon Sep 17 00:00:00 2001
From: Ovidiu Sas <sip.nslu@gmail.com>
Date: Sun, 13 Jan 2008 00:44:38 +0000
Subject: enable tcpdump for sluos

---
 packages/meta/slugos-packages.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 3452f4e3bd..04e4425a3b 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -194,6 +194,7 @@ SLUGOS_PACKAGES = "\
 	sudo \
 	sysfsutils \
 	tar \
+	tcpdump \
 	thttpd \
 	tiff \
 	tzdata \
-- 
cgit v1.2.3


From 6244c8d371de565e60965faa19a14d48ab2e1006 Mon Sep 17 00:00:00 2001
From: Ovidiu Sas <sip.nslu@gmail.com>
Date: Sun, 13 Jan 2008 01:17:35 +0000
Subject: asterisk: 1.4.11 -> 1.4.17

---
 packages/asterisk/asterisk-1.4.17/.mtn2git_empty   |   0
 packages/asterisk/asterisk-1.4.17/Makefile.patch   |  20 +++
 packages/asterisk/asterisk-1.4.17/init             |  77 ++++++++++
 packages/asterisk/asterisk-1.4.17/logrotate        |  12 ++
 packages/asterisk/asterisk-1.4.17/sounds.xml.patch |  18 +++
 packages/asterisk/asterisk-1.4.17/volatiles        |   7 +
 packages/asterisk/asterisk_1.4.17.bb               | 171 +++++++++++++++++++++
 7 files changed, 305 insertions(+)
 create mode 100644 packages/asterisk/asterisk-1.4.17/.mtn2git_empty
 create mode 100644 packages/asterisk/asterisk-1.4.17/Makefile.patch
 create mode 100644 packages/asterisk/asterisk-1.4.17/init
 create mode 100644 packages/asterisk/asterisk-1.4.17/logrotate
 create mode 100644 packages/asterisk/asterisk-1.4.17/sounds.xml.patch
 create mode 100644 packages/asterisk/asterisk-1.4.17/volatiles
 create mode 100644 packages/asterisk/asterisk_1.4.17.bb

diff --git a/packages/asterisk/asterisk-1.4.17/.mtn2git_empty b/packages/asterisk/asterisk-1.4.17/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/asterisk/asterisk-1.4.17/Makefile.patch b/packages/asterisk/asterisk-1.4.17/Makefile.patch
new file mode 100644
index 0000000000..a6d630949e
--- /dev/null
+++ b/packages/asterisk/asterisk-1.4.17/Makefile.patch
@@ -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
diff --git a/packages/asterisk/asterisk-1.4.17/init b/packages/asterisk/asterisk-1.4.17/init
new file mode 100644
index 0000000000..f26ad38db3
--- /dev/null
+++ b/packages/asterisk/asterisk-1.4.17/init
@@ -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
+
diff --git a/packages/asterisk/asterisk-1.4.17/logrotate b/packages/asterisk/asterisk-1.4.17/logrotate
new file mode 100644
index 0000000000..dfd25ee55c
--- /dev/null
+++ b/packages/asterisk/asterisk-1.4.17/logrotate
@@ -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
+}
+
diff --git a/packages/asterisk/asterisk-1.4.17/sounds.xml.patch b/packages/asterisk/asterisk-1.4.17/sounds.xml.patch
new file mode 100644
index 0000000000..b549fea132
--- /dev/null
+++ b/packages/asterisk/asterisk-1.4.17/sounds.xml.patch
@@ -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>
diff --git a/packages/asterisk/asterisk-1.4.17/volatiles b/packages/asterisk/asterisk-1.4.17/volatiles
new file mode 100644
index 0000000000..c68e786c90
--- /dev/null
+++ b/packages/asterisk/asterisk-1.4.17/volatiles
@@ -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
diff --git a/packages/asterisk/asterisk_1.4.17.bb b/packages/asterisk/asterisk_1.4.17.bb
new file mode 100644
index 0000000000..fb64581364
--- /dev/null
+++ b/packages/asterisk/asterisk_1.4.17.bb
@@ -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.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"
-- 
cgit v1.2.3


From a7870a0693810b056e0e2ef4a187b43cd6de7733 Mon Sep 17 00:00:00 2001
From: Ovidiu Sas <sip.nslu@gmail.com>
Date: Sun, 13 Jan 2008 01:36:56 +0000
Subject: add asterisk sound files for 1.4 version

---
 .../asterisk-core-sounds-en-alaw/.mtn2git_empty    |  0
 .../asterisk-core-sounds-en-alaw_1.4.7.bb          | 46 +++++++++++++++++++++
 .../asterisk-core-sounds-en-g729/.mtn2git_empty    |  0
 .../asterisk-core-sounds-en-g729_1.4.7.bb          | 46 +++++++++++++++++++++
 .../asterisk-core-sounds-en-gsm/.mtn2git_empty     |  0
 .../asterisk-core-sounds-en-gsm_1.4.7.bb           | 48 ++++++++++++++++++++++
 .../asterisk-core-sounds-en-ulaw/.mtn2git_empty    |  0
 .../asterisk-core-sounds-en-ulaw_1.4.7.bb          | 46 +++++++++++++++++++++
 .../asterisk-extra-sounds-en-alaw/.mtn2git_empty   |  0
 .../asterisk-extra-sounds-en-alaw_1.4.6.bb         | 37 +++++++++++++++++
 .../asterisk-extra-sounds-en-g729/.mtn2git_empty   |  0
 .../asterisk-extra-sounds-en-g729_1.4.6.bb         | 37 +++++++++++++++++
 .../asterisk-extra-sounds-en-gsm/.mtn2git_empty    |  0
 .../asterisk-extra-sounds-en-gsm_1.4.6.bb          | 37 +++++++++++++++++
 .../asterisk-extra-sounds-en-ulaw/.mtn2git_empty   |  0
 .../asterisk-extra-sounds-en-ulaw_1.4.6.bb         | 37 +++++++++++++++++
 packages/asterisk-moh-freeplay-alaw/.mtn2git_empty |  0
 .../asterisk-moh-freeplay-alaw_0.0.0.bb            | 22 ++++++++++
 packages/asterisk-moh-freeplay-g729/.mtn2git_empty |  0
 .../asterisk-moh-freeplay-g729_0.0.0.bb            | 20 +++++++++
 packages/asterisk-moh-freeplay-gsm/.mtn2git_empty  |  0
 .../asterisk-moh-freeplay-gsm_0.0.0.bb             | 20 +++++++++
 packages/asterisk-moh-freeplay-ulaw/.mtn2git_empty |  0
 .../asterisk-moh-freeplay-ulaw_0.0.0.bb            | 22 ++++++++++
 24 files changed, 418 insertions(+)
 create mode 100644 packages/asterisk-core-sounds-en-alaw/.mtn2git_empty
 create mode 100644 packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb
 create mode 100644 packages/asterisk-core-sounds-en-g729/.mtn2git_empty
 create mode 100644 packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb
 create mode 100644 packages/asterisk-core-sounds-en-gsm/.mtn2git_empty
 create mode 100644 packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb
 create mode 100644 packages/asterisk-core-sounds-en-ulaw/.mtn2git_empty
 create mode 100644 packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb
 create mode 100644 packages/asterisk-extra-sounds-en-alaw/.mtn2git_empty
 create mode 100644 packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb
 create mode 100644 packages/asterisk-extra-sounds-en-g729/.mtn2git_empty
 create mode 100644 packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb
 create mode 100644 packages/asterisk-extra-sounds-en-gsm/.mtn2git_empty
 create mode 100644 packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb
 create mode 100644 packages/asterisk-extra-sounds-en-ulaw/.mtn2git_empty
 create mode 100644 packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb
 create mode 100644 packages/asterisk-moh-freeplay-alaw/.mtn2git_empty
 create mode 100644 packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb
 create mode 100644 packages/asterisk-moh-freeplay-g729/.mtn2git_empty
 create mode 100644 packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb
 create mode 100644 packages/asterisk-moh-freeplay-gsm/.mtn2git_empty
 create mode 100644 packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb
 create mode 100644 packages/asterisk-moh-freeplay-ulaw/.mtn2git_empty
 create mode 100644 packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb

diff --git a/packages/asterisk-core-sounds-en-alaw/.mtn2git_empty b/packages/asterisk-core-sounds-en-alaw/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb b/packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb
new file mode 100644
index 0000000000..f1b3d12cd7
--- /dev/null
+++ b/packages/asterisk-core-sounds-en-alaw/asterisk-core-sounds-en-alaw_1.4.7.bb
@@ -0,0 +1,46 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-${PV}.tar.gz"
+
+do_install() {
+	install -d ${D}${localstatedir}/lib/asterisk/sounds
+	#install -m 644 ${WORKDIR}/*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
+	#install -m 644 ${WORKDIR}/CREDITS* ${D}${localstatedir}/lib/asterisk/sounds/
+	#install -m 644 ${WORKDIR}/core-sounds-en.txt ${D}${localstatedir}/lib/asterisk/sounds/
+	mv ${WORKDIR}/*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/dictate
+	#install -m 644 ${WORKDIR}/dictate/* ${D}${localstatedir}/lib/asterisk/sounds/dictate/
+	mv ${WORKDIR}/dictate ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/digits
+	#install -m 644 ${WORKDIR}/digits/* ${D}${localstatedir}/lib/asterisk/sounds/digits/
+	mv ${WORKDIR}/digits ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/followme
+	#install -m 644 ${WORKDIR}/followme/* ${D}${localstatedir}/lib/asterisk/sounds/followme/
+	mv ${WORKDIR}/followme ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/letters
+	#install -m 644 ${WORKDIR}/letters/* ${D}${localstatedir}/lib/asterisk/sounds/letters/
+	mv ${WORKDIR}/letters ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
+	#install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
+	mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/silence
+	#install -m 644 ${WORKDIR}/silence/* ${D}${localstatedir}/lib/asterisk/sounds/silence/
+	mv ${WORKDIR}/silence ${D}${localstatedir}/lib/asterisk/sounds/
+}
+
+pkg_postinst_prepend() {
+	chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/sounds/
+}
+
+
diff --git a/packages/asterisk-core-sounds-en-g729/.mtn2git_empty b/packages/asterisk-core-sounds-en-g729/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb b/packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb
new file mode 100644
index 0000000000..205c8ff067
--- /dev/null
+++ b/packages/asterisk-core-sounds-en-g729/asterisk-core-sounds-en-g729_1.4.7.bb
@@ -0,0 +1,46 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-${PV}.tar.gz"
+
+do_install() {
+	install -d ${D}${localstatedir}/lib/asterisk/sounds
+	#install -m 644 ${WORKDIR}/*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
+	#install -m 644 ${WORKDIR}/CREDITS* ${D}${localstatedir}/lib/asterisk/sounds/
+	#install -m 644 ${WORKDIR}/core-sounds-en.txt ${D}${localstatedir}/lib/asterisk/sounds/
+	mv ${WORKDIR}/*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/dictate
+	#install -m 644 ${WORKDIR}/dictate/* ${D}${localstatedir}/lib/asterisk/sounds/dictate/
+	mv ${WORKDIR}/dictate ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/digits
+	#install -m 644 ${WORKDIR}/digits/* ${D}${localstatedir}/lib/asterisk/sounds/digits/
+	mv ${WORKDIR}/digits ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/followme
+	#install -m 644 ${WORKDIR}/followme/* ${D}${localstatedir}/lib/asterisk/sounds/followme/
+	mv ${WORKDIR}/followme ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/letters
+	#install -m 644 ${WORKDIR}/letters/* ${D}${localstatedir}/lib/asterisk/sounds/letters/
+	mv ${WORKDIR}/letters ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
+	#install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
+	mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/silence
+	#install -m 644 ${WORKDIR}/silence/* ${D}${localstatedir}/lib/asterisk/sounds/silence/
+	mv ${WORKDIR}/silence ${D}${localstatedir}/lib/asterisk/sounds/
+}
+
+pkg_postinst_prepend() {
+	chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/sounds/
+}
+
+
diff --git a/packages/asterisk-core-sounds-en-gsm/.mtn2git_empty b/packages/asterisk-core-sounds-en-gsm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb b/packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb
new file mode 100644
index 0000000000..2a46c74f84
--- /dev/null
+++ b/packages/asterisk-core-sounds-en-gsm/asterisk-core-sounds-en-gsm_1.4.7.bb
@@ -0,0 +1,48 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-${PV}.tar.gz"
+
+do_install() {
+	install -d ${D}${localstatedir}/lib/asterisk/sounds
+	#install -m 644 ${WORKDIR}/*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
+	#install -m 644 ${WORKDIR}/CREDITS* ${D}${localstatedir}/lib/asterisk/sounds/
+	#install -m 644 ${WORKDIR}/core-sounds-en.txt ${D}${localstatedir}/lib/asterisk/sounds/
+	mv ${WORKDIR}/*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
+	mv ${WORKDIR}/CREDITS* ${D}${localstatedir}/lib/asterisk/sounds/
+	mv ${WORKDIR}/core-sounds-en.txt ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/dictate
+	#install -m 644 ${WORKDIR}/dictate/* ${D}${localstatedir}/lib/asterisk/sounds/dictate/
+	mv ${WORKDIR}/dictate ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/digits
+	#install -m 644 ${WORKDIR}/digits/* ${D}${localstatedir}/lib/asterisk/sounds/digits/
+	mv ${WORKDIR}/digits ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/followme
+	#install -m 644 ${WORKDIR}/followme/* ${D}${localstatedir}/lib/asterisk/sounds/followme/
+	mv ${WORKDIR}/followme ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/letters
+	#install -m 644 ${WORKDIR}/letters/* ${D}${localstatedir}/lib/asterisk/sounds/letters/
+	mv ${WORKDIR}/letters ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
+	#install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
+	mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/silence
+	#install -m 644 ${WORKDIR}/silence/* ${D}${localstatedir}/lib/asterisk/sounds/silence/
+	mv ${WORKDIR}/silence ${D}${localstatedir}/lib/asterisk/sounds/
+}
+
+pkg_postinst_prepend() {
+	chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/sounds/
+}
+
+
diff --git a/packages/asterisk-core-sounds-en-ulaw/.mtn2git_empty b/packages/asterisk-core-sounds-en-ulaw/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb b/packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb
new file mode 100644
index 0000000000..c29ae60f99
--- /dev/null
+++ b/packages/asterisk-core-sounds-en-ulaw/asterisk-core-sounds-en-ulaw_1.4.7.bb
@@ -0,0 +1,46 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-${PV}.tar.gz"
+
+do_install() {
+	install -d ${D}${localstatedir}/lib/asterisk/sounds
+	#install -m 644 ${WORKDIR}/*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
+	#install -m 644 ${WORKDIR}/CREDITS* ${D}${localstatedir}/lib/asterisk/sounds/
+	#install -m 644 ${WORKDIR}/core-sounds-en.txt ${D}${localstatedir}/lib/asterisk/sounds/
+	mv ${WORKDIR}/*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/dictate
+	#install -m 644 ${WORKDIR}/dictate/* ${D}${localstatedir}/lib/asterisk/sounds/dictate/
+	mv ${WORKDIR}/dictate ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/digits
+	#install -m 644 ${WORKDIR}/digits/* ${D}${localstatedir}/lib/asterisk/sounds/digits/
+	mv ${WORKDIR}/digits ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/followme
+	#install -m 644 ${WORKDIR}/followme/* ${D}${localstatedir}/lib/asterisk/sounds/followme/
+	mv ${WORKDIR}/followme ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/letters
+	#install -m 644 ${WORKDIR}/letters/* ${D}${localstatedir}/lib/asterisk/sounds/letters/
+	mv ${WORKDIR}/letters ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
+	#install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
+	mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/silence
+	#install -m 644 ${WORKDIR}/silence/* ${D}${localstatedir}/lib/asterisk/sounds/silence/
+	mv ${WORKDIR}/silence ${D}${localstatedir}/lib/asterisk/sounds/
+}
+
+pkg_postinst_prepend() {
+	chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/sounds/
+}
+
+
diff --git a/packages/asterisk-extra-sounds-en-alaw/.mtn2git_empty b/packages/asterisk-extra-sounds-en-alaw/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb b/packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb
new file mode 100644
index 0000000000..f18d46258f
--- /dev/null
+++ b/packages/asterisk-extra-sounds-en-alaw/asterisk-extra-sounds-en-alaw_1.4.6.bb
@@ -0,0 +1,37 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-${PV}.tar.gz"
+
+do_install() {
+	install -d ${D}${localstatedir}/lib/asterisk/sounds
+	# HACK: moving the files in chunkes (too many of them)
+	rm ${WORKDIR}/conf-thereare.alaw
+	rm ${WORKDIR}/invalid.alaw
+	mv ${WORKDIR}/[a-d]*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
+	mv ${WORKDIR}/[e-l]*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
+	mv ${WORKDIR}/*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
+	#install -m 644 ${WORKDIR}/*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/ha
+	#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
+	mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
+	#install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
+	mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
+	#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
+	mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
+}
+
+pkg_postinst_prepend() {
+	chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/sounds/
+}
+
+
diff --git a/packages/asterisk-extra-sounds-en-g729/.mtn2git_empty b/packages/asterisk-extra-sounds-en-g729/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb b/packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb
new file mode 100644
index 0000000000..48fabbbdc4
--- /dev/null
+++ b/packages/asterisk-extra-sounds-en-g729/asterisk-extra-sounds-en-g729_1.4.6.bb
@@ -0,0 +1,37 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-${PV}.tar.gz"
+
+do_install() {
+	install -d ${D}${localstatedir}/lib/asterisk/sounds
+	# HACK: moving the files in chunks (too many files)
+	rm ${WORKDIR}/conf-thereare.g729
+	rm ${WORKDIR}/invalid.g729
+	mv ${WORKDIR}/[a-d]*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
+	mv ${WORKDIR}/[e-l]*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
+	mv ${WORKDIR}/*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
+	#install -m 644 ${WORKDIR}/*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/ha
+	#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
+	mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
+	#install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
+	mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
+	#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
+	mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
+}
+
+pkg_postinst_prepend() {
+	chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/sounds/
+}
+
+
diff --git a/packages/asterisk-extra-sounds-en-gsm/.mtn2git_empty b/packages/asterisk-extra-sounds-en-gsm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb b/packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb
new file mode 100644
index 0000000000..da463391b1
--- /dev/null
+++ b/packages/asterisk-extra-sounds-en-gsm/asterisk-extra-sounds-en-gsm_1.4.6.bb
@@ -0,0 +1,37 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-gsm-${PV}.tar.gz"
+
+do_install() {
+	install -d ${D}${localstatedir}/lib/asterisk/sounds
+	# HACK: moving the files in chunks (too many files)
+	rm ${WORKDIR}/conf-thereare.gsm
+	rm ${WORKDIR}/invalid.gsm
+	mv ${WORKDIR}/[a-d]*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
+	mv ${WORKDIR}/[e-l]*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
+	mv ${WORKDIR}/*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
+	#install -m 644 ${WORKDIR}/*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/ha
+	#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
+	mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
+	#install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
+	mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
+	#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
+	mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
+}
+
+pkg_postinst_prepend() {
+	chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/sounds/
+}
+
+
diff --git a/packages/asterisk-extra-sounds-en-ulaw/.mtn2git_empty b/packages/asterisk-extra-sounds-en-ulaw/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb b/packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb
new file mode 100644
index 0000000000..6a6f3f5fba
--- /dev/null
+++ b/packages/asterisk-extra-sounds-en-ulaw/asterisk-extra-sounds-en-ulaw_1.4.6.bb
@@ -0,0 +1,37 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-${PV}.tar.gz"
+
+do_install() {
+	install -d ${D}${localstatedir}/lib/asterisk/sounds
+	# HACK: moving the files in chunkes (too many of them)
+	rm ${WORKDIR}/conf-thereare.ulaw
+	rm ${WORKDIR}/invalid.ulaw
+	mv ${WORKDIR}/[a-d]*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
+	mv ${WORKDIR}/[e-l]*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
+	mv ${WORKDIR}/*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
+	#install -m 644 ${WORKDIR}/*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/ha
+	#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
+	mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
+	#install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
+	mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
+
+	#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
+	#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
+	mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
+}
+
+pkg_postinst_prepend() {
+	chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/sounds/
+}
+
+
diff --git a/packages/asterisk-moh-freeplay-alaw/.mtn2git_empty b/packages/asterisk-moh-freeplay-alaw/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb b/packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb
new file mode 100644
index 0000000000..96c662444e
--- /dev/null
+++ b/packages/asterisk-moh-freeplay-alaw/asterisk-moh-freeplay-alaw_0.0.0.bb
@@ -0,0 +1,22 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-alaw.tar.gz"
+
+do_install() {
+	install -d ${D}${localstatedir}/lib/asterisk/moh
+	#install -m 644 ${WORKDIR}/*.alaw ${D}${localstatedir}/lib/asterisk/moh/
+	#install -m 644 ${WORKDIR}/LICENSE-* ${D}${localstatedir}/lib/asterisk/moh/
+	mv ${WORKDIR}/*.alaw ${D}${localstatedir}/lib/asterisk/moh/
+	mv ${WORKDIR}/LICENSE-* ${D}${localstatedir}/lib/asterisk/moh/
+}
+
+pkg_postinst_prepend() {
+	chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/moh/
+}
+
+
diff --git a/packages/asterisk-moh-freeplay-g729/.mtn2git_empty b/packages/asterisk-moh-freeplay-g729/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb b/packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb
new file mode 100644
index 0000000000..581e6bf84f
--- /dev/null
+++ b/packages/asterisk-moh-freeplay-g729/asterisk-moh-freeplay-g729_0.0.0.bb
@@ -0,0 +1,20 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-g729.tar.gz"
+
+do_install() {
+	install -d ${D}${localstatedir}/lib/asterisk/moh
+	install -m 644 ${WORKDIR}/*.g729 ${D}${localstatedir}/lib/asterisk/moh/
+	install -m 644 ${WORKDIR}/LICENSE-* ${D}${localstatedir}/lib/asterisk/moh/
+}
+
+pkg_postinst_prepend() {
+	chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/moh/
+}
+
+
diff --git a/packages/asterisk-moh-freeplay-gsm/.mtn2git_empty b/packages/asterisk-moh-freeplay-gsm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb b/packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb
new file mode 100644
index 0000000000..e45c3eec4e
--- /dev/null
+++ b/packages/asterisk-moh-freeplay-gsm/asterisk-moh-freeplay-gsm_0.0.0.bb
@@ -0,0 +1,20 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-gsm.tar.gz"
+
+do_install() {
+	install -d ${D}${localstatedir}/lib/asterisk/moh
+	install -m 644 ${WORKDIR}/*.gsm ${D}${localstatedir}/lib/asterisk/moh/
+	install -m 644 ${WORKDIR}/LICENSE-* ${D}${localstatedir}/lib/asterisk/moh/
+}
+
+pkg_postinst_prepend() {
+	chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/moh/
+}
+
+
diff --git a/packages/asterisk-moh-freeplay-ulaw/.mtn2git_empty b/packages/asterisk-moh-freeplay-ulaw/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb b/packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb
new file mode 100644
index 0000000000..e0e0293c34
--- /dev/null
+++ b/packages/asterisk-moh-freeplay-ulaw/asterisk-moh-freeplay-ulaw_0.0.0.bb
@@ -0,0 +1,22 @@
+DESCRIPTION="The Asterisk open source software PBX"
+HOMEPAGE="http://www.asterisk.org"
+SECTION = "voip"
+LICENSE="GPL"
+#DEPENDS="asterisk"
+#PR = "r1"
+
+SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-ulaw.tar.gz"
+
+do_install() {
+	install -d ${D}${localstatedir}/lib/asterisk/moh
+	#install -m 644 ${WORKDIR}/*.ulaw ${D}${localstatedir}/lib/asterisk/moh/
+	#install -m 644 ${WORKDIR}/LICENSE-* ${D}${localstatedir}/lib/asterisk/moh/
+	mv ${WORKDIR}/*.ulaw ${D}${localstatedir}/lib/asterisk/moh/
+	mv ${WORKDIR}/LICENSE-* ${D}${localstatedir}/lib/asterisk/moh/
+}
+
+pkg_postinst_prepend() {
+	chown -R asterisk:asterisk ${localstatedir}/lib/asterisk/moh/
+}
+
+
-- 
cgit v1.2.3


From 7bb6e2b9b70ed80ef84d07abe7d467cc88a9fd9c Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Sun, 13 Jan 2008 04:44:03 +0000
Subject: roadmap: fix zroadmap, unify with roadmap-gtk2. * roadmap_path.patch:
 fix hard coded default config/map path * not packing zroadgps icon/desktop as
 it can be launched in the roadmap (>1.1.0) program

---
 packages/roadmap/files/roadmap_path.patch | 57 +++++++++++++++++++++++++++++++
 packages/roadmap/roadmap-gtk2.inc         | 21 +++---------
 packages/roadmap/roadmap-gtk2_1.1.0.bb    |  3 +-
 packages/roadmap/roadmap-gtk2_cvs.bb      |  3 +-
 packages/roadmap/roadmap.inc              | 12 ++++++-
 packages/roadmap/zroadmap.inc             | 10 ++++++
 packages/roadmap/zroadmap_1.1.0.bb        | 37 +++-----------------
 packages/roadmap/zroadmap_cvs.bb          | 39 +++------------------
 8 files changed, 95 insertions(+), 87 deletions(-)
 create mode 100644 packages/roadmap/files/roadmap_path.patch

diff --git a/packages/roadmap/files/roadmap_path.patch b/packages/roadmap/files/roadmap_path.patch
new file mode 100644
index 0000000000..7a7ab74261
--- /dev/null
+++ b/packages/roadmap/files/roadmap_path.patch
@@ -0,0 +1,57 @@
+--- src/unix/roadmap_path.c.old	2008-01-12 21:08:03.000000000 -0600
++++ src/unix/roadmap_path.c	2008-01-12 21:29:40.000000000 -0600
+@@ -93,23 +93,18 @@ static const char *RoadMapPathConfig[] =
+    "/opt/QtPalmtop/share/roadmap",
+    "/mnt/cf/QtPalmtop/share/roadmap",
+    "/mnt/card/QtPalmtop/share/roadmap",
+-#else
++#endif
+    /* This is for standard Unix configurations. */
+    "/etc/roadmap",
+    "/usr/local/share/roadmap",
+    "/usr/share/roadmap",
+-#endif
+    NULL
+ };
+ static const char *RoadMapPathConfigPreferred =
+ #ifdef ROADMAP_CONFIG_DIR
+                         ROADMAP_CONFIG_DIR;
+ #else
+-#ifdef QWS
+-                      "/mnt/cf/QtPalmtop/share/roadmap";
+-#else
+-                      "/usr/local/share/roadmap";
+-#endif
++                      "/usr/share/roadmap";
+ #endif
+ 
+ 
+@@ -123,7 +118,7 @@ static const char *RoadMapPathMaps[] = {
+    "/opt/QtPalmtop/share/roadmap/...",
+    "/mnt/cf/QtPalmtop/share/roadmap/...",
+    "/mnt/card/QtPalmtop/share/roadmap/...",
+-#else
++#endif
+    /* This is for standard Unix configurations. */
+    "&/maps/...",
+    "/var/lib/roadmap/...",
+@@ -134,19 +129,14 @@ static const char *RoadMapPathMaps[] = {
+     */
+    "/usr/local/share/roadmap/...",
+    "/usr/share/roadmap/...",
+-#endif
+    NULL
+ };
+ static const char *RoadMapPathMapsPreferred =
+ #ifdef ROADMAP_MAP_DIR
+                         ROADMAP_MAP_DIR;
+ #else
+-#ifdef QWS
+-                      "/mnt/cf/QtPalmtop/share/roadmap";
+-#else
+                       "/var/lib/roadmap";
+ #endif
+-#endif
+ 
+ /* The default path for the icon files (the "icons" path): */
+ static const char *RoadMapPathIcons[] = {
diff --git a/packages/roadmap/roadmap-gtk2.inc b/packages/roadmap/roadmap-gtk2.inc
index f64ad8dbfa..6d0db5099b 100644
--- a/packages/roadmap/roadmap-gtk2.inc
+++ b/packages/roadmap/roadmap-gtk2.inc
@@ -2,23 +2,10 @@ require roadmap.inc
 
 SECTION = "x11/applications"
 
-DEPENDS = "agg expat gtk+"
+DEPENDS += "agg gtk+"
 
-EXTRA_OEMAKE= "DESKTOP=GTK2 AGG=rgb565 \
-               POPT=NO SCRIPTS= BUILD= \ 
-               INSTALLDIR=/usr DESTDIR=${D}"
+EXTRA_OEMAKE = "DESKTOP=GTK2 AGG=rgb565 \
+                POPT=NO SCRIPTS= BUILD= INSTALLDIR=/usr DESTDIR=${D} \
+                desktopdir=${D}${datadir}/applications"
 
 CFLAGS += " -I${STAGING_INCDIR}/agg2 "
-
-do_compile() {
-        oe_runmake runtime $(TOOLS) icons
-}
-
-do_install() {
-        oe_runmake install
-        mv ${D}/usr/applications ${D}/usr/share/
-
-        install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
-}
-
-FILES_${PN} += "${datadir}/roadmap"
diff --git a/packages/roadmap/roadmap-gtk2_1.1.0.bb b/packages/roadmap/roadmap-gtk2_1.1.0.bb
index 5855413cbe..1e34238106 100644
--- a/packages/roadmap/roadmap-gtk2_1.1.0.bb
+++ b/packages/roadmap/roadmap-gtk2_1.1.0.bb
@@ -1,10 +1,11 @@
 require roadmap-gtk2.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \
            file://cross.patch;patch=1;pnum=2 \
            file://options.mk.patch;patch=1;pnum=2 \
+           file://roadmap_path.patch;patch=1 \
            file://roadmap.desktop.patch;patch=1 \
 	   http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz "
 
diff --git a/packages/roadmap/roadmap-gtk2_cvs.bb b/packages/roadmap/roadmap-gtk2_cvs.bb
index 2efa67821a..9d7adbaa3e 100644
--- a/packages/roadmap/roadmap-gtk2_cvs.bb
+++ b/packages/roadmap/roadmap-gtk2_cvs.bb
@@ -1,11 +1,12 @@
 require roadmap-gtk2.inc
 
 PV = "0.0+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
            file://cross.patch;patch=1;pnum=2 \
            file://options.mk.patch;patch=1;pnum=2 \
+           file://roadmap_path.patch;patch=1 \
 	   http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz "
 
 S = "${WORKDIR}/roadmap/src"
diff --git a/packages/roadmap/roadmap.inc b/packages/roadmap/roadmap.inc
index e9598df178..43b4b1cd3d 100644
--- a/packages/roadmap/roadmap.inc
+++ b/packages/roadmap/roadmap.inc
@@ -4,5 +4,15 @@ AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
 HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
 LICENSE = "GPL"
 RRECOMMENDS = "gpsd flite"
+DEPENDS = "expat"
 
-PARALLEL_MAKE = ""
+FILES_${PN} += "${datadir}/roadmap"
+
+do_compile() {
+        oe_runmake runtime ${TOOLS} icons
+}
+
+do_install() {
+        oe_runmake install
+        install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
+}
diff --git a/packages/roadmap/zroadmap.inc b/packages/roadmap/zroadmap.inc
index acee708837..3c99f9d234 100644
--- a/packages/roadmap/zroadmap.inc
+++ b/packages/roadmap/zroadmap.inc
@@ -1,5 +1,7 @@
 require roadmap.inc
 
+PARALLEL_MAKE = ""
+
 SECTION = "opie/applications"
 
 inherit palmtop
@@ -7,7 +9,15 @@ inherit palmtop
 QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}'
 QT_LIBRARY_append_c7x0 = " -laticore"
 
+EXTRA_OEMAKE = "DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \
+                POPT=NO SCRIPTS= BUILD= INSTALLDIR=/usr DESTDIR=${D} \
+                icondir=${D}${palmtopdir}/pics \
+                desktopdir=${D}${palmtopdir}/apps/Applications \
+                CFLAGS="-DQWS -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \
+                LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}""
+
 do_configure() {
 	echo removing pregenerated stuff
 	find . -name "moc*"|xargs rm -f
 }
+
diff --git a/packages/roadmap/zroadmap_1.1.0.bb b/packages/roadmap/zroadmap_1.1.0.bb
index bafcc7c27d..b06e4e7ad0 100644
--- a/packages/roadmap/zroadmap_1.1.0.bb
+++ b/packages/roadmap/zroadmap_1.1.0.bb
@@ -1,45 +1,16 @@
 require zroadmap.inc
 
-DEPENDS = "expat"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \
            file://cross.patch;patch=1;pnum=2 \
+           file://options.mk.patch;patch=1;pnum=2 \
            file://qt/qt2-fixes.patch;patch=1 \
            file://qt/qt_canvas.patch;patch=1 \
            file://qt/qt_main.patch;patch=1 \
            file://qt/roadmap_main.patch;patch=1 \
+           file://roadmap_path.patch;patch=1 \
            file://roadmap.desktop.patch;patch=1 \
-           http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \
-           file://zroadgps.png"
+           http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz"
 
 S = "${WORKDIR}/roadmap-${PV}/src"
-
-EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} POPT=NO \
-                CFLAGS="-DQWS -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \
-                LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" '
-
-do_compile() {
-	oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a
-	oe_runmake -C gpx libgpx.a
-	oe_runmake -C unix libosroadmap.a
-	oe_runmake -C qt qtroadmap qtroadgps
-}
-
-do_install() {
-        install -d ${D}${palmtopdir}/bin
-	install -d ${D}${palmtopdir}/apps/Applications
-	install -d ${D}${palmtopdir}/pics
-        install -d ${D}${palmtopdir}/share/roadmap
-
-        install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap
-	install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps
-
-	install -m 0644 icons/*.png ${D}${palmtopdir}/pics/
-	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
-
-        install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/
-	
-        install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/
-	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
-}
diff --git a/packages/roadmap/zroadmap_cvs.bb b/packages/roadmap/zroadmap_cvs.bb
index cb81756041..383ffe8f69 100644
--- a/packages/roadmap/zroadmap_cvs.bb
+++ b/packages/roadmap/zroadmap_cvs.bb
@@ -1,42 +1,13 @@
 require zroadmap.inc
 
-DEPENDS = "expat"
-PV = "1.1.0+cvs${SRCDATE}"
-PR = "r1"
+PV = "0.0+cvs${SRCDATE}"
+PR = "r0"
 
 SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
            file://cross.patch;patch=1;pnum=2 \
+           file://options.mk.patch;patch=1;pnum=2 \
            file://qt/qt2-fixes.patch;patch=1 \
-           http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \
-           file://zroadgps.png"
+           file://roadmap_path.patch;patch=1 \
+           http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz"
 
 S = "${WORKDIR}/roadmap/src"
-
-EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \
-                CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \
-                LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" '
-
-do_compile() {
-	oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a
-	oe_runmake -C gpx libgpx.a
-	oe_runmake -C unix libosroadmap.a
-	oe_runmake -C qt qtroadmap qtroadgps
-}
-
-do_install() {
-        install -d ${D}${palmtopdir}/bin
-	install -d ${D}${palmtopdir}/apps/Applications
-	install -d ${D}${palmtopdir}/pics
-        install -d ${D}${palmtopdir}/share/roadmap
-
-        install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap
-	install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps
-
-	install -m 0644 icons/*.png ${D}${palmtopdir}/pics/
-	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
-
-        install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/
-	
-        install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/
-	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
-}
-- 
cgit v1.2.3