From 6377115cdc3a551e077d51f56e84811d1e03cb4e Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 16 Mar 2007 15:57:41 +0000
Subject: slugos-init: improve the handling of the ready led for the nas100d
 (i.e. stop it blinking when everything is up)

---
 packages/slugos-init/files/leds          | 5 +++--
 packages/slugos-init/slugos-init_0.10.bb | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/slugos-init/files/leds b/packages/slugos-init/files/leds
index f5011f8bad..8043dae682 100644
--- a/packages/slugos-init/files/leds
+++ b/packages/slugos-init/files/leds
@@ -18,8 +18,9 @@ esac
 #  handle the 'user' setting.
 led_user_default(){
 	case "$(machine)" in
-	nslu2)	echo -n "cpu-idle";;
-	*)	echo -n "cpu";;
+	    nslu2)	echo -n "cpu-idle";;
+	    nas100d)	echo -n "on";;
+	    *)		echo -n "cpu";;
 	esac
 }
 #
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index 55fea3e120..56f3c7242a 100644
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r79"
+PR = "r80"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \
-- 
cgit v1.2.3


From 59928d37739880853ad653704f99ec3323e09323 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sun, 18 Mar 2007 05:39:00 +0000
Subject: freetype: add 2.3.1 from bug #1906 - Fixes problems with building
 that 2.3.0 had

---
 packages/freetype/freetype-2.3.1/.mtn2git_empty    |  0
 .../freetype/freetype-2.3.1/fix-x86_64-build.patch | 26 ++++++++++++++
 packages/freetype/freetype_2.3.1.bb                | 40 ++++++++++++++++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 packages/freetype/freetype-2.3.1/.mtn2git_empty
 create mode 100644 packages/freetype/freetype-2.3.1/fix-x86_64-build.patch
 create mode 100644 packages/freetype/freetype_2.3.1.bb

diff --git a/packages/freetype/freetype-2.3.1/.mtn2git_empty b/packages/freetype/freetype-2.3.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/freetype/freetype-2.3.1/fix-x86_64-build.patch b/packages/freetype/freetype-2.3.1/fix-x86_64-build.patch
new file mode 100644
index 0000000000..ae504dcb0b
--- /dev/null
+++ b/packages/freetype/freetype-2.3.1/fix-x86_64-build.patch
@@ -0,0 +1,26 @@
+Index: freetype-2.3.1/builds/unix/configure.raw
+===================================================================
+--- freetype-2.3.1.orig/builds/unix/configure.raw
++++ freetype-2.3.1/builds/unix/configure.raw
+@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT)
+ # checks for native programs to generate building tool
+ 
+ if test ${cross_compiling} = yes; then
+-  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc})
++  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc)
+   test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler])
+Index: freetype-2.3.1/builds/unix/configure.ac
+===================================================================
+--- freetype-2.3.1.orig/builds/unix/configure.ac
++++ freetype-2.3.1/builds/unix/configure.ac
+@@ -40,7 +40,7 @@ AC_SUBST(EXEEXT)
+ # checks for native programs to generate building tool
+ 
+ if test ${cross_compiling} = yes; then
+-  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build-gcc})
++  AC_CHECK_PROG(CC_BUILD, ${build}-gcc, ${build}-gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, gcc, gcc)
+   test -z "${CC_BUILD}" && AC_CHECK_PROG(CC_BUILD, cc, cc, , , /usr/ucb/cc)
+   test -z "${CC_BUILD}" && AC_MSG_ERROR([cannot find native C compiler])
diff --git a/packages/freetype/freetype_2.3.1.bb b/packages/freetype/freetype_2.3.1.bb
new file mode 100644
index 0000000000..79633a3d7f
--- /dev/null
+++ b/packages/freetype/freetype_2.3.1.bb
@@ -0,0 +1,40 @@
+DESCRIPTION = "Freetype font rendering library"
+SECTION = "libs"
+LICENSE = "freetype"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
+           file://fix-x86_64-build.patch;patch=1"
+#           file://no-hardcode.patch;patch=1"
+#	   file://configure.patch;patch=1 \
+S = "${WORKDIR}/freetype-${PV}"
+
+inherit autotools pkgconfig binconfig
+
+DEFAULT_PREFERENCE = "-1"
+
+LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool"
+EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'"
+EXTRA_OECONF = "--without-zlib"
+
+do_configure() {
+	cd builds/unix
+	gnu-configize
+	aclocal -I .
+	autoconf
+	cd ${S}
+	oe_runconf
+}
+
+do_compile_prepend() {
+	${BUILD_CC} -o objs/apinames src/tools/apinames.c
+}
+
+do_stage() {
+     export LIBTOOL='${LIBTOOL}'
+	 autotools_stage_includes
+	 oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
+}
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}"
-- 
cgit v1.2.3


From f2b44b324da8939104c9b2070adb9c51bf9c0f20 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sun, 18 Mar 2007 05:40:01 +0000
Subject: angstrom-2007.1: update freetype to 2.3.1

---
 conf/distro/angstrom-2007.1.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 122bd44b34..4f603f4534 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -110,7 +110,7 @@ PREFERRED_PROVIDER_esound 		?= "pulseaudio"
 
 
 PREFERRED_VERSION_fontconfig = "2.4.1"
-PREFERRED_VERSION_freetype = "2.3.0"
+PREFERRED_VERSION_freetype = "2.3.1"
 PREFERRED_VERSION_freetype-native = "2.2.1"
 PREFERRED_VERSION_cairo = "1.4.0"
 
-- 
cgit v1.2.3


From 7b1e285f471c8edd83f7a481a7e7aab5210d5ff3 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Sun, 18 Mar 2007 06:50:23 +0000
Subject: gmpc: add missing DEPENDS, curl

---
 packages/musicpd/gmpc_svn.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/musicpd/gmpc_svn.bb b/packages/musicpd/gmpc_svn.bb
index fbaea3e5f2..72fd3af1b6 100644
--- a/packages/musicpd/gmpc_svn.bb
+++ b/packages/musicpd/gmpc_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GTK+ Frontend for mpd"
 HOMEPAGE = "http://www.musicpd.org/gmpc.shtml"
 SECTION = "x11/multimedia"
 LICENSE = "GPLv2"
-DEPENDS = "libmpd gtk+ libglade gnome-vfs gob2"
+DEPENDS = "libmpd gtk+ libglade gnome-vfs gob2 curl"
 SRCDATE = "20070120"
 PV = "0.13.0+svn${SRCDATE}"
 
-- 
cgit v1.2.3


From 220c6a6b42b294f284963fce11caf047cf835b76 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sun, 18 Mar 2007 08:28:38 +0000
Subject: libgsmd: merge with openmoko svn, but put the device-specific
 initscript in a device specific directory

---
 packages/gsm/files/.mtn2git_empty           |   0
 packages/gsm/files/fic-gta01/.mtn2git_empty |   0
 packages/gsm/files/fic-gta01/gsmd           | 109 ++++++++++++++++++++++++++++
 packages/gsm/libgsmd_svn.bb                 |  17 ++++-
 4 files changed, 122 insertions(+), 4 deletions(-)
 create mode 100644 packages/gsm/files/.mtn2git_empty
 create mode 100644 packages/gsm/files/fic-gta01/.mtn2git_empty
 create mode 100644 packages/gsm/files/fic-gta01/gsmd

diff --git a/packages/gsm/files/.mtn2git_empty b/packages/gsm/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gsm/files/fic-gta01/.mtn2git_empty b/packages/gsm/files/fic-gta01/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/gsm/files/fic-gta01/gsmd b/packages/gsm/files/fic-gta01/gsmd
new file mode 100644
index 0000000000..f5e54dc06d
--- /dev/null
+++ b/packages/gsm/files/fic-gta01/gsmd
@@ -0,0 +1,109 @@
+#!/bin/sh
+#
+# gsmd	This shell script starts and stops gsmd.
+#
+# chkconfig: 345 90 40
+# description: Gsmd manages access to a serial- or USB-connected GSM
+# processname: gsmd
+
+# If you must specify special options, uncomment and modify the next line
+GSMD_OPTS="-s 115200 -F"
+# If your GSM device needs to be powered up, uncommend and modify the next line
+GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
+GSM_DEV="/dev/ttySAC0"
+
+# Source function library.
+#. /etc/rc.d/init.d/functions
+
+RETVAL=0
+prog="gsmd"
+
+start() {
+	# FIXME add check whether GSM_POW is set at all, otherwise don't try to power on
+	# Power on GSM device
+	if [ -e "${GSM_POW} ]
+	then
+		echo -n "Powering up GSM device..."
+		echo "1" > ${GSM_POW}
+		sleep 1
+		echo "done"
+	else
+		echo "GSM device not found. Aborting startup"
+		return false
+	fi
+	# Start daemons.
+	echo -n "Starting $prog: "
+	# We don't use the daemon function here because of a known bug
+	# in initlog -- it spuriously returns a nonzero status when 
+	# starting daemons that fork themselves.  See
+	# http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=130629
+	# for discussion.  Fortunately:
+	#
+	# 1. gsmd startup can't fail, or at least not in the absence of
+	# much larger resource-exhaustion problems that would be very obvious.
+	#
+	# 2. We don't need all the logging crud that daemon/initlog sets
+	# up -- gsmd does its own syslog calls.
+	#
+	if [ -e "${GPS_DEV}" ]
+	then
+		chown uucp.uucp ${GSM_DEV}
+		mkdir -fp /usr/spool/uucp
+		chown uucp.uucp /usr/spool/uucp
+		stty -F /dev/ttySAC0 crtscts
+		gsmd -p ${GPS_DEV} ${GPSD_OPTS}
+		echo "success"
+	else
+	    # User needs to symlink ${GPS_DEV} to the right thing
+	    echo "No ${GPS_DEV} device, aborting gsmd startup."
+	fi
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/gsmd
+	return $RETVAL
+}
+
+stop() {
+	# Stop daemons.
+	echo -n "Shutting down $prog: "
+        killall gsmd
+#        killproc gsmd
+	RETVAL=$?
+	echo
+	if [ $RETVAL -eq 0 ]
+	then
+	    rm -f /var/lock/subsys/gsmd;
+	fi
+	return $RETVAL
+}
+
+# See how we were called.
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart|reload)
+	stop
+	start
+	RETVAL=$?
+	;;
+  condrestart)
+	if [ -f /var/lock/subsys/gsmd ]; then
+	    stop
+	    start
+	    RETVAL=$?
+	fi
+	;;
+  status)
+#	status gsmd
+#	RETVAL=$?
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|condrestart|status}"
+	exit 1
+esac
+
+exit $RETVAL
diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb
index 860adf3b0a..99a08436ed 100644
--- a/packages/gsm/libgsmd_svn.bb
+++ b/packages/gsm/libgsmd_svn.bb
@@ -4,21 +4,30 @@ LICENSE = "GPL"
 SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 PV = "0.0+svn${SRCDATE}"
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http"
+SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
+           file://gsmd"
 S = "${WORKDIR}/gsm"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig update-rc.d
+
+INITSCRIPT_NAME = "gsmd"
+INITSCRIPT_PARAMS = "defaults 35"
 
 do_stage() {
     autotools_stage_all
 }
 
+do_install_append() {
+	install -d ${D}/${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/gsmd ${D}/${sysconfdir}/init.d/
+}
+
 PACKAGES =+ "${PN}-tools gsmd"
 RDEPENDS_${PN} = "gsmd"
 FILES_${PN}-tools = "${bindir}/*"
-FILES_gsmd = "${sbindir}/gsmd"
+FILES_gsmd = "${sbindir}/gsmd ${sysconfdir}"
 
 PACKAGES_DYNAMIC = "libgsmd* gsmd"
 
-- 
cgit v1.2.3


From 50633fb4c81554ea39f0ff6c81af8bb73d7c0462 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sun, 18 Mar 2007 08:31:48 +0000
Subject: libgsmd: contrary to popular belief at FIC, you can't actually make
 calls with a GPS, you need a GSM

---
 packages/gsm/files/fic-gta01/gsmd | 6 +++---
 packages/gsm/libgsmd_svn.bb       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/gsm/files/fic-gta01/gsmd b/packages/gsm/files/fic-gta01/gsmd
index f5e54dc06d..82fbd29f80 100644
--- a/packages/gsm/files/fic-gta01/gsmd
+++ b/packages/gsm/files/fic-gta01/gsmd
@@ -45,17 +45,17 @@ start() {
 	# 2. We don't need all the logging crud that daemon/initlog sets
 	# up -- gsmd does its own syslog calls.
 	#
-	if [ -e "${GPS_DEV}" ]
+	if [ -e "${GSM_DEV}" ]
 	then
 		chown uucp.uucp ${GSM_DEV}
 		mkdir -fp /usr/spool/uucp
 		chown uucp.uucp /usr/spool/uucp
 		stty -F /dev/ttySAC0 crtscts
-		gsmd -p ${GPS_DEV} ${GPSD_OPTS}
+		gsmd -p ${GSM_DEV} ${GSMD_OPTS}
 		echo "success"
 	else
 	    # User needs to symlink ${GPS_DEV} to the right thing
-	    echo "No ${GPS_DEV} device, aborting gsmd startup."
+	    echo "No ${GSM_DEV} device, aborting gsmd startup."
 	fi
 	RETVAL=$?
 	echo
diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb
index 99a08436ed..6f65c830ec 100644
--- a/packages/gsm/libgsmd_svn.bb
+++ b/packages/gsm/libgsmd_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 PV = "0.0+svn${SRCDATE}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd"
-- 
cgit v1.2.3


From 97c743943bbae2b2a30c3501283645e9c069a16a Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 18 Mar 2007 11:03:51 +0000
Subject: dtc: Add cross-compiled version, thanks to timtimred

---
 packages/dtc/dtc_20070216.bb | 15 +++++++++++++++
 packages/dtc/dtc_git.bb      | 15 +++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 packages/dtc/dtc_20070216.bb
 create mode 100644 packages/dtc/dtc_git.bb

diff --git a/packages/dtc/dtc_20070216.bb b/packages/dtc/dtc_20070216.bb
new file mode 100644
index 0000000000..476a84eba8
--- /dev/null
+++ b/packages/dtc/dtc_20070216.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "dtc tool"
+SECTION = "bootloader"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "http://www.jdl.com/pub/software/dtc-${PV}.tgz"
+
+S = "${WORKDIR}/dtc"
+
+inherit autotools
+
+do_install() {
+	install -m 0755 -d ${D}${bindir}	
+	install -m 755 dtc ${D}${bindir}/dtc
+}
diff --git a/packages/dtc/dtc_git.bb b/packages/dtc/dtc_git.bb
new file mode 100644
index 0000000000..e8523173a1
--- /dev/null
+++ b/packages/dtc/dtc_git.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "dtc tool"
+SECTION = "bootloader"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git"
+
+S = "${WORKDIR}/git"
+
+inherit autotools
+
+do_install() {
+	install -m 0755 -d ${D}${bindir}	
+	install -m 755 dtc ${D}${bindir}/dtc
+}
-- 
cgit v1.2.3


From 4513d932767a810f70d3450113a517c5e1f6e43a Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Sun, 18 Mar 2007 12:07:59 +0000
Subject: libgsmd: unbreak initscript some more, thanks to rwhitby for spotting
 that typo

---
 packages/gsm/files/fic-gta01/gsmd | 2 +-
 packages/gsm/libgsmd_svn.bb       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/gsm/files/fic-gta01/gsmd b/packages/gsm/files/fic-gta01/gsmd
index 82fbd29f80..c835e64063 100644
--- a/packages/gsm/files/fic-gta01/gsmd
+++ b/packages/gsm/files/fic-gta01/gsmd
@@ -21,7 +21,7 @@ prog="gsmd"
 start() {
 	# FIXME add check whether GSM_POW is set at all, otherwise don't try to power on
 	# Power on GSM device
-	if [ -e "${GSM_POW} ]
+	if [ -e "${GSM_POW}" ]
 	then
 		echo -n "Powering up GSM device..."
 		echo "1" > ${GSM_POW}
diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb
index 6f65c830ec..9a820f6f56 100644
--- a/packages/gsm/libgsmd_svn.bb
+++ b/packages/gsm/libgsmd_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 PV = "0.0+svn${SRCDATE}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd"
-- 
cgit v1.2.3


From 30b0ecaf2330bd79e909a4c0b0c283dd9e517c7a Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 18 Mar 2007 15:26:34 +0000
Subject: openpbx/spandsp: Add packages openpbx and spandsp, thanks to hillctl

---
 packages/openpbx/.mtn2git_empty                    |   0
 packages/openpbx/files/.mtn2git_empty              |   0
 packages/openpbx/files/init                        |  75 +++++++++++++++
 packages/openpbx/files/logrotate                   |  13 +++
 packages/openpbx/files/volatiles                   |   6 ++
 .../openpbx/openpbx.org-1.2-rc3/.mtn2git_empty     |   0
 .../openpbx/openpbx.org-1.2-rc3/bootstrap.patch    |  37 ++++++++
 .../openpbx/openpbx.org-1.2-rc3/openssl.m4.patch   |  46 +++++++++
 packages/openpbx/openpbx.org_1.2_rc3.bb            | 105 +++++++++++++++++++++
 packages/spandsp/spandsp_0.0.3.bb                  |  18 ++++
 10 files changed, 300 insertions(+)
 create mode 100644 packages/openpbx/.mtn2git_empty
 create mode 100644 packages/openpbx/files/.mtn2git_empty
 create mode 100644 packages/openpbx/files/init
 create mode 100644 packages/openpbx/files/logrotate
 create mode 100644 packages/openpbx/files/volatiles
 create mode 100644 packages/openpbx/openpbx.org-1.2-rc3/.mtn2git_empty
 create mode 100644 packages/openpbx/openpbx.org-1.2-rc3/bootstrap.patch
 create mode 100644 packages/openpbx/openpbx.org-1.2-rc3/openssl.m4.patch
 create mode 100644 packages/openpbx/openpbx.org_1.2_rc3.bb
 create mode 100644 packages/spandsp/spandsp_0.0.3.bb

diff --git a/packages/openpbx/.mtn2git_empty b/packages/openpbx/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/openpbx/files/.mtn2git_empty b/packages/openpbx/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/openpbx/files/init b/packages/openpbx/files/init
new file mode 100644
index 0000000000..0ce88c4626
--- /dev/null
+++ b/packages/openpbx/files/init
@@ -0,0 +1,75 @@
+#! /bin/sh 
+#
+# This is an init script for openembedded
+# Copy it to /etc/init.d/openpbx and type
+# > update-rc.d openpbx defaults 60
+#
+openpbx=/usr/sbin/openpbx
+pidfile=/var/run/openpbx.org/openpbx.pid
+
+test -x "$openpbx" || exit 0
+
+case "$1" in
+  start)
+    echo -n "Starting OpenPBX"
+    start-stop-daemon --start --quiet --exec $openpbx -- -npq
+    echo "."
+    ;;
+  stop)
+    echo -n "Stopping OpenPBX"
+    $openpbx -rx "stop gracefully"
+    sleep 4
+    if [ -f $pidfile ]; then
+      start-stop-daemon --stop --quiet --pidfile $pidfile
+    fi
+    echo "."
+    ;;
+  force-stop)
+    echo -n "Stopping OpenPBX"
+    $openpbx -rx "stop now"
+    sleep 2
+    if [ -f $pidfile ]; then
+      start-stop-daemon --stop --quiet --pidfile $pidfile
+    fi
+    echo "."
+    ;;
+  restart)
+    echo -n "Restarting OpenPBX"
+    if [ -f $pidfile ]; then
+      $openpbx -rx "restart gracefully"
+      sleep 2
+    else
+      start-stop-daemon --start --quiet --exec $openpbx -- -npq
+    fi
+    ;;
+  force-restart)
+    echo -n "Forcibly Restarting OpenPBX"
+    if [ -f $pidfile ]; then
+      $openpbx -rx "restart now"
+      sleep 2
+    else
+      start-stop-daemon --start --quiet --exec $openpbx -- -npq
+    fi
+    ;;
+  reload)
+    echo -n "Reloading OpenPBX Configuration"
+    if [ -f $pidfile ]; then
+      $openpbx -rx "reload"
+    else
+      start-stop-daemon --start --quiet --exec $openpbx -- -npq
+    fi
+    echo "."
+    ;;
+  logger-reload)
+#    echo -n "Restating OpenPBX Logger"
+    if [ -f $pidfile ]; then
+      $openpbx -rx "logger reload"
+    fi
+#    echo "."
+    ;;
+  *)
+    echo "Usage: /etc/init.d/openpbx {start|stop|force-stop|restart|force-restart|reload|logger-reload}"
+    exit 1
+esac
+
+exit 0
diff --git a/packages/openpbx/files/logrotate b/packages/openpbx/files/logrotate
new file mode 100644
index 0000000000..a0192538a3
--- /dev/null
+++ b/packages/openpbx/files/logrotate
@@ -0,0 +1,13 @@
+/var/log/openpbx.org/cdr-csv/Master.csv /var/log/openpbx.org/queue_log /var/log/openpbx.org/event_log /var/log/openpbx.org/messages 
+/var/log/openpbx.org/full {
+    daily
+    missingok
+    compress
+    delaycompress
+    rotate 30
+    sharedscripts
+    postrotate
+      /etc/init.d/openpbx logger-reload
+    endscript
+}
+
diff --git a/packages/openpbx/files/volatiles b/packages/openpbx/files/volatiles
new file mode 100644
index 0000000000..716d469e86
--- /dev/null
+++ b/packages/openpbx/files/volatiles
@@ -0,0 +1,6 @@
+d openpbx openpbx 0775 /var/run/openpbx.org none
+d openpbx openpbx 0775 /var/lib/openpbx.org none
+d openpbx openpbx 0775 /var/log/openpbx.org/cdr-csv none
+d openpbx openpbx 0775 /var/log/openpbx.org/cdr-custom none
+d openpbx openpbx 0775 /var/spool/openpbx.org/outgoing none
+d openpbx openpbx 0775 /var/spool/openpbx.org/voicemail none
diff --git a/packages/openpbx/openpbx.org-1.2-rc3/.mtn2git_empty b/packages/openpbx/openpbx.org-1.2-rc3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/openpbx/openpbx.org-1.2-rc3/bootstrap.patch b/packages/openpbx/openpbx.org-1.2-rc3/bootstrap.patch
new file mode 100644
index 0000000000..7f89772efa
--- /dev/null
+++ b/packages/openpbx/openpbx.org-1.2-rc3/bootstrap.patch
@@ -0,0 +1,37 @@
+*** openpbx.org-1.2_rc3.old/bootstrap.sh	Mon Feb 26 16:02:40 2007
+--- openpbx.org-1.2_rc3/bootstrap.sh	Mon Feb 26 16:04:11 2007
+***************
+*** 89,104 ****
+  # Check for required version and die if unhappy
+  
+  if [ "x$UNAME" = "xFreeBSD" ]; then
+! version_compare libtoolize 1 5 20 || exit 1
+! version_compare automake19 1 9 6 || exit 1
+  version_compare autoconf259 2 59 || exit 1
+  ACLOCAL=aclocal19
+  AUTOHEADER=autoheader259
+  AUTOMAKE=automake19
+  AUTOCONF=autoconf259
+  else
+! version_compare libtoolize 1 5 20 || exit 1
+! version_compare automake 1 9 6 || exit 1
+  version_compare autoconf 2 59 || exit 1
+  ACLOCAL=aclocal
+  AUTOHEADER=autoheader
+--- 89,104 ----
+  # Check for required version and die if unhappy
+  
+  if [ "x$UNAME" = "xFreeBSD" ]; then
+! version_compare libtoolize 1 5 10 || exit 1
+! version_compare automake19 1 9 3 || exit 1
+  version_compare autoconf259 2 59 || exit 1
+  ACLOCAL=aclocal19
+  AUTOHEADER=autoheader259
+  AUTOMAKE=automake19
+  AUTOCONF=autoconf259
+  else
+! version_compare libtoolize 1 5 10 || exit 1
+! version_compare automake 1 9 3 || exit 1
+  version_compare autoconf 2 59 || exit 1
+  ACLOCAL=aclocal
+  AUTOHEADER=autoheader
diff --git a/packages/openpbx/openpbx.org-1.2-rc3/openssl.m4.patch b/packages/openpbx/openpbx.org-1.2-rc3/openssl.m4.patch
new file mode 100644
index 0000000000..55d0d33832
--- /dev/null
+++ b/packages/openpbx/openpbx.org-1.2-rc3/openssl.m4.patch
@@ -0,0 +1,46 @@
+*** openpbx.org-1.2_rc3.old/acmacros/openssl.m4	Tue Mar  6 15:21:39 2007
+--- openpbx.org-1.2_rc3/acmacros/openssl.m4	Tue Mar  6 15:23:18 2007
+***************
+*** 3,13 ****
+  #
+  AC_DEFUN([CHECK_SSL],
+  [AC_MSG_CHECKING(if ssl is wanted)
+! # AC_ARG_WITH(ssl,
+! # [  --with-ssl enable ssl [will check /usr/local/ssl
+! #                            /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw ]
+! # ],
+! #[   AC_MSG_RESULT(yes)
+      for dir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw; do
+          ssldir="$dir"
+          if test -f "$dir/include/openssl/ssl.h"; then
+--- 3,13 ----
+  #
+  AC_DEFUN([CHECK_SSL],
+  [AC_MSG_CHECKING(if ssl is wanted)
+!  AC_ARG_WITH(ssl,
+!  [  --with-ssl enable ssl [will check /usr/local/ssl
+!                             /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw ]
+!  ],
+! [   AC_MSG_RESULT(yes)
+      for dir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr /usr/sfw; do
+          ssldir="$dir"
+          if test -f "$dir/include/openssl/ssl.h"; then
+***************
+*** 33,40 ****
+      AC_SUBST([HAVE_SSL])
+      AC_SUBST([SSL_LIBS])
+      AC_SUBST([SSL_CFLAGS])
+! #],
+! #[
+! #    AC_MSG_RESULT(no)
+! #])
+  ])dnl
+--- 33,40 ----
+      AC_SUBST([HAVE_SSL])
+      AC_SUBST([SSL_LIBS])
+      AC_SUBST([SSL_CFLAGS])
+! ],
+! [
+!     AC_MSG_RESULT(no)
+! ])
+  ])dnl
diff --git a/packages/openpbx/openpbx.org_1.2_rc3.bb b/packages/openpbx/openpbx.org_1.2_rc3.bb
new file mode 100644
index 0000000000..64778d0f7c
--- /dev/null
+++ b/packages/openpbx/openpbx.org_1.2_rc3.bb
@@ -0,0 +1,105 @@
+DESCRIPTION = "A flexible VOIP soft switch/PBX."
+HOMEPAGE = "http://www.openpbx.org"
+#RDEPENDS = "ssmtp"
+SECTION = "voip"
+LICENSE = "GPL"
+DEPENDS = "openssl zlib tiff libcap spandsp speex readline js"
+DEPENDS_${PN}-ldap = "openldap"
+RRECOMMENDS = "logrotate"
+RRECOMMENDS_${PN}-ogi = "perl perl-module-strict"
+PV = "1.2_rc3"
+PR = "r0"
+
+SRC_URI = "http://www.openpbx.org/releases/${P}.tar.gz \
+           file://bootstrap.patch;patch=1 \
+           file://openssl.m4.patch;patch=1 \
+           file://logrotate \
+           file://volatiles \
+           file://init"
+
+PARALLEL_MAKE = ""
+INITSCRIPT_NAME = "openpbx"
+INITSCRIPT_PARAMS = "defaults 60"
+
+inherit autotools update-rc.d
+
+EXTRA_OECONF = " --with-ssl=${STAGING_DIR}/${HOST_SYS} --enable-low_memory \
+        --disable-zaptel --with-directory-layout=lsb --with-chan_fax \
+        --with-codec-speex=${STAGING_DIR}/${HOST_SYS} --with-app_ldap \
+        --with-perl-shebang='#!${bindir}/perl' --with-jabber --with-res_jabber \
+        --enable-t38 --with-javascript --with-res_js \
+        --bindir=${bindir} --datadir=${datadir} --sysconfdir=${sysconfdir} \
+        --includedir=${includedir} --infodir=${infodir} --mandir=${mandir} \
+        --localstatedir=${localstatedir} --libdir=${libdir}"
+
+do_configure_prepend () {
+    ${S}/bootstrap.sh
+    # Fix some stupidness with the VoiceMail app naming. Case Matters!
+    sed -i 's:Voicemail:VoiceMail:' ${S}/configs/extensions.conf.sample
+    sed -i 's:/var:${localstatedir}:' ${WORKDIR}/volatiles
+    sed -i 's:/var:${localstatedir}:' ${WORKDIR}/logrotate
+    sed -i 's:/etc/init.d:${sysconfdir}/init.d:' ${WORKDIR}/logrotate
+}
+
+do_install_append() {
+    install -c -D -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/openpbx
+    install -c -D -m 644 ${WORKDIR}/logrotate ${D}${sysconfdir}/logrotate.d/openpbx
+    install -c -D -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/openpbx
+}
+
+PACKAGES =+ "${PN}-fax ${PN}-ogi ${PN}-musiconhold ${PN}-ldap"
+
+FILES_${PN}-fax = "${libdir}/openpbx.org/modules/chan_fax.* \
+                   ${libdir}/openpbx.org/modules/app_rxfax.* \
+                   ${libdir}/openpbx.org/modules/app_txfax.* \
+                   ${sysconfdir}/openpbx.org/chan_fax.conf"
+FILES_${PN}-musiconhold = "${libdir}/openpbx.org/modules/res_musiconhold.* \
+                   ${sysconfdir}/openpbx.org/musiconhold.conf"
+FILES_${PN}-ogi = "${libdir}/openpbx.org/modules/res_ogi.* \
+                   ${datadir}/openpbx.org/ogi/*"
+FILES_${PN}-ldap = "${libdir}/openpbx.org/modules/app_ldap.*"
+
+pkg_postinst_prepend() {
+    grep -q openpbx ${sysconfdir}/group || addgroup --system openpbx
+    grep -q openpbx ${sysconfdir}/passwd || adduser --system --home ${localstatedir}/run/openpbx.org --no-create-home --disabled-password --ingroup openpbx -s ${base_bindir}/false openpbx
+    chown -R openpbx:openpbx ${localstatedir}/lib/openpbx.org ${localstatedir}/spool/openpbx.org ${localstatedir}/log/openpbx.org ${localstatedir}/run/openpbx.org ${sysconfdir}/openpbx.org ${datadir}/openpbx.org
+    /etc/init.d/populate-volatile.sh update
+}
+
+CONFFILES_${PN}-fax += "${sysconfdir}/openpbx.org/chan_fax.conf"
+CONFFILES_${PN}-musiconhold += "${sysconfdir}/openpbx.org/musiconhold.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/adsi.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/adtranvofr.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/agents.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/cdr.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/cdr_custom.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/cdr_manager.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/cdr_tds.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/codecs.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/dnsmgr.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/dundi.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/enum.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/extconfig.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/extensions.ael"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/features.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/iax.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/indications.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/logger.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/manager.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/meetme.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/mgcp.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/modem.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/modules.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/muted.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/openpbx.adsi"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/openpbx.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/osp.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/privacy.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/queues.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/rpt.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/rtp.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/sip.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/sip_notify.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/udptl.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/voicemail.conf"
+CONFFILES_${PN} += "${sysconfdir}/openpbx.org/woomera.conf"
diff --git a/packages/spandsp/spandsp_0.0.3.bb b/packages/spandsp/spandsp_0.0.3.bb
new file mode 100644
index 0000000000..26702f998b
--- /dev/null
+++ b/packages/spandsp/spandsp_0.0.3.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "A library of many DSP functions for telephony."
+HOMEPAGE = "http://www.soft-switch.org"
+DEPENDS = "tiff libxml2"
+SECTION = "voip"
+LICENSE = "GPL"
+PV = "0.0.3"
+PSUBV = "pre27"
+PR = "r0"
+
+SRC_URI = "http://www.soft-switch.org/downloads/snapshots/spandsp/spandsp-20070123.tar.gz"
+
+inherit autotools
+
+PARALLEL_MAKE = ""
+
+do_stage () { 
+    autotools_stage_all 
+}
-- 
cgit v1.2.3


From e2e71e5a0fe631557851fbe3b0729500315dcf59 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 18 Mar 2007 22:43:28 +0000
Subject: linkstation/turbostation/n2100 machine support: Clean up and rename

---
 conf/machine/linkstationppchd.conf |  7 -------
 conf/machine/linkstationppchg.conf |  7 -------
 conf/machine/lsppchd.conf          |  7 +++++++
 conf/machine/lsppchg.conf          |  7 +++++++
 conf/machine/n2100.conf            | 10 ----------
 conf/machine/turbostation.conf     |  9 ---------
 6 files changed, 14 insertions(+), 33 deletions(-)
 delete mode 100644 conf/machine/linkstationppchd.conf
 delete mode 100644 conf/machine/linkstationppchg.conf
 create mode 100644 conf/machine/lsppchd.conf
 create mode 100644 conf/machine/lsppchg.conf

diff --git a/conf/machine/linkstationppchd.conf b/conf/machine/linkstationppchd.conf
deleted file mode 100644
index 52d58ded5b..0000000000
--- a/conf/machine/linkstationppchd.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#@TYPE: Machine
-#@NAME: HD Linkstation
-#@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD
-
-UBOOT_MACHINE = "linkstation_HDLAN"
-
-require conf/machine/include/linkstationppc.conf
diff --git a/conf/machine/linkstationppchg.conf b/conf/machine/linkstationppchg.conf
deleted file mode 100644
index b7ceb6fc95..0000000000
--- a/conf/machine/linkstationppchg.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#@TYPE: Machine
-#@NAME: HG Linkstation
-#@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG
-
-UBOOT_MACHINE = "linkstation_HGLAN"
-
-require conf/machine/include/linkstationppc.conf
diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf
new file mode 100644
index 0000000000..52d58ded5b
--- /dev/null
+++ b/conf/machine/lsppchd.conf
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: HD Linkstation
+#@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD
+
+UBOOT_MACHINE = "linkstation_HDLAN"
+
+require conf/machine/include/linkstationppc.conf
diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf
new file mode 100644
index 0000000000..b7ceb6fc95
--- /dev/null
+++ b/conf/machine/lsppchg.conf
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: HG Linkstation
+#@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG
+
+UBOOT_MACHINE = "linkstation_HGLAN"
+
+require conf/machine/include/linkstationppc.conf
diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf
index 554157ca85..6aee9f1b71 100644
--- a/conf/machine/n2100.conf
+++ b/conf/machine/n2100.conf
@@ -11,17 +11,7 @@ MACHINE_FEATURES= "kernel26 usbhost"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.20"
 
-# Do we need any kernel modules?
-FOONAS_KERNEL = "kernel-module-ext2 kernel-module-usb-storage"
-
-FOONAS_SUPPORT += "fis"
-
 # We want udev support in the image
 udevdir = "/dev"
-BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm"
 
-EXTRA_IMAGECMD_jffs2 += " --little-endian"
-ERASEBLOCK_SIZE = "0x20000"	
-JFFS2_ROOTFS_SIZE = "0xC80000"
-KERNEL_IMAGE_SIZE = "0x280000"
 require conf/machine/include/tune-xscale.conf
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index 41dfd8d09e..a3856dbaf1 100644
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -11,17 +11,8 @@ USE_VT="0"
 MODUTILS=26
 MACHINE_FEATURES= "kernel26 usbhost"
 PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation"
-FOONAS_KERNEL = "kernel-module-ext3 kernel-module-minix \
-                        kernel-module-usb-storage"
 
 # We want udev support in the image
 udevdir = "/dev"
-BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm"
-FOONAS_SUPPORT += "uboot-utils"
 
-# Hardware stuff used in image generation
-EXTRA_IMAGECMD = "--big-endian"
-ERASEBLOCK_SIZE = "0x20000"	
-JFFS2_ROOTFS_SIZE = "0xC80000"
-KERNEL_IMAGE_SIZE = "0x280000"
 require conf/machine/include/tune-ppc603e.conf
-- 
cgit v1.2.3


From 0a60551a356b2e5c093832c3b8337d8a33106ee3 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 18 Mar 2007 22:51:07 +0000
Subject: foonas: Update defines for linkstations, n2100 and turbostation

---
 conf/distro/foonas.conf | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index 201d463732..75cfc926df 100644
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -12,15 +12,33 @@ DISTRO_TYPE = "alpha"
 FEED_URIS = "foonas-packages##http://ipkg.foonas.org/${MACHINE}/cross/1.0-dev/packages"
 FEED_URIS += "foonas-kernel##http://ipkg.foonas.org/${MACHINE}/cross/1.0-dev/kernel"
 
+
+# Various defines for Thecus N2100
 FOONAS_KERNEL_n2100 = "kernel-module-ext2 kernel-module-usb-storage"
+FOONAS_SUPPORT_n2100 += "fis"
+BOOTSTRAP_EXTRA_RDEPENDS_n2100 = "udev mdadm"
+EXTRA_IMAGECMD_n2100 = "--little-endian"
+ERASEBLOCK_SIZE_n2100 = "0x20000"
+IMAGE_FSTYPES_n2100 = "jffs2"
+
+# Various defines for QNAP Turbostation
 FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \
 				kernel-module-usb-storage"
-FOONAS_KERNEL_linkstationppchd = "kernel-module-dm-mod kernel-module-raid1 \
-				 kernel-module-raid0 kernel-module-raid456 \
-				kernel-module-multipath"
-FOONAS_KERNEL_linkstationppchg = "kernel-module-dm-mod kernel-module-raid1 \
+FOONAS_SUPPORT_turbostation += "uboot-utils"
+BOOTSTRAP_EXTRA_RDEPENDS_turbostation = "udev mdadm"
+EXTRA_IMAGECMD_turbostation = "--big-endian"
+ERASEBLOCK_SIZE_turbostation = "0x20000"
+IMAGE_FSTYPES_turbostation = "jffs2"
+
+# Various defines for Linkstations
+FOONAS_KERNEL_lsppchg = "kernel-module-dm-mod kernel-module-raid1 \
 				 kernel-module-raid0 kernel-module-raid456 \
 				kernel-module-multipath"
+FOONAS_KERNEL_lsppchd = "${FOONAS_KERNEL_lsppchg}"
+FOONAS_SUPPORT_lsppchd = "uboot-utils dtc"
+FOONAS_SUPPORT_lsppchg = ${FOONAS_SUPPORT_lsppchd}
+IMAGE_FSTYPES_lsppchd = "tar.gz"
+IMAGE_FSTYPES_lsppchg = ${IMAGE_FSTYPES_lsppchd}
 
 #
 # Naming schemes
@@ -30,9 +48,9 @@ INHERIT += "debian"
 #
 # Packaging and output format
 #
+
 INHERIT += "package_ipk"
 IMAGE_BASENAME = "foonas"
-IMAGE_FSTYPES = "jffs2"
 
 #
 # binutils and compilers
-- 
cgit v1.2.3


From 7d06b64ec9dbab07b8f95febb8886eb168d2b27c Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 18 Mar 2007 22:56:06 +0000
Subject: foonas: Clean up further, move lots to include/foonas.inc

---
 conf/distro/foonas.conf        | 72 ++----------------------------------------
 conf/distro/include/foonas.inc | 60 +++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 69 deletions(-)
 create mode 100644 conf/distro/include/foonas.inc

diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index 75cfc926df..39bcaf041e 100644
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -12,6 +12,8 @@ DISTRO_TYPE = "alpha"
 FEED_URIS = "foonas-packages##http://ipkg.foonas.org/${MACHINE}/cross/1.0-dev/packages"
 FEED_URIS += "foonas-kernel##http://ipkg.foonas.org/${MACHINE}/cross/1.0-dev/kernel"
 
+TARGET_OS = "linux"
+HOTPLUG = "udev"
 
 # Various defines for Thecus N2100
 FOONAS_KERNEL_n2100 = "kernel-module-ext2 kernel-module-usb-storage"
@@ -52,73 +54,5 @@ INHERIT += "debian"
 INHERIT += "package_ipk"
 IMAGE_BASENAME = "foonas"
 
-#
-# binutils and compilers
-#
-
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/powerpc-foonas-linux-libc-for-gcc = "glibc-intermediate"
-
-# not used yet
-#PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate"
-#PREFERRED_PROVIDER_virtual/armeb-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-#PREFERRED_PROVIDER_virtual/mipsel-foonas-linux-libc-for-gcc = "glibc-intermediate"
-
-TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
-
-#mess with compiler flags to use -Os instead of -O2
-#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
-# perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616
-
-FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
-FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
-
-BUILD_OPTIMIZATION = "-Os"
-BUILD_OPTIMIZATION_pn-perl = "-O1"
-
-CXXFLAGS += "-fvisibility-inlines-hidden"
-
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
-#conflict between this and the last below.
-#PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
-# Select 2.6 versions of the depmod support
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc-intermediate"
-
-PREFERRED_PROVIDER_virtual/libx11 = "libx11"
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-
-PREFERRED_PROVIDER_virtual/db = "db"
-PREFERRED_PROVIDER_virtual/db-native = "db-native"
-
-PREFERRED_VERSION_binutils = "2.17.50.0.12"
-PREFERRED_VERSION_binutils-cross = "2.17.50.0.12"
-
-PREFERRED_VERSION_gcc = "4.1.1"
-PREFERRED_VERSION_gcc-cross = "4.1.1"
-PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
-
-PREFERRED_VERSION_glibc = "2.5"
-PREFERRED_VERSION_glibc-intermediate = "2.5"
-PREFERRED_VERSION_glibc-initial = "2.5"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
-GLIBC_ADDONS ?= "ports,nptl,libidn"
-
-
-# 
-# Target OS
-#
-
-TARGET_OS = "linux"
-HOTPLUG = "udev"
 require conf/distro/include/sane-srcdates.inc
-
-CMDLINE_DEBUG = "noirqdebug"
+require conf/distro/include/foonas.inc
diff --git a/conf/distro/include/foonas.inc b/conf/distro/include/foonas.inc
new file mode 100644
index 0000000000..189b932716
--- /dev/null
+++ b/conf/distro/include/foonas.inc
@@ -0,0 +1,60 @@
+#
+# binutils and compilers
+#
+
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
+PREFERRED_PROVIDER_virtual/powerpc-foonas-linux-libc-for-gcc = "glibc-intermediate"
+
+# not used yet
+#PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate"
+#PREFERRED_PROVIDER_virtual/armeb-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
+#PREFERRED_PROVIDER_virtual/mipsel-foonas-linux-libc-for-gcc = "glibc-intermediate"
+
+TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
+
+#mess with compiler flags to use -Os instead of -O2
+#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
+# perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616
+
+FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
+FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
+
+BUILD_OPTIMIZATION = "-Os"
+BUILD_OPTIMIZATION_pn-perl = "-O1"
+
+CXXFLAGS += "-fvisibility-inlines-hidden"
+
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
+#conflict between this and the last below.
+#PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
+# Select 2.6 versions of the depmod support
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc-intermediate"
+
+PREFERRED_PROVIDER_virtual/libx11 = "libx11"
+PREFERRED_PROVIDER_virtual/libiconv = "glibc"
+PREFERRED_PROVIDER_virtual/libintl = "glibc"
+
+PREFERRED_PROVIDER_virtual/db = "db"
+PREFERRED_PROVIDER_virtual/db-native = "db-native"
+
+PREFERRED_VERSION_binutils = "2.17.50.0.12"
+PREFERRED_VERSION_binutils-cross = "2.17.50.0.12"
+
+PREFERRED_VERSION_gcc = "4.1.1"
+PREFERRED_VERSION_gcc-cross = "4.1.1"
+PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
+
+PREFERRED_VERSION_glibc = "2.5"
+PREFERRED_VERSION_glibc-intermediate = "2.5"
+PREFERRED_VERSION_glibc-initial = "2.5"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
+GLIBC_ADDONS ?= "ports,nptl,libidn"
+
-- 
cgit v1.2.3


From 2225bb697129c9be8ca2b79f7930798bf9f72167 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 18 Mar 2007 23:06:40 +0000
Subject: foonas: Update image config, move crap from distro config

---
 conf/distro/foonas.conf         |  6 ------
 packages/images/foonas-image.bb | 18 +++++++++++++++---
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index 39bcaf041e..b43090202d 100644
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -19,18 +19,12 @@ HOTPLUG = "udev"
 FOONAS_KERNEL_n2100 = "kernel-module-ext2 kernel-module-usb-storage"
 FOONAS_SUPPORT_n2100 += "fis"
 BOOTSTRAP_EXTRA_RDEPENDS_n2100 = "udev mdadm"
-EXTRA_IMAGECMD_n2100 = "--little-endian"
-ERASEBLOCK_SIZE_n2100 = "0x20000"
-IMAGE_FSTYPES_n2100 = "jffs2"
 
 # Various defines for QNAP Turbostation
 FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \
 				kernel-module-usb-storage"
 FOONAS_SUPPORT_turbostation += "uboot-utils"
 BOOTSTRAP_EXTRA_RDEPENDS_turbostation = "udev mdadm"
-EXTRA_IMAGECMD_turbostation = "--big-endian"
-ERASEBLOCK_SIZE_turbostation = "0x20000"
-IMAGE_FSTYPES_turbostation = "jffs2"
 
 # Various defines for Linkstations
 FOONAS_KERNEL_lsppchg = "kernel-module-dm-mod kernel-module-raid1 \
diff --git a/packages/images/foonas-image.bb b/packages/images/foonas-image.bb
index 3d2c621438..efb10335e8 100644
--- a/packages/images/foonas-image.bb
+++ b/packages/images/foonas-image.bb
@@ -5,12 +5,24 @@ PR = "r0"
 inherit image
 
 DEPENDS = "${MACHINE_TASK_PROVIDER} makedevs-native mtd-utils-native"
+
+# Various defines for Thecus N2100
 DEPENDS_n2100 += "openssl-native"
+EXTRA_IMAGECMD_n2100 = "--little-endian"
+ERASEBLOCK_SIZE_n2100 = "0x20000"
+IMAGE_FSTYPES_n2100 = "jffs2"
+IMAGE_POSTPROCESS_COMMAND_n2100 += '${MACHINE}_pack_image;'
+
+# Various defines for QNAP Turbostation TS[12]01
+EXTRA_IMAGECMD_turbostation = "--big-endian"
+ERASEBLOCK_SIZE_turbostation = "0x20000"
+IMAGE_FSTYPES_turbostation = "jffs2"
+IMAGE_POSTPROCESS_COMMAND_turbostation += '${MACHINE}_pack_image;'
 
+# Various defines for Buffalo Linkstations
+IMAGE_POSTPROCESS_COMMAND_lsppchd += ""
+IMAGE_POSTPROCESS_COMMAND_lsppchg += "${IMAGE_POSTPROCESS_COMMAND_lsppchd}"
 
-IMAGE_POSTPROCESS_COMMAND += "${PACK_IMAGE}"
-PACK_IMAGE_DEPENDS = ""
-PACK_IMAGE = '${MACHINE}_pack_image;'
 IMAGE_PREPROCESS_COMMAND += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;"
 IMAGE_PREPROCESS_COMMAND += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;"
 IMAGE_PREPROCESS_COMMAND += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;"
-- 
cgit v1.2.3


From 5fb7f282ceab4ad5655ef46c04d14fc51bc4c245 Mon Sep 17 00:00:00 2001
From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Sun, 18 Mar 2007 23:27:28 +0000
Subject: foonas: Move image-stuff to classes for lsppchg, lsppchd, n2100 and
 turbostation

---
 classes/lsppchd-image.bbclass      |  1 +
 classes/lsppchg-image.bbclass      |  1 +
 classes/n2100-image.bbclass        | 36 +++++++++++++++
 classes/turbostation-image.bbclass | 35 +++++++++++++++
 packages/images/foonas-image.bb    | 90 ++------------------------------------
 5 files changed, 76 insertions(+), 87 deletions(-)
 create mode 100644 classes/lsppchd-image.bbclass
 create mode 100644 classes/lsppchg-image.bbclass
 create mode 100644 classes/n2100-image.bbclass
 create mode 100644 classes/turbostation-image.bbclass

diff --git a/classes/lsppchd-image.bbclass b/classes/lsppchd-image.bbclass
new file mode 100644
index 0000000000..da280551d4
--- /dev/null
+++ b/classes/lsppchd-image.bbclass
@@ -0,0 +1 @@
+IMAGE_POSTPROCESS_COMMAND += ""
diff --git a/classes/lsppchg-image.bbclass b/classes/lsppchg-image.bbclass
new file mode 100644
index 0000000000..da280551d4
--- /dev/null
+++ b/classes/lsppchg-image.bbclass
@@ -0,0 +1 @@
+IMAGE_POSTPROCESS_COMMAND += ""
diff --git a/classes/n2100-image.bbclass b/classes/n2100-image.bbclass
new file mode 100644
index 0000000000..811b1d37b7
--- /dev/null
+++ b/classes/n2100-image.bbclass
@@ -0,0 +1,36 @@
+DEPENDS += "openssl-native"
+EXTRA_IMAGECMD = "--little-endian"
+ERASEBLOCK_SIZE = "0x20000"
+IMAGE_FSTYPES = "jffs2"
+IMAGE_POSTPROCESS_COMMAND += '${MACHINE}_pack_image;'
+
+n2100_pack_image() {
+        # find latest kernel
+        KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/zImage* | tail -1`
+        if [ -z "$KERNEL" ]; then
+                oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Bitbake linux to create one."
+                exit 1
+        fi
+        ROOTFS=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2
+        OUTPUT=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flash.img
+        PADFILE=${DEPLOY_DIR_IMAGE}/padfile.zzz
+        HEX_MAX_KERN_SIZE=1C0000
+        DEC_MAX_KERN_SIZE=`echo "ibase=16; $HEX_MAX_KERN_SIZE" | bc `
+        HEX_MAX_ROOT_SIZE=DC0000
+        DEC_MAX_ROOT_SIZE=`echo "ibase=16; $HEX_MAX_ROOT_SIZE" | bc `
+        KERNEL_SIZE=`ls -l $KERNEL | awk '{print $5}'`
+        if [ $KERNEL_SIZE -gt $DEC_MAX_KERN_SIZE ]; then
+                oefatal "Kernel too large at $KERNEL_SIZE bytes.  Max is $DEC_MAX_KERN_SIZE."
+                exit 1
+        fi
+        ROOT_SIZE=`ls -l $ROOTFS | awk '{print $5}'`
+        if [ $ROOT_SIZE -gt $DEC_MAX_ROOT_SIZE ]; then
+                oefatal "Rootfs is too large at $ROOT_SIZE bytes.  Max is $DEC_MAX_ROOT_SIZE."
+                exit 1
+        fi
+        PAD_SIZE=`echo "$DEC_MAX_KERN_SIZE - $KERNEL_SIZE" | bc `
+        dd if=/dev/zero of=$PADFILE bs=$PAD_SIZE count=1 2>>/dev/null
+        cat $KERNEL $PADFILE $ROOTFS > $OUTPUT
+        rm -f $PADFILE
+        ls -l $OUTPUT
+}
diff --git a/classes/turbostation-image.bbclass b/classes/turbostation-image.bbclass
new file mode 100644
index 0000000000..d82e3996d5
--- /dev/null
+++ b/classes/turbostation-image.bbclass
@@ -0,0 +1,35 @@
+EXTRA_IMAGECMD = "--big-endian"
+ERASEBLOCK_SIZE = "0x20000"
+IMAGE_FSTYPES = "jffs2"
+IMAGE_POSTPROCESS_COMMAND += '${MACHINE}_pack_image;'
+
+turbostation_pack_image() {
+        # find latest kernel
+        KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/uImage* | tail -1`
+        if [ -z "$KERNEL" ]; then
+                oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Bitbake linux-turbostation to create one."
+                exit 1
+        fi
+        ROOTFS=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2
+        OUTPUT=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flash.img
+        PADFILE=${DEPLOY_DIR_IMAGE}/padfile.zzz
+        HEX_MAX_KERN_SIZE=200000
+        DEC_MAX_KERN_SIZE=`echo "ibase=16; $HEX_MAX_KERN_SIZE" | bc `
+        HEX_MAX_ROOT_SIZE=D00000
+        DEC_MAX_ROOT_SIZE=`echo "ibase=16; $HEX_MAX_ROOT_SIZE" | bc `
+        KERNEL_SIZE=`ls -l $KERNEL | awk '{print $5}'`
+        if [ $KERNEL_SIZE -gt $DEC_MAX_KERN_SIZE ]; then
+                oefatal "Kernel too large at $KERNEL_SIZE bytes.  Max is $DEC_MAX_KERN_SIZE."
+                exit 1
+        fi
+        ROOT_SIZE=`ls -l $ROOTFS | awk '{print $5}'`
+        if [ $ROOT_SIZE -gt $DEC_MAX_ROOT_SIZE ]; then
+                oefatal "Rootfs is too large at $ROOT_SIZE bytes.  Max is $DEC_MAX_ROOT_SIZE."
+                exit 1
+        fi
+        PAD_SIZE=`echo "$DEC_MAX_KERN_SIZE - $KERNEL_SIZE" | bc `
+        dd if=/dev/zero of=$PADFILE bs=$PAD_SIZE count=1 2>>/dev/null
+        cat $KERNEL $PADFILE $ROOTFS > $OUTPUT
+        rm -f $PADFILE
+        ls -l $OUTPUT
+}
diff --git a/packages/images/foonas-image.bb b/packages/images/foonas-image.bb
index efb10335e8..db5ff198fc 100644
--- a/packages/images/foonas-image.bb
+++ b/packages/images/foonas-image.bb
@@ -6,23 +6,6 @@ inherit image
 
 DEPENDS = "${MACHINE_TASK_PROVIDER} makedevs-native mtd-utils-native"
 
-# Various defines for Thecus N2100
-DEPENDS_n2100 += "openssl-native"
-EXTRA_IMAGECMD_n2100 = "--little-endian"
-ERASEBLOCK_SIZE_n2100 = "0x20000"
-IMAGE_FSTYPES_n2100 = "jffs2"
-IMAGE_POSTPROCESS_COMMAND_n2100 += '${MACHINE}_pack_image;'
-
-# Various defines for QNAP Turbostation TS[12]01
-EXTRA_IMAGECMD_turbostation = "--big-endian"
-ERASEBLOCK_SIZE_turbostation = "0x20000"
-IMAGE_FSTYPES_turbostation = "jffs2"
-IMAGE_POSTPROCESS_COMMAND_turbostation += '${MACHINE}_pack_image;'
-
-# Various defines for Buffalo Linkstations
-IMAGE_POSTPROCESS_COMMAND_lsppchd += ""
-IMAGE_POSTPROCESS_COMMAND_lsppchg += "${IMAGE_POSTPROCESS_COMMAND_lsppchd}"
-
 IMAGE_PREPROCESS_COMMAND += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;"
 IMAGE_PREPROCESS_COMMAND += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;"
 IMAGE_PREPROCESS_COMMAND += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;"
@@ -37,78 +20,11 @@ RDEPENDS = " \
 	module-init-tools-depmod modutils-initscripts \
         ipkg-collateral ipkg ipkg-link \
 	libgcc1 diffutils cpio findutils\
-	portmap \
-	dropbear \
-	e2fsprogs-blkid \
-	mdadm \
-	hdparm \
-	mtd-utils \
-	udev \
+	portmap dropbear e2fsprogs-blkid \
+	mdadm hdparm mtd-utils udev \
 	${FOONAS_SUPPORT} \
 	${FOONAS_KERNEL} "
 
 PACKAGE_INSTALL = "${RDEPENDS}"
 
-# At this point you have to make a ${MACHINE}_pack_image for your machine.
-
-turbostation_pack_image() {
-	# find latest kernel
-	KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/uImage* | tail -1`
-	if [ -z "$KERNEL" ]; then
-		oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Bitbake linux-turbostation to create one."
-		exit 1
-	fi
-	ROOTFS=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2
-	OUTPUT=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flash.img
-	PADFILE=${DEPLOY_DIR_IMAGE}/padfile.zzz
-	HEX_MAX_KERN_SIZE=200000
-	DEC_MAX_KERN_SIZE=`echo "ibase=16; $HEX_MAX_KERN_SIZE" | bc `
-	HEX_MAX_ROOT_SIZE=D00000
-	DEC_MAX_ROOT_SIZE=`echo "ibase=16; $HEX_MAX_ROOT_SIZE" | bc `
-	KERNEL_SIZE=`ls -l $KERNEL | awk '{print $5}'`
-	if [ $KERNEL_SIZE -gt $DEC_MAX_KERN_SIZE ]; then
-	        oefatal "Kernel too large at $KERNEL_SIZE bytes.  Max is $DEC_MAX_KERN_SIZE."
-		exit 1
-	fi
-	ROOT_SIZE=`ls -l $ROOTFS | awk '{print $5}'`
-	if [ $ROOT_SIZE -gt $DEC_MAX_ROOT_SIZE ]; then
-		oefatal "Rootfs is too large at $ROOT_SIZE bytes.  Max is $DEC_MAX_ROOT_SIZE."
-		exit 1
-	fi
-	PAD_SIZE=`echo "$DEC_MAX_KERN_SIZE - $KERNEL_SIZE" | bc `
-	dd if=/dev/zero of=$PADFILE bs=$PAD_SIZE count=1 2>>/dev/null
-	cat $KERNEL $PADFILE $ROOTFS > $OUTPUT
-	rm -f $PADFILE
-	ls -l $OUTPUT
-}
-
-n2100_pack_image() {
-        # find latest kernel
-        KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/zImage* | tail -1`
-        if [ -z "$KERNEL" ]; then
-                oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Bitbake linux to create one."
-                exit 1
-        fi
-        ROOTFS=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2
-        OUTPUT=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flash.img
-        PADFILE=${DEPLOY_DIR_IMAGE}/padfile.zzz
-        HEX_MAX_KERN_SIZE=1C0000
-        DEC_MAX_KERN_SIZE=`echo "ibase=16; $HEX_MAX_KERN_SIZE" | bc `
-        HEX_MAX_ROOT_SIZE=DC0000
-        DEC_MAX_ROOT_SIZE=`echo "ibase=16; $HEX_MAX_ROOT_SIZE" | bc `
-        KERNEL_SIZE=`ls -l $KERNEL | awk '{print $5}'`
-        if [ $KERNEL_SIZE -gt $DEC_MAX_KERN_SIZE ]; then
-                oefatal "Kernel too large at $KERNEL_SIZE bytes.  Max is $DEC_MAX_KERN_SIZE."
-                exit 1
-        fi
-        ROOT_SIZE=`ls -l $ROOTFS | awk '{print $5}'`
-        if [ $ROOT_SIZE -gt $DEC_MAX_ROOT_SIZE ]; then
-                oefatal "Rootfs is too large at $ROOT_SIZE bytes.  Max is $DEC_MAX_ROOT_SIZE."
-                exit 1
-        fi
-        PAD_SIZE=`echo "$DEC_MAX_KERN_SIZE - $KERNEL_SIZE" | bc `
-        dd if=/dev/zero of=$PADFILE bs=$PAD_SIZE count=1 2>>/dev/null
-        cat $KERNEL $PADFILE $ROOTFS > $OUTPUT
-        rm -f $PADFILE
-        ls -l $OUTPUT
-}
\ No newline at end of file
+inherit n2100-image turbostation-image lsppchg-image lsppchd-image
\ No newline at end of file
-- 
cgit v1.2.3


From 0db095669b16caa6c062f3ae5c0774780e09ea4b Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Mon, 19 Mar 2007 02:05:20 +0000
Subject: evas: fix -dbg packaging

---
 packages/efl/evas-fb_0.9.9.037.bb  | 2 +-
 packages/efl/evas-x11_0.9.9.037.bb | 2 +-
 packages/efl/evas.inc              | 8 +++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/efl/evas-fb_0.9.9.037.bb b/packages/efl/evas-fb_0.9.9.037.bb
index 3e29b80cc0..4acc857982 100644
--- a/packages/efl/evas-fb_0.9.9.037.bb
+++ b/packages/efl/evas-fb_0.9.9.037.bb
@@ -1,5 +1,5 @@
 require evas.inc
-PR = "r5"
+PR = "r6"
 
 EXTRA_OECONF = "--enable-fb         \
 		--disable-directfb          \
diff --git a/packages/efl/evas-x11_0.9.9.037.bb b/packages/efl/evas-x11_0.9.9.037.bb
index 121922591e..765a8b73d4 100644
--- a/packages/efl/evas-x11_0.9.9.037.bb
+++ b/packages/efl/evas-x11_0.9.9.037.bb
@@ -1,6 +1,6 @@
 require evas.inc
 DEPENDS += "edb virtual/libx11 libxext freetype"
-PR = "r7"
+PR = "r8"
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11  \
 		--x-libraries=${STAGING_LIBDIR} \
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index f065d944f8..ceca03c0a8 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -28,6 +28,10 @@ do_configure_prepend() {
 	fi
 }
 
+#do_install_append() {
+#    find "${S}" -name .debug -type d | xargs -iBLAH rm -rf "BLAH"
+#}
+
 do_stage_append() {
 	cd src
 	modules=`find modules -name ".libs"`
@@ -40,4 +44,6 @@ do_stage_append() {
 
 headers = "<override me>"
 libraries = "libevas"
-FILES_${PN} += "/usr/lib/evas/"
+FILES_${PN} += "/usr/lib/evas/modules/*/*/*/*.so"
+FILES_${PN}-dev += "/usr/lib/evas/modules/*/*/*/*.a /usr/lib/evas/modules/*/*/*/*.la"
+FILES_${PN}-dbg += "/usr/lib/evas/modules/*/*/*/.debug/"
\ No newline at end of file
-- 
cgit v1.2.3


From 84a99dffb8b127d9965a61a0bae9a214deb0e3a9 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Mon, 19 Mar 2007 05:11:30 +0000
Subject: imlib2: fix -dbg and -dev packages

---
 packages/efl/imlib2-fb_1.2.2.001.bb     | 1 +
 packages/efl/imlib2-native_1.2.2.001.bb | 1 +
 packages/efl/imlib2-x11_1.2.2.001.bb    | 2 +-
 packages/efl/imlib2.inc                 | 8 +++++---
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/efl/imlib2-fb_1.2.2.001.bb b/packages/efl/imlib2-fb_1.2.2.001.bb
index 776acb43f6..77958d5df3 100644
--- a/packages/efl/imlib2-fb_1.2.2.001.bb
+++ b/packages/efl/imlib2-fb_1.2.2.001.bb
@@ -1,4 +1,5 @@
 require imlib2.inc
+PR = "r1"
 
 EXTRA_OECONF = "--without-x \
 		--disable-mmx"
diff --git a/packages/efl/imlib2-native_1.2.2.001.bb b/packages/efl/imlib2-native_1.2.2.001.bb
index da75e8f439..68bf00026f 100644
--- a/packages/efl/imlib2-native_1.2.2.001.bb
+++ b/packages/efl/imlib2-native_1.2.2.001.bb
@@ -2,6 +2,7 @@ require imlib2.inc
 inherit native
 PROVIDES = "imlib2-native"
 DEPENDS = "freetype-native libpng-native jpeg-native"
+PR = "r1"
 
 EXTRA_OECONF = "--disable-mmx \
                 --without-x"
diff --git a/packages/efl/imlib2-x11_1.2.2.001.bb b/packages/efl/imlib2-x11_1.2.2.001.bb
index e7814971c3..14c7530021 100644
--- a/packages/efl/imlib2-x11_1.2.2.001.bb
+++ b/packages/efl/imlib2-x11_1.2.2.001.bb
@@ -1,6 +1,6 @@
 require imlib2.inc
 DEPENDS += "virtual/libx11 libxext"
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = "--disable-mmx \
                 --with-x \
diff --git a/packages/efl/imlib2.inc b/packages/efl/imlib2.inc
index 4691bf2ce0..3c54e68277 100644
--- a/packages/efl/imlib2.inc
+++ b/packages/efl/imlib2.inc
@@ -30,8 +30,9 @@ do_stage_append() {
 }
 
 do_install() {
+        install -d "${D}${includedir}"
         oe_libinstall -C src/lib libImlib2 ${D}${libdir}/
-        install -m 0644 ${S}/src/lib/Imlib2.h ${D}${incdir}/
+        install -m 0644 ${S}/src/lib/Imlib2.h ${D}${includedir}/
 
         install -d ${D}${libdir}/imlib2/loaders
         for i in src/modules/loaders/.libs/*.so
@@ -47,8 +48,9 @@ do_install() {
 }
 
 PACKAGES =+ "imlib2-loaders imlib2-filters"
-FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2"
-FILES_${PN}-dev += "${bindir}/imlib2-config"
+FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so"
+FILES_${PN}-dbg = "${libdir}/imlib2/*/.debug ${libdir}/.debug/"
+FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}"
 FILES_imlib2-bin = "${bindir}"
 FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so"
 FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so"
-- 
cgit v1.2.3


From c95fa7c40ca4ff8bbba8893f24d268790a2da2b8 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Mon, 19 Mar 2007 05:11:53 +0000
Subject: edje: fix edje-config name

---
 packages/efl/edje-native_0.5.0.037.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/efl/edje-native_0.5.0.037.bb b/packages/efl/edje-native_0.5.0.037.bb
index c66639d25e..1dc5c1de10 100644
--- a/packages/efl/edje-native_0.5.0.037.bb
+++ b/packages/efl/edje-native_0.5.0.037.bb
@@ -13,7 +13,7 @@ do_configure_prepend() {
 }
 
 do_stage_append() {
-	edje_data_dir=`${STAGING_BINDIR}/edje-config-native --datadir`
+	edje_data_dir=`edje-config --datadir`
 	# could also use ${STAGING_DATADIR}/edje/include
 	install -d $edje_data_dir/include
 	install -m 0644 data/include/edje.inc $edje_data_dir/include
-- 
cgit v1.2.3


From cf2e14f1d29dfc2fdcbd0302f94c816b1b927d49 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Mon, 19 Mar 2007 05:12:25 +0000
Subject: e.bbclass: remove include hack, add -dev package

---
 classes/e.bbclass | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/classes/e.bbclass b/classes/e.bbclass
index f20c1f8b60..59f2771027 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -22,11 +22,12 @@ export ESMART_CONFIG		= "${STAGING_BINDIR_CROSS}/esmart-config"
 export FREETYPE_CONFIG		= "${STAGING_BINDIR_CROSS}/freetype-config"
 export IMLIB2_CONFIG		= "${STAGING_BINDIR_CROSS}/imlib2-config"
 
-do_compile_prepend() {
-	find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
-	find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
-}
+#do_compile_prepend() {
+#	find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+#	find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:'
+#}
 
-PACKAGES = "${PN}-dbg ${PN} ${PN}-themes"
+PACKAGES = "${PN}-dbg ${PN} ${PN}-themes ${PN}-dev"
 FILES_${PN} = "${libdir}/lib*.so*"
 FILES_${PN}-themes = "${datadir}/${PN}/themes ${datadir}/${PN}/data ${datadir}/${PN}/fonts ${datadir}/${PN}/pointers ${datadir}/${PN}/images ${datadir}/${PN}/users ${datadir}/${PN}/images ${datadir}/${PN}/styles"
+FILES_${PN}-dev += "${includedir}"
\ No newline at end of file
-- 
cgit v1.2.3


From 8783f89808493b0ccd5f31298851cdd6b61dfeeb Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Mon, 19 Mar 2007 05:13:34 +0000
Subject: e-wm: fix -dev and -dbg packages

---
 packages/e17/e-wm_0.16.999.037.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/e17/e-wm_0.16.999.037.bb b/packages/e17/e-wm_0.16.999.037.bb
index 3084fd99bc..0ccd0c67f2 100644
--- a/packages/e17/e-wm_0.16.999.037.bb
+++ b/packages/e17/e-wm_0.16.999.037.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "E17 - the Enlightenment Window Mananger"
 DEPENDS = "evas-x11 ecore-x11 edje eet embryo"
 LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
 
 inherit e update-alternatives
 
@@ -23,7 +23,9 @@ EXTRA_OECONF = "--with-profile=${PROFILE} \
                 --x-includes=${STAGING_INCDIR}/X11 \
                 --x-libraries=${STAGING_LIBDIR}"
 
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}"
+FILES_${PN} = "${bindir}/* ${libdir}/enlightenment/modules/*/*.edj ${libdir}/enlightenment/modules/*/*.desktop ${libdir}/enlightenment/modules/*/*/*.so ${libdir}/enlightenment/preload/*.so ${datadir} ${sysconfdir} ${libdir}/enlightenment/modules/cpufreq/*/freqset"
+FILES_${PN}-dev += "${libdir}/enlightenment/modules/*/*/*.a ${libdir}/enlightenment/modules/*/*/*.la ${libdir}/enlightenment/preload/*.a ${libdir}/enlightenment/preload/*.la"
+FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/ ${libdir}/enlightenment/preload/.debug/"
 
 do_compile_prepend() {
         find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
-- 
cgit v1.2.3


From 45eb07f3390cb62f65b46868c474fe593aba9ffe Mon Sep 17 00:00:00 2001
From: Holger Schurig <schurig@mn-solutions.de>
Date: Mon, 19 Mar 2007 08:23:58 +0000
Subject: ltrace: fix configure.ac to not search in /usr/include for header
 files

---
 packages/ltrace/files/.mtn2git_empty       |  0
 packages/ltrace/files/no-usr-include.patch | 16 ++++++++++++++++
 packages/ltrace/ltrace_0.4.bb              |  3 ++-
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 packages/ltrace/files/.mtn2git_empty
 create mode 100644 packages/ltrace/files/no-usr-include.patch

diff --git a/packages/ltrace/files/.mtn2git_empty b/packages/ltrace/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/ltrace/files/no-usr-include.patch b/packages/ltrace/files/no-usr-include.patch
new file mode 100644
index 0000000000..adadfa8032
--- /dev/null
+++ b/packages/ltrace/files/no-usr-include.patch
@@ -0,0 +1,16 @@
+--- ltrace-0.4.orig/configure.ac
++++ ltrace-0.4/configure.ac
+@@ -41,13 +41,6 @@
+ dnl   AC_CHECK_FUNCS(gettimeofday strdup strerror strspn)
+ AC_CHECK_FUNCS(getopt getopt_long)
+ 
+-for path in /usr/include/elfutils /usr/local/include/elfutils \
+-	    /usr/include/libelf /usr/local/include/libelf; do
+-	if test -f ${path}/gelf.h; then
+-		CPPFLAGS="$CPPFLAGS -I ${path}"
+-	fi
+-done
+-
+ AC_CHECK_HEADER(gelf.h,,AC_MSG_ERROR([***** gelf.h not found *****]))
+ 		 
+ AC_CHECK_LIB(elf,gelf_getdyn)
diff --git a/packages/ltrace/ltrace_0.4.bb b/packages/ltrace/ltrace_0.4.bb
index 4ef906f2f9..97b7d18d22 100644
--- a/packages/ltrace/ltrace_0.4.bb
+++ b/packages/ltrace/ltrace_0.4.bb
@@ -6,7 +6,8 @@ LICENSE = "GPL"
 PR = "r0"
 
 SRC_URI = "ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4.orig.tar.gz \
-           ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1"
+           ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1 \
+           file://no-usr-include.patch;patch=1"
 inherit autotools
 
 PARALLEL_MAKE = ""
-- 
cgit v1.2.3


From bd27ec87cc3355666dbf1849efd94f47896311c6 Mon Sep 17 00:00:00 2001
From: Stelios Koroneos <skoroneos@digital-opsis.com>
Date: Mon, 19 Mar 2007 08:28:53 +0000
Subje