merge of a0401b9f09376ea2c7d6eb10ff1ccfb84ec7649c

     and a0a93c4cb9609431f78a0188791c0cd9574687c9

35 files changed, 558 insertions, 130 deletions

diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb
index cf0d9c563e..a0b5996d6c 100644
--- a/packages/altboot/altboot.bb
+++ b/packages/altboot/altboot.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
  
 
-PR = "r6"
+PR = "r7"
 
 
 SRC_URI = "file://altboot-menu \
diff --git a/packages/binutils/binutils_2.15.94.0.1.bb b/packages/binutils/binutils_2.15.94.0.1.bb
index f8d39b1720..5edf4548a3 100644
--- a/packages/binutils/binutils_2.15.94.0.1.bb
+++ b/packages/binutils/binutils_2.15.94.0.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/binutils/"
 SECTION = "devel"
 LICENSE = "GPL"
 MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-PR = "r0"
+PR = "r1"
 
 inherit autotools gettext
 
@@ -69,14 +69,14 @@ export LD_FOR_TARGET = "${TARGET_PREFIX}ld"
 export NM_FOR_TARGET = "${TARGET_PREFIX}nm"
 export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
 
-export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
-export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc"
+export CC_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
+export CXX_FOR_HOST = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
 
 export CC_FOR_BUILD = "${BUILD_CC}"
 export CPP_FOR_BUILD = "${BUILD_CPP}"
 export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
 
-export CC = "${CCACHE} ${HOST_PREFIX}gcc"
+export CC = "${CCACHE} ${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
 
 do_configure () {
 	(cd ${S}; gnu-configize) || die "Failed to run gnu-configize"
diff --git a/packages/ctorrent/ctorrent_1.3.4.bb b/packages/ctorrent/ctorrent_1.3.4.bb
index 55b2fb91df..087823cdb4 100644
--- a/packages/ctorrent/ctorrent_1.3.4.bb
+++ b/packages/ctorrent/ctorrent_1.3.4.bb
@@ -1,8 +1,11 @@
 include ctorrent.inc
-PR = "r3"
+PR = "r4"
 
-SRC_URI += "file://nogetwd.patch;patch=1 \
+SRC_URI += "file://configure.patch;patch=1 \
+	    file://align.patch;patch=1 \
+	    file://nogetwd.patch;patch=1 \
 	    file://crash.patch;patch=1 \
 	    file://fmt.patch;patch=1 \
 	    file://stall.patch;patch=1 \
-	    file://tracker.patch;patch=1"
+	    file://tracker.patch;patch=1 \
+	    file://passkey.patch;patch=1"
diff --git a/packages/ctorrent/files/configure.patch b/packages/ctorrent/files/configure.patch
new file mode 100644
index 0000000000..95fe5cc2be
--- /dev/null
+++ b/packages/ctorrent/files/configure.patch
@@ -0,0 +1,29 @@
+diff -ur ctorrent/configure ctorrent.new/configure
+--- ctorrent/configure	2004-09-09 00:10:51.000000000 +0100
++++ ctorrent.new/configure	2005-01-23 18:29:34.000000000 +0000
+@@ -3216,13 +3216,13 @@
+ 
+ else
+ 
+-echo "$as_me:$LINENO: checking for SHA1_Init in -lcrypt" >&5
+-echo $ECHO_N "checking for SHA1_Init in -lcrypt... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for SHA1_Init in -lcrypto" >&5
++echo $ECHO_N "checking for SHA1_Init in -lcrypto... $ECHO_C" >&6
+ if test "${ac_cv_lib_crypt_SHA1_Init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcrypt  $LIBS"
++LIBS="-lcrypto  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -3275,7 +3275,7 @@
+ #define HAVE_LIBCRYPT 1
+ _ACEOF
+ 
+-  LIBS="-lcrypt $LIBS"
++  LIBS="-lcrypto $LIBS"
+ 
+ else
+ 
diff --git a/packages/ctorrent/files/passkey.patch b/packages/ctorrent/files/passkey.patch
new file mode 100644
index 0000000000..3debc44599
--- /dev/null
+++ b/packages/ctorrent/files/passkey.patch
@@ -0,0 +1,16 @@
+*** ctorrent/httpencode.cpp.orig	Thu Sep  9 01:10:51 2004
+--- ctorrent/httpencode.cpp	Thu Aug  4 15:00:45 2005
+***************
+*** 88,94 ****
+--- 88,98 ----
+  
+    /* path */
+    if( *p != '/' ) return -1;
++ #if 1  /* The passkey patch */
++   for( ; *p; p++,path++) *path = *p;
++ #else
+    for( ; *p && *p != '?'; p++,path++) *path = *p;
++ #endif
+    *path = '\0';
+    return 0;
+  }
diff --git a/packages/ctrlproxy/ctrlproxy_2.6.2.bb b/packages/ctrlproxy/ctrlproxy_2.6.2.bb
index 3eb809edb0..b3de2db061 100644
--- a/packages/ctrlproxy/ctrlproxy_2.6.2.bb
+++ b/packages/ctrlproxy/ctrlproxy_2.6.2.bb
@@ -6,7 +6,7 @@ DEPENDS = "glib-2.0 libxml2 popt pcre openssl"
 PR = "r0"
 LICENSE = "GPL"
 
-SRC_URI = "http://ctrlproxy.vernstok.nl/releases/ctrlproxy-2.6.2.tar.gz"
+SRC_URI = "http://sources.nslu2-linux.org/sources/ctrlproxy-2.6.2.tar.gz"
 S = "${WORKDIR}/ctrlproxy-2.6.2/"
 
 inherit autotools
diff --git a/packages/db/db_4.3.27.bb b/packages/db/db_4.3.27.bb
index 3a233dcff1..216fb5714b 100644
--- a/packages/db/db_4.3.27.bb
+++ b/packages/db/db_4.3.27.bb
@@ -49,7 +49,12 @@ DB4_CONFIG ?= "--enable-o_direct --enable-smallbuild"
 # the default - "POSIX/pthreads/library".
 # Don't ignore the nice SWP instruction on the ARM:
 EXTRA_OECONF = "${DB4_CONFIG}"
-EXTRA_OECONF_nslu2 = "${DB4_CONFIG} --with-mutex=ARM/gcc-assembly"
+# These enable the ARM assembler mutex code, this won't
+# work with thumb compilation...
+ARM_MUTEX = "--with-mutex=ARM/gcc-assembly"
+ARM_MUTEX_thumb = ""
+# NOTE: only tested on nslu2, should probably be _armeb
+EXTRA_OECONF_nslu2 = "${DB4_CONFIG} ${ARM_MUTEX}"
 
 # Cancel the site stuff - it's set for db3 and destroys the
 # configure.
diff --git a/packages/e17/entice_20050810.bb b/packages/e17/entice_20050810.bb
index 529f2e3b4c..fc4d8c51af 100644
--- a/packages/e17/entice_20050810.bb
+++ b/packages/e17/entice_20050810.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Entice is a picture viewer"
 SECTION = "e/apps"
-DEPENDS = "freetype eet evas ecore embryo imlib2 edje-native"
+DEPENDS = "freetype eet virtual/evas virtual/ecore embryo virtual/imlib2 edje-native"
 LICENSE = "MIT"
 HOMEPAGE = "http://www.enlightenment.org"
 MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
-CVSDATE = "${PV}
+CVSDATE = "${PV}"
 PR = "r0"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/enlightenment;module=e17/apps/entice"
diff --git a/packages/gcc/gcc-3.4.4/gcc34-configure.in.patch b/packages/gcc/gcc-3.4.4/gcc34-configure.in.patch
new file mode 100644
index 0000000000..3d33bcb978
--- /dev/null
+++ b/packages/gcc/gcc-3.4.4/gcc34-configure.in.patch
@@ -0,0 +1,22 @@
+--- gcc-3.4.4/configure.in.orig	2005-08-09 19:57:51.504323183 -0700
++++ gcc-3.4.4/configure.in	2005-08-09 20:00:12.073168623 -0700
+@@ -1907,7 +1907,7 @@
+   *) gxx_include_dir=${with_gxx_include_dir} ;;
+ esac
+ 
+-FLAGS_FOR_TARGET=
++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
+ case " $target_configdirs " in
+  *" newlib "*)
+   case " $target_configargs " in
+--- gcc-3.4.4/configure.orig	2005-08-09 21:02:29.668360660 -0700
++++ gcc-3.4.4/configure	2005-08-09 21:02:50.157649970 -0700
+@@ -2669,7 +2669,7 @@
+   *) gxx_include_dir=${with_gxx_include_dir} ;;
+ esac
+ 
+-FLAGS_FOR_TARGET=
++FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
+ case " $target_configdirs " in
+  *" newlib "*)
+   case " $target_configargs " in
diff --git a/packages/gcc/gcc-3.4.4/gcc34-thumb-clearinsn.patch b/packages/gcc/gcc-3.4.4/gcc34-thumb-clearinsn.patch
new file mode 100644
index 0000000000..57ccb85361
--- /dev/null
+++ b/packages/gcc/gcc-3.4.4/gcc34-thumb-clearinsn.patch
@@ -0,0 +1,26 @@
+--- gcc-3.4.4/gcc/config/arm/linux-gas.h.orig	2005-08-09 08:10:22.809195204 -0700
++++ gcc-3.4.4/gcc/config/arm/linux-gas.h	2005-08-09 08:13:06.539498102 -0700
+@@ -56,6 +56,7 @@
+ 
+ /* Clear the instruction cache from `beg' to `end'.  This makes an
+    inline system call to SYS_cacheflush.  */
++#if !defined(__thumb__)
+ #define CLEAR_INSN_CACHE(BEG, END)					\
+ {									\
+   register unsigned long _beg __asm ("a1") = (unsigned long) (BEG);	\
+@@ -65,3 +66,15 @@
+ 		    : "=r" (_beg)					\
+ 		    : "0" (_beg), "r" (_end), "r" (_flg));		\
+ }
++#else
++#define CLEAR_INSN_CACHE(BEG, END)					\
++{									\
++  register unsigned long _beg __asm ("a1") = (unsigned long) (BEG);	\
++  register unsigned long _end __asm ("a2") = (unsigned long) (END);	\
++  register unsigned long _flg __asm ("a3") = 0;				\
++  register unsigned long _swi __asm ("r7") = 0x9f0002;			\
++  __asm __volatile ("swi 0		@ sys_cacheflush"		\
++		    : "=r" (_beg)					\
++		    : "0" (_beg), "r" (_end), "r" (_flg), "r" (_swi));	\
++}
++#endif
diff --git a/packages/gcc/gcc-3.4.4/gcc34-thumb-div0.patch b/packages/gcc/gcc-3.4.4/gcc34-thumb-div0.patch
new file mode 100644
index 0000000000..d57a420053
--- /dev/null
+++ b/packages/gcc/gcc-3.4.4/gcc34-thumb-div0.patch
@@ -0,0 +1,11 @@
+--- gcc-3.4.4/gcc/config/arm/lib1funcs.asm.orig	2005-08-09 07:58:42.717141188 -0700
++++ gcc-3.4.4/gcc/config/arm/lib1funcs.asm	2005-08-09 07:58:45.425311603 -0700
+@@ -816,7 +816,7 @@
+ #define __NR_kill			(__NR_SYSCALL_BASE+ 37)
+ 
+ 	.code	32
+-	FUNC_START div0
++	ARM_FUNC_START div0
+ 
+ 	stmfd	sp!, {r1, lr}
+ 	swi	__NR_getpid
diff --git a/packages/gcc/gcc-3.4.4/gcc34-thumb-lib1asmfuncs.patch b/packages/gcc/gcc-3.4.4/gcc34-thumb-lib1asmfuncs.patch
new file mode 100644
index 0000000000..c3972d7ece
--- /dev/null
+++ b/packages/gcc/gcc-3.4.4/gcc34-thumb-lib1asmfuncs.patch
@@ -0,0 +1,10 @@
+--- gcc-3.4.4/gcc/config/arm/t-linux.orig	2005-08-09 08:55:02.181797492 -0700
++++ gcc-3.4.4/gcc/config/arm/t-linux	2005-08-09 08:58:22.766419486 -0700
+@@ -7,6 +7,7 @@
+ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \
+ 	_negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
+ 	_truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
++	_call_via_rX _interwork_call_via_rX \
+ 	_fixsfsi _fixunssfsi
+ 
+ # MULTILIB_OPTIONS = mhard-float/msoft-float
diff --git a/packages/gcc/gcc-cross_3.4.4.bb b/packages/gcc/gcc-cross_3.4.4.bb
index b261db4c1f..c111ac00b7 100644
--- a/packages/gcc/gcc-cross_3.4.4.bb
+++ b/packages/gcc/gcc-cross_3.4.4.bb
@@ -5,7 +5,7 @@ inherit cross
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
diff --git a/packages/gcc/gcc3-build-cross.inc b/packages/gcc/gcc3-build-cross.inc
index 0893e4b97c..a41ae11d64 100644
--- a/packages/gcc/gcc3-build-cross.inc
+++ b/packages/gcc/gcc3-build-cross.inc
@@ -13,7 +13,7 @@ do_compile_prepend () {
 	export RANLIB_FOR_TARGET="${TARGET_SYS}-ranlib"
 	export LD_FOR_TARGET="${TARGET_SYS}-ld"
 	export NM_FOR_TARGET="${TARGET_SYS}-nm"
-	export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc"
+	export CC_FOR_TARGET="${CCACHE} ${TARGET_SYS}-gcc ${TARGET_CC_ARCH}"
 }
 
 do_stage_append () {
diff --git a/packages/gcc/gcc3-build.inc b/packages/gcc/gcc3-build.inc
index 09e0b31910..a09c6cf1f5 100644
--- a/packages/gcc/gcc3-build.inc
+++ b/packages/gcc/gcc3-build.inc
@@ -44,6 +44,12 @@ EXTRA_OECONF_glibc = "--enable-__cxa_atexit"
 EXTRA_OECONF += "${@get_gcc_fpu_setting(bb, d)}"
 CPPFLAGS = ""
 
+# Used by configure to define additional values for FLAGS_FOR_TARGET -
+# passed to all the compilers.
+ARCH_FLAGS_FOR_TARGET = ""
+ARCH_FLAGS_FOR_TARGET_nslu2 = "${TARGET_CC_ARCH}"
+EXTRA_OEMAKE += "ARCH_FLAGS_FOR_TARGET='${ARCH_FLAGS_FOR_TARGET}'"
+
 def get_gcc_fpu_setting(bb, d):
 	if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
 		return "--with-float=soft"
@@ -59,10 +65,14 @@ python __anonymous () {
 
 do_configure () {
 	# Setup these vars for cross building only
+	# ... because foo_FOR_TARGET apparently gets misinterpreted inside the
+	# gcc build stuff when the build is producing a cross compiler - i.e.
+	# when the 'current' target is the 'host' system, and the host is not
+	# the target (because the build is actually making a cross compiler!)
 	if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
-		export CC_FOR_TARGET="${CCACHE} ${HOST_PREFIX}gcc"
-		export GCC_FOR_TARGET="${CCACHE} ${HOST_PREFIX}gcc"
-		export CXX_FOR_TARGET="${CCACHE} ${HOST_PREFIX}g++"
+		export CC_FOR_TARGET="${CC}"
+		export GCC_FOR_TARGET="${CC}"
+		export CXX_FOR_TARGET="${CXX}"
 		export AS_FOR_TARGET="${HOST_PREFIX}as"
 		export LD_FOR_TARGET="${HOST_PREFIX}ld"
 		export NM_FOR_TARGET="${HOST_PREFIX}nm"
@@ -75,6 +85,7 @@ do_configure () {
 	export CPPFLAGS_FOR_BUILD="${BUILD_CPPFLAGS}"
 	export CXXFLAGS_FOR_BUILD="${BUILD_CXXFLAGS}"
 	export LDFLAGS_FOR_BUILD="${BUILD_LDFLAGS}"
+	export ARCH_FLAGS_FOR_TARGET="${ARCH_FLAGS_FOR_TARGET}"
 	(cd ${S} && gnu-configize) || die "failure running gnu-configize"
 	oe_runconf
 }
diff --git a/packages/gcc/gcc_3.4.4.bb b/packages/gcc/gcc_3.4.4.bb
index 263d78396c..f4a67b77c2 100644
--- a/packages/gcc/gcc_3.4.4.bb
+++ b/packages/gcc/gcc_3.4.4.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
@@ -24,4 +24,9 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	   file://15342.patch;patch=1 \
 	   file://always-fixincperm.patch;patch=1"
 
+SRC_URI += "file://gcc34-thumb-div0.patch;patch=1"
+SRC_URI += "file://gcc34-thumb-clearinsn.patch;patch=1"
+SRC_URI += "file://gcc34-thumb-lib1asmfuncs.patch;patch=1"
+SRC_URI += "file://gcc34-configure.in.patch;patch=1"
+
 include gcc3-build.inc
diff --git a/packages/icecast/icecast_2.2.0.bb b/packages/icecast/icecast_2.2.0.bb
index 0612c28da5..1511f6dcfc 100644
--- a/packages/icecast/icecast_2.2.0.bb
+++ b/packages/icecast/icecast_2.2.0.bb
@@ -2,6 +2,8 @@ DEPENDS = "libxslt"
 PR = "r1"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
 
+DEPENDS = "libvorbis libogg"
+
 SRC_URI = "http://downloads.us.xiph.org/releases/icecast/${PN}-${PV}.tar.gz"
 
 S = "${WORKDIR}/${PN}-${PV}"
diff --git a/packages/libmad/libmad_0.15.0b.bb b/packages/libmad/libmad_0.15.0b.bb
index 910399f8b3..51402d2f01 100644
--- a/packages/libmad/libmad_0.15.0b.bb
+++ b/packages/libmad/libmad_0.15.0b.bb
@@ -11,6 +11,8 @@ S = "${WORKDIR}/libmad-${PV}"
 inherit autotools 
 
 EXTRA_OECONF = "-enable-speed --enable-shared"
+# The ASO's don't take any account of thumb...
+EXTRA_OECONF_append_thumb = " --disable-aso --enable-fpm=default"
 
 do_configure_prepend () {
 #	damn picky automake...
diff --git a/packages/libvorbis/libvorbis_1.0.1.bb b/packages/libvorbis/libvorbis_1.0.1.bb
index 89bae8f858..3a3ab73eeb 100644
--- a/packages/libvorbis/libvorbis_1.0.1.bb
+++ b/packages/libvorbis/libvorbis_1.0.1.bb
@@ -9,6 +9,10 @@ file://m4.patch;patch=1"
 
 inherit autotools  pkgconfig
 
+# vorbisfile.c reveals a problem in the gcc register spilling for the
+# thumb instruction set...
+FULL_OPTIMIZATION_thumb = "-O0"
+
 EXTRA_OECONF = "--with-ogg-libraries=${STAGING_LIBDIR} \
 	        --with-ogg-includes=${STAGING_INCDIR}"
 
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/add-elpp-stuff.patch b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/add-elpp-stuff.patch
index 85d07191b9..04ab185f4f 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/add-elpp-stuff.patch
+++ b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/add-elpp-stuff.patch
@@ -3,10 +3,8 @@
 # Patch managed by http://www.holgerschurig.de/patcher.html
 #
 
-Index: linux-2.6.12/Documentation/fb/elpp.txt
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.12/Documentation/fb/elpp.txt	2005-07-24 18:21:08.000000000 +0100
+--- /dev/null
++++ linux-2.6.12/Documentation/fb/elpp.txt
 @@ -0,0 +1,181 @@
 +
 +	ELPP, The Enhanced Linux Progress Patch v1.0
@@ -189,10 +187,8 @@ Index: linux-2.6.12/Documentation/fb/elpp.txt
 +            -----------------------------------------
 +            Comments, queries and changes welcome at:
 +            Matthias Kunze <elpp at foofighter.de>
-Index: linux-2.6.12/drivers/video/Kconfig
-===================================================================
---- linux-2.6.12.orig/drivers/video/Kconfig	2005-07-24 18:20:46.000000000 +0100
-+++ linux-2.6.12/drivers/video/Kconfig	2005-07-24 18:21:08.000000000 +0100
+--- linux-2.6.12/drivers/video/Kconfig~add-elpp-stuff.patch
++++ linux-2.6.12/drivers/video/Kconfig
 @@ -108,6 +108,11 @@
  	 This is particularly important to one driver, matroxfb.  If
  	 unsure, say N.
@@ -205,10 +201,8 @@ Index: linux-2.6.12/drivers/video/Kconfig
  config FB_CIRRUS
  	tristate "Cirrus Logic support"
  	depends on FB && (ZORRO || PCI)
-Index: linux-2.6.12/drivers/video/console/Makefile
-===================================================================
---- linux-2.6.12.orig/drivers/video/console/Makefile	2005-07-24 18:20:21.000000000 +0100
-+++ linux-2.6.12/drivers/video/console/Makefile	2005-07-24 18:21:08.000000000 +0100
+--- linux-2.6.12/drivers/video/console/Makefile~add-elpp-stuff.patch
++++ linux-2.6.12/drivers/video/console/Makefile
 @@ -31,6 +31,8 @@
  obj-$(CONFIG_FRAMEBUFFER_CONSOLE)     += tileblit.o
  endif
@@ -218,10 +212,8 @@ Index: linux-2.6.12/drivers/video/console/Makefile
  obj-$(CONFIG_FB_STI)              += sticore.o font.o
  
  # Targets that kbuild needs to know about
-Index: linux-2.6.12/drivers/video/console/elpp.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.12/drivers/video/console/elpp.c	2005-07-24 18:21:08.000000000 +0100
+--- /dev/null
++++ linux-2.6.12/drivers/video/console/elpp.c
 @@ -0,0 +1,685 @@
 +
 +/* 
@@ -908,10 +900,8 @@ Index: linux-2.6.12/drivers/video/console/elpp.c
 +    return -1;
 +}
 +
-Index: linux-2.6.12/drivers/video/console/fbcon.c
-===================================================================
---- linux-2.6.12.orig/drivers/video/console/fbcon.c	2005-07-24 18:20:21.000000000 +0100
-+++ linux-2.6.12/drivers/video/console/fbcon.c	2005-07-24 18:21:08.000000000 +0100
+--- linux-2.6.12/drivers/video/console/fbcon.c~add-elpp-stuff.patch
++++ linux-2.6.12/drivers/video/console/fbcon.c
 @@ -91,6 +91,9 @@
  #include <asm/machdep.h>
  #include <asm/setup.h>
@@ -931,7 +921,7 @@ Index: linux-2.6.12/drivers/video/console/fbcon.c
  static signed char con2fb_map_boot[MAX_NR_CONSOLES];
  static int logo_height;
  static int logo_lines;
-@@ -996,6 +999,19 @@
+@@ -997,6 +1000,19 @@
  			softback_top = 0;
  		}
  	}
@@ -951,7 +941,7 @@ Index: linux-2.6.12/drivers/video/console/fbcon.c
  }
  
  static void fbcon_deinit(struct vc_data *vc)
-@@ -1996,6 +2012,12 @@
+@@ -1997,6 +2013,12 @@
  		logo_shown = fg_console;
  		/* This is protected above by initmem_freed */
  		fb_show_logo(info);
@@ -964,10 +954,8 @@ Index: linux-2.6.12/drivers/video/console/fbcon.c
  		update_region(vc,
  			      vc->vc_origin + vc->vc_size_row * vc->vc_top,
  			      vc->vc_size_row * (vc->vc_bottom -
-Index: linux-2.6.12/drivers/video/console/symbols_16x16.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.12/drivers/video/console/symbols_16x16.c	2005-07-24 18:21:08.000000000 +0100
+--- /dev/null
++++ linux-2.6.12/drivers/video/console/symbols_16x16.c
 @@ -0,0 +1,123 @@
 +
 +#include <linux/font.h>
@@ -1092,11 +1080,9 @@ Index: linux-2.6.12/drivers/video/console/symbols_16x16.c
 +	0
 +};
 +
-Index: linux-2.6.12/drivers/video/fbmem.c
-===================================================================
---- linux-2.6.12.orig/drivers/video/fbmem.c	2005-07-24 18:20:37.000000000 +0100
-+++ linux-2.6.12/drivers/video/fbmem.c	2005-07-24 18:21:08.000000000 +0100
-@@ -360,7 +360,13 @@
+--- linux-2.6.12/drivers/video/fbmem.c~add-elpp-stuff.patch
++++ linux-2.6.12/drivers/video/fbmem.c
+@@ -362,7 +362,13 @@
  		fb_logo.depth = 4;
  	else
  		fb_logo.depth = 1;		
@@ -1110,7 +1096,7 @@ Index: linux-2.6.12/drivers/video/fbmem.c
  }
  
  int fb_show_logo(struct fb_info *info)
-@@ -410,11 +416,22 @@
+@@ -412,11 +418,22 @@
  
  	image.width = fb_logo.logo->width;
  	image.height = fb_logo.logo->height;
@@ -1133,10 +1119,8 @@ Index: linux-2.6.12/drivers/video/fbmem.c
  		info->fbops->fb_imageblit(info, &image);
  	}
  	
-Index: linux-2.6.12/drivers/video/logo/Makefile
-===================================================================
---- linux-2.6.12.orig/drivers/video/logo/Makefile	2005-07-24 18:20:21.000000000 +0100
-+++ linux-2.6.12/drivers/video/logo/Makefile	2005-07-24 18:22:21.000000000 +0100
+--- linux-2.6.12/drivers/video/logo/Makefile~add-elpp-stuff.patch
++++ linux-2.6.12/drivers/video/logo/Makefile
 @@ -13,6 +13,7 @@
  obj-$(CONFIG_LOGO_SUPERH_VGA16)		+= logo_superh_vga16.o
  obj-$(CONFIG_LOGO_SUPERH_CLUT224)	+= logo_superh_clut224.o
@@ -1145,10 +1129,8 @@ Index: linux-2.6.12/drivers/video/logo/Makefile
  
  # How to generate logo's
  
-Index: linux-2.6.12/drivers/video/logo/logo.c
-===================================================================
---- linux-2.6.12.orig/drivers/video/logo/logo.c	2005-07-24 18:20:21.000000000 +0100
-+++ linux-2.6.12/drivers/video/logo/logo.c	2005-07-24 18:23:04.000000000 +0100
+--- linux-2.6.12/drivers/video/logo/logo.c~add-elpp-stuff.patch
++++ linux-2.6.12/drivers/video/logo/logo.c
 @@ -14,6 +14,10 @@
  #include <linux/stddef.h>
  #include <linux/module.h>
@@ -1182,10 +1164,8 @@ Index: linux-2.6.12/drivers/video/logo/logo.c
  	}
  	return logo;
  }
-Index: linux-2.6.12/drivers/video/logo/logo_linux_elpp.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.12/drivers/video/logo/logo_linux_elpp.c	2005-07-24 18:21:08.000000000 +0100
+--- /dev/null
++++ linux-2.6.12/drivers/video/logo/logo_linux_elpp.c
 @@ -0,0 +1,25669 @@
 +/*
 + *  DO NOT EDIT THIS FILE!
@@ -26856,10 +26836,8 @@ Index: linux-2.6.12/drivers/video/logo/logo_linux_elpp.c
 +    .data	= logo_linux_elpp_data
 +};
 +
-Index: linux-2.6.12/include/linux/elpp.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.12/include/linux/elpp.h	2005-07-24 18:21:08.000000000 +0100
+--- /dev/null
++++ linux-2.6.12/include/linux/elpp.h
 @@ -0,0 +1,96 @@
 +
 +/* 
@@ -26957,10 +26935,8 @@ Index: linux-2.6.12/include/linux/elpp.h
 +extern struct elpp_struct elpp;
 +
 +#endif
-Index: linux-2.6.12/init/main.c
-===================================================================
---- linux-2.6.12.orig/init/main.c	2005-07-24 18:20:41.000000000 +0100
-+++ linux-2.6.12/init/main.c	2005-07-24 18:21:08.000000000 +0100
+--- linux-2.6.12/init/main.c~add-elpp-stuff.patch
++++ linux-2.6.12/init/main.c
 @@ -108,6 +108,12 @@
  enum system_states system_state;
  EXPORT_SYMBOL(system_state);
@@ -26974,7 +26950,7 @@ Index: linux-2.6.12/init/main.c
  /*
   * Boot command-line arguments
   */
-@@ -523,6 +529,9 @@
+@@ -533,6 +539,9 @@
  	signals_init();
  	/* rootfs populating might need page-writeback */
  	page_writeback_init();
@@ -26984,7 +26960,7 @@ Index: linux-2.6.12/init/main.c
  #ifdef CONFIG_PROC_FS
  	proc_root_init();
  #endif
-@@ -564,7 +573,7 @@
+@@ -574,7 +583,7 @@
  		}
  
  		(*call)();
@@ -26993,7 +26969,7 @@ Index: linux-2.6.12/init/main.c
  		msg = NULL;
  		if (preempt_count() != count) {
  			msg = "preemption imbalance";
-@@ -631,6 +640,13 @@
+@@ -641,6 +650,13 @@
  #ifdef CONFIG_SMP
  	int i;
  
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index ee2cef1d9e..db150f7972 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -1,84 +1,65 @@
 DESCRIPTION = "Packages that are compatible with the OpenSlug firmware"
 LICENSE = MIT
-PR = "r4"
+PR = "r5"
 
 INHIBIT_DEFAULT_DEPS = "1"
 ALLOW_EMPTY = 1
 PACKAGES = "${PN}"
 
-OPENSLUG_DEVELOPMENT = "\
+OPENSLUG_PACKAGES = "\
+	atftp \
 	autoconf \
 	automake \
 	bash \
+	bind \
 	binutils \
 	bison \
-	bzip2 \
-	coreutils \
-	cvs \
-	diffutils \
-	findutils \
-	flex \
-	gawk \
-	gcc \
-	gdb \
-	gnu-config \
-	grep \
-	gzip \
-	ipkg-utils \
-	libtool \
-	lsof \
-	m4 \
-	make \
-	monotone-4 monotone-5 \
-	ncurses \
-	openssh \
-	patch \
-	pciutils \
-	perl \
-	pkgconfig \
-	quilt \
-	sed \
-	strace \
-	tar \
-	util-linux \
-	"
-
-
-OPENSLUG_PACKAGES = "\
-	atftp \
-	bash \
-	bind \
 	bluez-utils-nodbus \
 	bridge-utils \
 	bwmon \
+	bzip2 \
 	ccxstream \
 	coreutils \
 	cron \
 	ctorrent \
+	ctrlproxy \
 	cvs\
 	cyrus-imapd \
 	db4 \
 	diffstat \
+	diffutils \
 	dnsmasq \
 	expat \
+	findutils \
+	flex \
 	ftpd-topfield \
+	gawk \
+	gcc \
+	gdb \
 	glib-2.0 \
+	gnu-config \
 	gphoto2 \
+	grep \
 	gtk-doc \
-	icecast \
+	gzip \
 	iperf \
-	ifupdown \
+	ipkg-utils \
 	jpeg \
 	less \
 	libpam \
 	libpng \
+	libtool \
 	libusb \
 	libxml2 \
+	lsof \
+	m4 \
 	mailx \