merge of '55b6b2c132d8b0a81bcec0deed383a3da45e39e8'

     and '67254ac9ecc3abdbf0b718b05d6eaa8d6b4b6e92'

23 files changed, 267 insertions, 266 deletions

diff --git a/classes/e.bbclass b/classes/e.bbclass
index 84d85f5542..3fb2355bc9 100644
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -1,6 +1,7 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SECTION = "e/apps"
-SRC_URI = "http://download.enlightenment.org/snapshots/2007-06-17/${PN}-${PV}.tar.gz"
+SRC_URI = "${E_CVS};module=e17/apps/${SRCNAME}"
+S = "${WORKDIR}/${SRCNAME}"
 
 inherit autotools pkgconfig binconfig
 
@@ -9,27 +10,10 @@ do_prepsources () {
 }
 addtask prepsources after do_fetch before do_unpack
 
-export CURL_CONFIG		= "${STAGING_BINDIR_CROSS}/curl-config"
-export EDB_CONFIG		= "${STAGING_BINDIR_CROSS}/edb-config"
-export EET_CONFIG		= "${STAGING_BINDIR_CROSS}/eet-config"
-export EVAS_CONFIG		= "${STAGING_BINDIR_CROSS}/evas-config"
-export ECORE_CONFIG		= "${STAGING_BINDIR_CROSS}/ecore-config"
-export EMBRYO_CONFIG		= "${STAGING_BINDIR_CROSS}/embryo-config"
-export ENGRAVE_CONFIG		= "${STAGING_BINDIR_CROSS}/engrave-config"
-export ENLIGHTENMENT_CONFIG	= "${STAGING_BINDIR_CROSS}/enlightenment-config"
-export EPSILON_CONFIG		= "${STAGING_BINDIR_CROSS}/epsilon-config"
-export EPEG_CONFIG		= "${STAGING_BINDIR_CROSS}/epeg-config"
-export ESMART_CONFIG		= "${STAGING_BINDIR_CROSS}/esmart-config"
-export FREETYPE_CONFIG		= "${STAGING_BINDIR_CROSS}/freetype-config"
-export IMLIB2_CONFIG		= "${STAGING_BINDIR_CROSS}/imlib2-config"
+export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config"
+export FREETYPE_CONFIG = "${STAGING_BINDIR_CROSS}/freetype-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}:'
-#}
-
-PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev"
-FILES_${PN} += "${libdir}/lib*.so.*"
+PACKAGES = "${PN}-dbg ${PN}-themes ${PN} ${PN}-dev ${PN}-lib"
+FILES_${PN}-lib = "${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} ${libdir}/lib*.so"
-
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index c8e068f739..02c5e691fc 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -60,6 +60,10 @@ fakeroot rootfs_ipk_do_rootfs () {
 
 	rm -f ${IMAGE_ROOTFS}${libdir}/opkg/lists/*
 	
+	# Keep these lines until package manager selection is implemented
+	ln -s opkg ${IMAGE_ROOTFS}${sysconfdir}/ipkg
+	ln -s opkg ${IMAGE_ROOTFS}${libdir}/ipkg
+	
 	${ROOTFS_POSTPROCESS_COMMAND}
 	
 	log_check rootfs 	
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index cb960d5168..6f9568c9c0 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -56,7 +56,7 @@ SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-lightmediascanner ?= "68"
 SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
-SRCREV_pn-linux-ixp4xx ?= "1039"
+SRCREV_pn-linux-ixp4xx ?= "1056"
 SRCREV_pn-linux-openmoko ?= "4194"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc
index da1e8b7557..f392901bb8 100644
--- a/conf/machine/include/ixp4xx.inc
+++ b/conf/machine/include/ixp4xx.inc
@@ -7,7 +7,7 @@ MACHINE_FEATURES ?= "kernel26 usbhost ext2 vfat redboot apex"
 
 # Select an appropriate default kernel
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
-PREFERRED_VERSION_linux-ixp4xx ?= "2.6.24+svnr${SRCREV}"
+PREFERRED_VERSION_linux-ixp4xx ?= "2.6.24.4+svnr${SRCREV}"
 
 # Add packages required for basic networking support
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "ixp4xx-npe"
diff --git a/packages/busybox/busybox-1.9.1/defconfig b/packages/busybox/busybox-1.9.1/defconfig
index 770ef6eb12..33d30911da 100644
--- a/packages/busybox/busybox-1.9.1/defconfig
+++ b/packages/busybox/busybox-1.9.1/defconfig
@@ -633,7 +633,7 @@ CONFIG_ROUTE=y
 CONFIG_TELNET=y
 # CONFIG_FEATURE_TELNET_TTYPE is not set
 CONFIG_FEATURE_TELNET_AUTOLOGIN=y
-# CONFIG_TELNETD is not set
+CONFIG_TELNETD=y
 # CONFIG_FEATURE_TELNETD_STANDALONE is not set
 CONFIG_TFTP=y
 CONFIG_FEATURE_TFTP_GET=y
diff --git a/packages/busybox/files/50telnet b/packages/busybox/files/50telnet
new file mode 100644
index 0000000000..3fb4a90494
--- /dev/null
+++ b/packages/busybox/files/50telnet
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2008 Koen Kooi
+
+# This starts telnetd if the password for 'root' is empty. This is needed for devices without a screen or serial console (wifi router, NAS, etc). 
+
+start() {
+	if awk -F: '/^root:/ && ($2 != "") && ($2 !~ /\!/) {exit 1}' /etc/passwd 2>/dev/null 
+	then 
+		telnetd -l /bin/login.failsafe
+	fi
+}
+
+stop() {
+	killall telnetd
+}
diff --git a/packages/busybox/files/login.failsafe b/packages/busybox/files/login.failsafe
new file mode 100644
index 0000000000..e7c12a27fb
--- /dev/null
+++ b/packages/busybox/files/login.failsafe
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2008 Koen Kooi
+
+grep '^root:[^!]' /etc/passwd >&- 2>&-
+[ "$?" = "0" ]  &&  
+{
+    echo "Login failed."
+    exit 0
+} || {
+cat << EOF
+ === IMPORTANT ============================
+  Use 'passwd' to set your login password
+  this will disable telnet and enable SSH
+ ------------------------------------------
+EOF
+}
+
+exec /bin/sh --login
diff --git a/packages/db/db-native_4.2.52.bb b/packages/db/db-native_4.2.52.bb
index 567ddffb75..0e6381bca1 100644
--- a/packages/db/db-native_4.2.52.bb
+++ b/packages/db/db-native_4.2.52.bb
@@ -1,27 +1,2 @@
-# This wrapper builds a native version of the SleepyCat
-# Berkeley DB for those packages which need it (e.g.
-# perl).
-SECTION = "libs"
-VIRTUAL_NAME = "virtual/db-native"
-CONFLICTS = "db3-native"
-#PR tracks the non-native package
-
-inherit native
-
 require db_${PV}.bb
-
-PACKAGES = ""
-
-do_stage() {
-         # The .h files get installed read-only, the autostage
-         # function just uses cp -pPR, so do this by hand
-         rm -rf ${STAGE_TEMP}
-         mkdir -p ${STAGE_TEMP}
-         oe_runmake DESTDIR="${STAGE_TEMP}" install_include
-         cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/.
-         rm -rf ${STAGE_TEMP}
-         oe_libinstall -so -C .libs libdb-4.2 ${STAGING_LIBDIR}
-         ln -sf libdb-4.2.so ${STAGING_LIBDIR}/libdb.so
-         ln -sf libdb-4.2.a ${STAGING_LIBDIR}/libdb.a
-}
-
+require db4-native.inc
diff --git a/packages/db/db-native_4.3.29.bb b/packages/db/db-native_4.3.29.bb
index aac4e2021b..0e6381bca1 100644
--- a/packages/db/db-native_4.3.29.bb
+++ b/packages/db/db-native_4.3.29.bb
@@ -1,17 +1,2 @@
-# This wrapper builds a native version of the SleepyCat
-# Berkeley DB for those packages which need it (e.g.
-# perl).
-SECTION = "libs"
-VIRTUAL_NAME = "virtual/db-native"
-CONFLICTS = "db3-native"
-#PR tracks the non-native package
-
-inherit native
-
 require db_${PV}.bb
-
-do_package() {
-:
-}
-
-PACKAGES = ""
+require db4-native.inc
diff --git a/packages/db/db3_3.2.9.bb b/packages/db/db3_3.2.9.bb
index 7edba4f543..872ceeab87 100644
--- a/packages/db/db3_3.2.9.bb
+++ b/packages/db/db3_3.2.9.bb
@@ -1,8 +1,8 @@
 SECTION = "libs"
 DESCRIPTION = "Berkeley DB v3."
-HOMEPAGE = "http://www.sleepycat.com"
-LICENSE = "BSD Sleepycat"
-PR = "r2"
+HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
+LICENSE = "BSD"
+PR = "r3"
 VIRTUAL_NAME ?= "virtual/db"
 CONFLICTS = "db"
 
@@ -11,7 +11,7 @@ CONFLICTS = "db"
 # a build to select the desired one.
 PROVIDES += "${VIRTUAL_NAME}"
 
-SRC_URI = "http://download-west.oracle.com/berkeley-db/db-${PV}.tar.gz \
+SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz \
 	   file://autofoo.patch;patch=1"
 S = "${WORKDIR}/db-${PV}/dist"
 B = "${WORKDIR}/db-${PV}/build_unix"
diff --git a/packages/db/db4-native.inc b/packages/db/db4-native.inc
new file mode 100644
index 0000000000..cc83d86dd8
--- /dev/null
+++ b/packages/db/db4-native.inc
@@ -0,0 +1,28 @@
+# This wrapper builds a native version of the Oracal
+# Berkeley DB for those packages which need it (e.g.
+# perl).
+
+VIRTUAL_NAME = "virtual/db-native"
+CONFLICTS = "db3-native"
+#PR tracks the non-native package
+
+inherit native
+
+do_package() {
+:
+}
+
+PACKAGES = ""
+
+do_stage() {
+         # The .h files get installed read-only, the autostage
+         # function just uses cp -pPR, so do this by hand
+         rm -rf ${STAGE_TEMP}
+         mkdir -p ${STAGE_TEMP}
+         oe_runmake DESTDIR="${STAGE_TEMP}" install_include
+         cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/.
+         rm -rf ${STAGE_TEMP}
+         oe_libinstall -so -C .libs libdb-${PVM} ${STAGING_LIBDIR}
+         ln -sf libdb-${PVM}.so ${STAGING_LIBDIR}/libdb.so
+         ln -sf libdb-${PVM}.a ${STAGING_LIBDIR}/libdb.a
+}
diff --git a/packages/db/db4.inc b/packages/db/db4.inc
new file mode 100644
index 0000000000..12d4ad2166
--- /dev/null
+++ b/packages/db/db4.inc
@@ -0,0 +1,96 @@
+# Version 4 of the Berkeley DB from Oracle
+#
+# At present this package only installs the DB code
+# itself (shared libraries, .a in the dev package),
+# documentation and headers.
+#
+# The headers have the same names as those as v3
+# of the DB, only one version can be used *for dev*
+# at once - DB3 and DB4 can both be installed on the
+# same system at the same time if really necessary.
+
+
+DESCRIPTION = "Berkeley DB v4."
+HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
+SECTION = "libs"
+LICENSE = "BSD"
+VIRTUAL_NAME ?= "virtual/db"
+CONFLICTS = "db3"
+
+SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
+
+inherit autotools
+
+# Put virtual/db in any appropriate provider of a
+# relational database, use it as a dependency in
+# place of a specific db and use:
+#
+# PREFERRED_PROVIDER_virtual/db
+#
+# to select the correct db in the build (distro) .conf
+PROVIDES += "${VIRTUAL_NAME}"
+
+# bitbake isn't quite clever enough to deal with db,
+# the distribution sits in the expected directory, but all
+# the builds must occur from a sub-directory.  The following
+# persuades bitbake to go to the right place
+S = "${WORKDIR}/db-${PV}/dist"
+B = "${WORKDIR}/db-${PV}/build_unix"
+
+# The executables go in a separate package - typically there
+# is no need to install these unless doing real database
+# management on the system.
+PACKAGES += " ${PN}-bin"
+
+# Package contents
+FILES_${PN} = "${libdir}/libdb-4*so*"
+FILES_${PN}-bin = "${bindir}/*"
+# The dev package has the .so link (as in db3) and the .a's -
+# it is therefore incompatible (cannot be installed at the
+# same time) as the db3 package
+FILES_${PN}-dev = "${includedir} ${libdir}/*"
+
+EXTRA_OECONF = "${DB4_CONFIG}"
+
+# Override the MUTEX setting here, the POSIX library is
+# the default - "POSIX/pthreads/library".
+# Don't ignore the nice SWP instruction on the ARM:
+# These enable the ARM assembler mutex code, this won't
+# work with thumb compilation...
+ARM_MUTEX = "--with-mutex=ARM/gcc-assembly"
+MUTEX = ""
+MUTEX_arm = "${ARM_MUTEX}"
+MUTEX_armeb = "${ARM_MUTEX}"
+EXTRA_OECONF += "${MUTEX}"
+
+# Cancel the site stuff - it's set for db3 and destroys the
+# configure.
+CONFIG_SITE = ""
+do_configure() {
+	( cd ${WORKDIR}/db-${PV}/dist ; gnu-configize ) 
+	oe_runconf
+}
+
+
+do_install_append() {
+	# The docs end up in /usr/docs - not right.
+	if test -d "${D}/${prefix}/docs"
+	then
+		mkdir -p "${D}/${datadir}"
+		test ! -d "${D}/${docdir}" || rm -rf "${D}/${docdir}"
+		mv "${D}/${prefix}/docs" "${D}/${docdir}"
+	fi
+}
+
+do_stage() {
+	# The .h files get installed read-only, the autostage
+	# function just uses cp -pPR, so do this by hand
+	rm -rf ${STAGE_TEMP}
+	mkdir -p ${STAGE_TEMP}
+	oe_runmake DESTDIR="${STAGE_TEMP}" install_include
+	cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/.
+	rm -rf ${STAGE_TEMP}
+	oe_libinstall -so -C .libs libdb-${PVM} ${STAGING_LIBDIR}
+	ln -sf libdb-${PVM}.so ${STAGING_LIBDIR}/libdb.so
+	ln -sf libdb-${PVM}.a ${STAGING_LIBDIR}/libdb.a
+}
diff --git a/packages/db/db_4.2.52.bb b/packages/db/db_4.2.52.bb
index 94d875e2cd..ae9591ddcb 100644
--- a/packages/db/db_4.2.52.bb
+++ b/packages/db/db_4.2.52.bb
@@ -1,97 +1,11 @@
-# Version 4 of the Berkeley DB from Sleepycat
-#
-# At present this package only installs the DB code
-# itself (shared libraries, .a in the dev package),
-# documentation and headers.
-#
-# The headers have the same names as those as v3
-# of the DB, only one version can be used *for dev*
-# at once - DB3 and DB4 can both be installed on the
-# same system at the same time if really necessary.
-SECTION = "libs"
-DESCRIPTION = "Berkeley DB v4."
-HOMEPAGE = "http://www.sleepycat.com"
-LICENSE = "BSD Sleepycat"
-VIRTUAL_NAME ?= "virtual/db"
-CONFLICTS = "db3"
-PR = "r7"
+PR = "r8"
 
-SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz"
-#SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5"
-#TODO SRC_URI += "file://arm-thumb-mutex.patch;patch=1"
-
-inherit autotools
-
-# Put virtual/db in any appropriate provider of a
-# relational database, use it as a dependency in
-# place of a specific db and use:
-#
-# PREFERRED_PROVIDER_virtual/db
-#
-# to select the correct db in the build (distro) .conf
-PROVIDES += "${VIRTUAL_NAME}"
+#major version number
+PVM = "4.2"
 
-# bitbake isn't quite clever enough to deal with sleepycat,
-# the distribution sits in the expected directory, but all
-# the builds must occur from a sub-directory.  The following
-# persuades bitbake to go to the right place
-S = "${WORKDIR}/db-${PV}/dist"
-B = "${WORKDIR}/db-${PV}/build_unix"
+require db4.inc
 
-# The executables go in a separate package - typically there
-# is no need to install these unless doing real database
-# management on the system.
-PACKAGES += " ${PN}-bin"
-
-# Package contents
-FILES_${PN} = "${libdir}/libdb-4*so*"
-FILES_${PN}-bin = "${bindir}/*"
-# The dev package has the .so link (as in db3) and the .a's -
-# it is therefore incompatible (cannot be installed at the
-# same time) as the db3 package
-FILES_${PN}-dev = "${includedir} ${libdir}/*"
+#TODO SRC_URI += "file://arm-thumb-mutex.patch;patch=1"
 
 #configuration - set in local.conf to override
 DB4_CONFIG ?= " --disable-cryptography --disable-queue --disable-replication --disable-verify --enable-hash"
-EXTRA_OECONF = "${DB4_CONFIG}"
-
-# Override the MUTEX setting here, the POSIX library is
-# the default - "POSIX/pthreads/library".
-# Don't ignore the nice SWP instruction on the ARM:
-# These enable the ARM assembler mutex code, this won't
-# work with thumb compilation...
-ARM_MUTEX = "--with-mutex=ARM/gcc-assembly"
-MUTEX = ""
-MUTEX_arm = "${ARM_MUTEX}"
-MUTEX_armeb = "${ARM_MUTEX}"
-EXTRA_OECONF += "${MUTEX}"
-
-# Cancel the site stuff - it's set for db3 and destroys the
-# configure.
-CONFIG_SITE = ""
-do_configure() {
-	oe_runconf
-}
-
-do_stage() {
-	# The .h files get installed read-only, the autostage
-	# function just uses cp -pPR, so do this by hand
-	rm -rf ${STAGE_TEMP}
-	mkdir -p ${STAGE_TEMP}
-	oe_runmake DESTDIR="${STAGE_TEMP}" install_include
-	cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/.
-	rm -rf ${STAGE_TEMP}
-	oe_libinstall -so -C .libs libdb-4.2 ${STAGING_LIBDIR}
-	ln -sf libdb-4.2.so ${STAGING_LIBDIR}/libdb.so
-	ln -sf libdb-4.2.a ${STAGING_LIBDIR}/libdb.a
-}
-
-do_install_append() {
-	# The docs end up in /usr/docs - not right.
-	if test -d "${D}/${prefix}/docs"
-	then
-		mkdir -p "${D}/${datadir}"
-		test ! -d "${D}/${docdir}" || rm -rf "${D}/${docdir}"
-		mv "${D}/${prefix}/docs" "${D}/${docdir}"
-	fi
-}
diff --git a/packages/db/db_4.3.29.bb b/packages/db/db_4.3.29.bb
index 026b45bd67..d5733beb39 100644
--- a/packages/db/db_4.3.29.bb
+++ b/packages/db/db_4.3.29.bb
@@ -1,99 +1,12 @@
-# Version 4 of the Berkeley DB from Sleepycat
-#
-# At present this package only installs the DB code
-# itself (shared libraries, .a in the dev package),
-# documentation and headers.
-#
-# The headers have the same names as those as v3
-# of the DB, only one version can be used *for dev*
-# at once - DB3 and DB4 can both be installed on the
-# same system at the same time if really necessary.
-SECTION = "libs"
-DESCRIPTION = "Berkeley DB v4."
-HOMEPAGE = "http://www.sleepycat.com"
-LICENSE = "BSD Sleepycat"
-VIRTUAL_NAME ?= "virtual/db"
-CONFLICTS = "db3"
-PR = "r9"
+PR = "r10"
 
-SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz"
-#SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5"
-SRC_URI += "file://arm-thumb-mutex.patch;patch=1"
-
-inherit autotools
-
-# Put virtual/db in any appropriate provider of a
-# relational database, use it as a dependency in
-# place of a specific db and use:
-#
-# PREFERRED_PROVIDER_virtual/db
-#
-# to select the correct db in the build (distro) .conf
-PROVIDES += "${VIRTUAL_NAME}"
+# major version number
+PVM = "4.3"
 
-# bitbake isn't quite clever enough to deal with sleepycat,
-# the distribution sits in the expected directory, but all
-# the builds must occur from a sub-directory.  The following
-# persuades bitbake to go to the right place
-S = "${WORKDIR}/db-${PV}/dist"
-B = "${WORKDIR}/db-${PV}/build_unix"
+require db4.inc
 
-# The executables go in a separate package - typically there
-# is no need to install these unless doing real database
-# management on the system.
-PACKAGES += " ${PN}-bin"
-
-# Package contents
-FILES_${PN} = "${libdir}/libdb-4.*.so*"
-FILES_${PN}-bin = "${bindir}/*"
-# The dev package has the .so link (as in db3) and the .a's -
-# it is therefore incompatible (cannot be installed at the
-# same time) as the db3 package
-FILES_${PN}-dev = "${includedir} ${libdir}/*"
+SRC_URI += "file://arm-thumb-mutex.patch;patch=1"
 
 #configuration - set in local.conf to override
 # All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix)
 DB4_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-statistics --disable-verify --enable-compat185"
-EXTRA_OECONF = "${DB4_CONFIG}"
-
-# Override the MUTEX setting here, the POSIX library is
-# the default - "POSIX/pthreads/library".
-# Don't ignore the nice SWP instruction on the ARM:
-# These enable the ARM assembler mutex code, this won't
-# work with thumb compilation...
-ARM_MUTEX = "--with-mutex=ARM/gcc-assembly"
-MUTEX = ""
-MUTEX_arm = "${ARM_MUTEX}"
-MUTEX_armeb = "${ARM_MUTEX}"
-EXTRA_OECONF += "${MUTEX}"
-
-# Cancel the site stuff - it's set for db3 and destroys the
-# configure.
-CONFIG_SITE = ""
-do_configure() {
-	( cd ${WORKDIR}/db-${PV}/dist ; gnu-configize ) 
-	oe_runconf
-}
-
-do_stage() {
-	# The .h files get installed read-only, the autostage
-	# function just uses cp -pPR, so do this by hand
-	rm -rf ${STAGE_TEMP}
-	mkdir -p ${STAGE_TEMP}
-	oe_runmake DESTDIR="${STAGE_TEMP}" install_include
-	cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/.
-	rm -rf ${STAGE_TEMP}
-	oe_libinstall -so -C .libs libdb-4.3 ${STAGING_LIBDIR}
-	ln -sf libdb-4.3.so ${STAGING_LIBDIR}/libdb.so
-	ln -sf libdb-4.3.a ${STAGING_LIBDIR}/libdb.a
-}
-
-do_install_append() {
-	# The docs end up in /usr/docs - not right.
-	if test -d "${D}/${prefix}/docs"
-	then
-		mkdir -p "${D}/${datadir}"
-		test ! -d "${D}/${docdir}" || rm -rf "${D}/${docdir}"
-		mv "${D}/${prefix}/docs" "${D}/${docdir}"
-	fi
-}
diff --git a/packages/e17/e-wm_cvs.bb b/packages/e17/e-wm_cvs.bb
index 364e5539e1..9cd4ab7ffc 100644
--- a/packages/e17/e-wm_cvs.bb
+++ b/packages/e17/e-wm_cvs.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightenment Window Mananger Version 17"
 DEPENDS = "eet evas ecore edje efreet"
 LICENSE = "MIT BSD"
 PV = "0.16.999.042+cvs${SRCDATE}"
-PR = "r1"
+PR = "r0"
 
 inherit e update-alternatives
 
@@ -53,6 +53,10 @@ FILES_${PN}-dbg += "\
   ${libdir}/enlightenment/preload/.debug/ \
 "
 
+FILES_${PN}-dev += "\
+  ${libdir}/enlightenment/preload/*.?a \
+"
+
 ALTERNATIVE_PATH = "${bindir}/enlightenment_start"
 ALTERNATIVE_NAME = "x-window-manager"
 ALTERNATIVE_LINK = "${bindir}/x-window-manager"
diff --git a/packages/gtkhtml/gtkhtml-3.8/.mtn2git_empty b/packages/gtkhtml/gtkhtml-3.8/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtkhtml/gtkhtml-3.8/.mtn2git_empty
diff --git a/packages/gtkhtml/gtkhtml-3.8/60_glib-2.15-g-gnuc-function.patch b/packages/gtkhtml/gtkhtml-3.8/60_glib-2.15-g-gnuc-function.patch
new file mode 100644
index 0000000000..60e46488cf
--- /dev/null
+++ b/packages/gtkhtml/gtkhtml-3.8/60_glib-2.15-g-gnuc-function.patch
@@ -0,0 +1,39 @@
+diff -Nur gtkhtml3.8-3.12.3/src/htmlengine-edit-clueflowstyle.c gtkhtml3.8-3.12.3.new/src/htmlengine-edit-clueflowstyle.c
+--- gtkhtml3.8-3.12.3/src/htmlengine-edit-clueflowstyle.c	2007-01-29 10:50:59.000000000 +0100
++++ gtkhtml3.8-3.12.3.new/src/htmlengine-edit-clueflowstyle.c	2008-02-15 10:07:22.000000000 +0100
+@@ -175,7 +175,7 @@
+ 	while (p != NULL) {
+ 		if (HTML_OBJECT_TYPE (obj->parent) != HTML_TYPE_CLUEFLOW) {
+ 			g_warning ("(%s:%s)  Eeeek!  Unknown parent type `%s'.",
+-				   __FILE__, G_GNUC_FUNCTION,
++				   __FILE__, G_STRFUNC,
+ 				   html_type_name (HTML_OBJECT_TYPE (obj->parent)));
+ 			break;
+ 		}
+@@ -209,7 +209,7 @@
+ 				/* This should not happen.  */
+ 				g_warning ("(%s:%s)  There were not enough paragraphs for "
+ 					   "setting the paragraph style.",
+-					   __FILE__, G_GNUC_FUNCTION);
++					   __FILE__, G_STRFUNC);
+ 				break;
+ 			}
+ 		} while (obj != NULL && HTML_CLUEFLOW (obj->parent) == clueflow);
+@@ -217,7 +217,7 @@
+ 
+ 	if (prop_list == NULL) {
+ 		/* This should not happen.  */
+-		g_warning ("%s:%s Eeek!  Nothing done?", __FILE__, G_GNUC_FUNCTION);
++		g_warning ("%s:%s Eeek!  Nothing done?", __FILE__, G_STRFUNC);
+ 		return;
+ 	}
+ 
+@@ -280,7 +280,7 @@
+ 	while (p != NULL) {
+ 		if (HTML_OBJECT_TYPE (p->parent) != HTML_TYPE_CLUEFLOW) {
+ 			g_warning ("(%s:%s)  Eeeek!  Unknown parent type `%s'.",
+-				   __FILE__, G_GNUC_FUNCTION,
++				   __FILE__, G_STRFUNC,
+ 				   html_type_name (HTML_OBJECT_TYPE (p->parent)));
+ 			break;
+ 		}
diff --git a/packages/gtkhtml/gtkhtml-3.8_3.12.3.bb b/packages/gtkhtml/gtkhtml-3.8_3.12.3.bb
new file mode 100644
index 0000000000..e8727bd0dc
--- /dev/null
+++ b/packages/gtkhtml/gtkhtml-3.8_3.12.3.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "HTML rendering/editing library"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ gail libbonoboui libgnomeprintui libgnomeui"
+
+SRC_URI = "${GNOME_MIRROR}/gtkhtml/3.12/gtkhtml-${PV}.tar.bz2 \
+           file://60_glib-2.15-g-gnuc-function.patch;patch=1"
+
+S = "${WORKDIR}/gtkhtml-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+ORBIT_IDL = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+
+do_configure_append() {
+        find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
+        find ${S} -name Makefile | xargs sed -i s:'-I${prefix}/include':'-I.':g
+        find ${S} -name Makefile | xargs sed -i 's|ORBIT_IDL =.*|ORBIT_IDL = ${ORBIT_IDL}|'
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/gtkhtml-3.8"
+
diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index fb1b372735..56abc3d39f 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -9,7 +9,7 @@ HOMEPAGE = "http://www.nslu2-linux.org"
 DEPENDS = "task-slugos"
 IMAGE_INSTALL = "task-slugos"
 
-COMPATIBLE_MACHINE = "nslu2"
+COMPATIBLE_MACHINE = "nslu2|ixp4xx"
 
 IMAGE_NAME = "${IMAGE_BASENAME}-${DISTRO_VERSION}"
 IMAGE_FSTYPES = "jffs2 tar.gz"
diff --git a/packages/linux/linux-ixp4xx/defconfig-2.6.24 b/packages/linux/linux-ixp4xx/defconfig-2.6.24.4
index 790120452a..790120452a 100644
--- a/packages/linux/linux-ixp4xx/defconfig-2.6.24
+++ b/packages/linux/linux-ixp4xx/defconfig-2.6.24.4
diff --git a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24 b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4
index 0e14d09d11..0e14d09d11 100644
--- a/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24
+++ b/packages/linux/linux-ixp4xx/nslu2/defconfig-2.6.24.4
diff --git a/packages/linux/linux-ixp4xx_2.6.24.bb b/packages/linux/linux-ixp4xx_2.6.24.4.bb
index 9a5967afa2..d7ccb4c096 100644
--- a/packages/linux/linux-ixp4xx_2.6.24.bb
+++ b/packages/linux/linux-ixp4xx_2.6.24.4.bb
@@ -1,21 +1,17 @@
-# Keep this until the dsmg600 via-velocity BE patch is forward-ported
-DEFAULT_PREFERENCE = "-1"
-
 require linux.inc
 require linux-ixp4xx.inc
 
 VANILLA_VERSION = "2.6.24"
-KERNEL_RELEASE = "2.6.24"
+KERNEL_RELEASE = "2.6.24.4"
 
 # If you use a rc, you will need to use this:
 #PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}"
 
 PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
-PR = "r1"
-
-# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
+PR = "r0"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \
+	   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \
 	   svn://svn.nslu2-linux.org/svnroot/kernel/trunk/patches;module=${VANILLA_VERSION};proto=http \
 	   file://defconfig-${KERNEL_RELEASE}"
 
diff --git a/packages/openmoko-projects/diversity-daemon_svn.bb b/packages/openmoko-projects/diversity-daemon_svn.bb
index dd582490fb..8ffcdc5038 100644
--- a/packages/openmoko-projects/diversity-daemon_svn.bb
+++ b/packages/openmoko-projects/diversity-daemon_svn.bb
@@ -1,6 +1,6 @@
-DESCRIPTION = "Diveristy Daemon"
+DESCRIPTION = "Diversity Daemon"
 HOMEPAGE = "http://diversity.projects.openmoko.org/"
-SECTION = "net/misc"
+SECTION = "network/misc"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl"
 RDEPENDS_${PN} = "eds-dbus openmoko-dialer2"
@@ -8,7 +8,6 @@ PV = "0.0+svnr${SRCREV}"
 PR = "r2"
 
 SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https"
-
 S = "${WORKDIR}/diversity-daemon"
 
 inherit autotools pkgconfig