merge of '8728ab154063ad389826d041d5c22bd3587f3372'

and 'acf2917a94a9bba36e944b0ad3ee532e3fc10eaf'
author: Michael Lauer <mickey@vanille-media.de> 2007-12-25 13:46:47 +0000
committer: Michael Lauer <mickey@vanille-media.de> 2007-12-25 13:46:47 +0000
commit: 58d08348e701f6efb483546e39e029f3cb8df429 (patch)
tree: 497d2d05fe75c3303145da0c487f508aa917ee26 /packages
parent: 28923e28feb20034efc37bb64132ed07679cc272 (diff)
parent: d7f9aa1735c0b9d589c11638cdf60d56267d431e (diff)
131 files changed, 1533 insertions, 404 deletions
diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR69.bb b/packages/altboot/altboot_1.1.1+wip-SVNR70.bb
index b9ee96d048..e22e992cc9 100644
--- a/packages/altboot/altboot_1.1.1+wip-SVNR69.bb
+++ b/packages/altboot/altboot_1.1.1+wip-SVNR70.bb
@@ -2,7 +2,7 @@ require altboot.inc
 
 PR = "r0"
 
-SVN_REV = "69"
+SVN_REV = "70"
 SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
 	  "
 
diff --git a/packages/apex/apex-env_1.5.13.bb b/packages/apex/apex-env_1.5.13.bb
new file mode 100644
index 0000000000..aad0b12af9
--- /dev/null
+++ b/packages/apex/apex-env_1.5.13.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "APEX Boot Loader Environment User Modification Tool"
+SECTION = "util"
+PRIORITY = "optional"
+HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
+	file://find-apex-partition.patch;patch=1 \
+	"
+S = ${WORKDIR}/apex-${PV}/usr
+
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
+
+oe_runmake() {
+	oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@"
+	make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed"
+}
+
+do_install() {
+	${STRIP} ${S}/apex-env
+	install -d ${D}/${sbindir}
+	install -m 755 ${S}/apex-env ${D}/${sbindir}
+}
diff --git a/packages/apex/apex-env_1.5.8.bb b/packages/apex/apex-env_1.5.8.bb
index 0f310f107e..a0e44346bb 100644
--- a/packages/apex/apex-env_1.5.8.bb
+++ b/packages/apex/apex-env_1.5.8.bb
@@ -3,9 +3,11 @@ SECTION = "util"
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-# PR = "r1"
+PR = "r1"
 
-SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz"
+SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
+	file://find-apex-partition.patch;patch=1 \
+	"
 S = ${WORKDIR}/apex-${PV}/usr
 
 EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
diff --git a/packages/linux/linux-handhelds-2.6/.mtn2git_empty b/packages/apex/apex-nslu2-1.5.13/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/.mtn2git_empty
+++ b/packages/apex/apex-nslu2-1.5.13/.mtn2git_empty
diff --git a/packages/apex/apex-nslu2-1.5.13/defconfig b/packages/apex/apex-nslu2-1.5.13/defconfig
new file mode 100644
index 0000000000..91517025bf
--- /dev/null
+++ b/packages/apex/apex-nslu2-1.5.13/defconfig
@@ -0,0 +1,164 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 
+# Mon Dec 24 14:54:47 2007
+#
+CONFIG_ARM=y
+CONFIG_CPU_ARMV5=y
+CONFIG_CPU_XSCALE=y
+# CONFIG_ARCH_LH7952X is not set
+# CONFIG_ARCH_LH7A40X is not set
+CONFIG_ARCH_IXP42X=y
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_MX3 is not set
+CONFIG_EXPERIMENTAL=y
+# CONFIG_SMALL is not set
+
+#
+# General Setup
+#
+CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2 (bigendian)"
+CONFIG_CROSS_COMPILE=""
+CONFIG_AEABI=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
+# CONFIG_CC_NO_OPTIMIZATION is not set
+CONFIG_STARTUP_UART=y
+# CONFIG_DEBUG_LL is not set
+CONFIG_SPINNER=y
+CONFIG_ATAG=y
+CONFIG_MMU=y
+# CONFIG_FORCE_WRITETHROUGH_DCACHE is not set
+CONFIG_DISABLE_MMU_AT_BOOT=y
+# CONFIG_INTERRUPTS is not set
+CONFIG_SDRAMBOOT_REPORT=y
+CONFIG_STACK_SIZE=0x1000
+CONFIG_STACKLIMIT=y
+# CONFIG_BOOTSTRAP_MEMTEST is not set
+CONFIG_ATAG_PHYS=0x00000100
+CONFIG_ARCH_NUMBER=597
+CONFIG_APEX_VMA=0x00200000
+CONFIG_KERNEL_LMA=0x00008000
+# CONFIG_USE_RAMDISK is not set
+CONFIG_SDRAM_BANK0=y
+# CONFIG_SDRAM_BANK1 is not set
+CONFIG_NOR_BUSWIDTH=16
+CONFIG_NOR_BANK0=y
+CONFIG_NOR_BANK0_START=0x50000000
+CONFIG_NOR_BANK0_LENGTH=0x00800000
+CONFIG_MACH="ixp42x"
+CONFIG_MACH_NSLU2=y
+# CONFIG_MACH_NAS100D is not set
+# CONFIG_MACH_DSMG600 is not set
+# CONFIG_MACH_FSG3 is not set
+# CONFIG_MACH_AVILA2347 is not set
+# CONFIG_USER_DEFAULTENDIAN is not set
+# CONFIG_USER_BIGENDIAN is not set
+# CONFIG_USER_LITTLEENDIAN is not set
+
+#
+# Platform Setup
+#
+CONFIG_SDRAM_BANK_LENGTH=0x02000000
+# CONFIG_DISABLE_SECOND_UART_INIT is not set
+CONFIG_ARCH_IXP420=y
+
+#
+# Commands
+#
+CONFIG_ALLHELP=y
+CONFIG_ALPHABETIZE_COMMANDS=y
+CONFIG_DEL_IS_BS=y
+CONFIG_ANSI_KEYS=y
+CONFIG_COMMAND_HISTORY=y
+CONFIG_COMMAND_EDITING=y
+# CONFIG_TIME_COMMANDS is not set
+CONFIG_CMD_ALIAS=y
+CONFIG_CMD_CHECKSUM=y
+CONFIG_CMD_COPY=y
+CONFIG_CMD_COMPARE=y
+CONFIG_CMD_DRVINFO=y
+CONFIG_CMD_DUMP=y
+CONFIG_CMD_ENV=y
+CONFIG_CMD_SETENV=y
+CONFIG_CMD_ERASE=y
+CONFIG_CMD_FILL=y
+CONFIG_CMD_GO=y
+CONFIG_CMD_INFO=y
+# CONFIG_CMD_PAUSE is not set
+CONFIG_CMD_WAIT=y
+CONFIG_CMD_XRECEIVE=y
+CONFIG_CMD_MEMLIMIT=y
+CONFIG_CMD_MEMSCAN=y
+CONFIG_CMD_MEMTEST=y
+
+#
+# Generic Drivers
+#
+# CONFIG_DRIVER_FAT is not set
+# CONFIG_DRIVER_EXT2 is not set
+# CONFIG_DRIVER_JFFS2 is not set
+CONFIG_DRIVER_FIS=y
+CONFIG_DRIVER_FIS_BLOCKDEVICE="nor:0x7e0000+4k"
+CONFIG_DRIVER_NOR_CFI=y
+# CONFIG_DRIVER_NOR_CFI_NO_BUFFERED is not set
+# CONFIG_DRIVER_NOR_CFI_USE_CACHE is not set
+CONFIG_DRIVER_NOR_CFI_TYPE_INTEL=y
+# CONFIG_DRIVER_NOR_CFI_TYPE_SPANSION is not set
+# CONFIG_DRIVER_ONENAND is not set
+# CONFIG_DRIVER_IXP4XX_NPE_ETH is not set
+CONFIG_USES_NOR_CFI=y
+CONFIG_USES_PATHNAME_PARSER=y
+CONFIG_USES_IXP4XX_NPE_ETH=y
+
+#
+# Environment
+#
+CONFIG_ENV=y
+CONFIG_ENV_LINK=y
+CONFIG_ENV_MUTABLE=y
+CONFIG_ENV_REGION="nor:0x7c000+15k"
+# CONFIG_ENV_SAVEATONCE is not set
+CONFIG_ENV_CHECK_LEN=1024
+CONFIG_VARIATIONS=y
+CONFIG_VARIATION_SUFFIX="-alt"
+# CONFIG_NO_BOOTSTRAP is not set
+CONFIG_NOR_BOOT=y
+# CONFIG_NAND_BOOT is not set
+# CONFIG_ONENAND_BOOT is not set
+# CONFIG_COMPANION_EVT1_BOOT is not set
+# CONFIG_COMPANION_EVT2_BOOT is not set
+
+#
+#    Default Startup
+#
+CONFIG_AUTOBOOT=y
+CONFIG_AUTOBOOT_DELAY=10
+CONFIG_ENV_STARTUP_KERNEL_COPY=y
+# CONFIG_ENV_REGION_KERNEL_SWAP is not set
+# CONFIG_ENV_STARTUP_PREFIX_P is not set
+
+#
+#    Regions
+#
+CONFIG_ENV_REGION_KERNEL="fis://kernel"
+CONFIG_ENV_REGION_KERNEL_ALT_P=y
+CONFIG_ENV_REGION_KERNEL_ALT="fis://kernel"
+
+#
+#    Overrides
+#
+CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
+CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
+CONFIG_ENV_DEFAULT_CMDLINE_ALT_P=y
+CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
+# CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
+# CONFIG_ENV_DEFAULT_STARTUP_ALT_P is not set
+CONFIG_USES_NOR_BOOTFLASH=y
+CONFIG_RELOCATE_SIMPLE=y
+CONFIG_INLINE_PLATFORM_INITIALIZATION=y
+CONFIG_INLINE_PLATFORM_INITIALIZATION_SDRAM_PRE_OVERRIDE=y
+# CONFIG_BIGENDIAN is not set
+# CONFIG_LITTLEENDIAN is not set
+CONFIG_CLEAR_STACKS=y
+CONFIG_ALIASES=y
diff --git a/packages/linux/linux-handhelds-2.6/asus620/.mtn2git_empty b/packages/apex/apex-nslu2-1.5.8/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/asus620/.mtn2git_empty
+++ b/packages/apex/apex-nslu2-1.5.8/.mtn2git_empty
diff --git a/packages/apex/files/defconfig b/packages/apex/apex-nslu2-1.5.8/defconfig
index 3c8522e2e8..3c8522e2e8 100644
--- a/packages/apex/files/defconfig
+++ b/packages/apex/apex-nslu2-1.5.8/defconfig
diff --git a/packages/linux/linux-handhelds-2.6/asus730/.mtn2git_empty b/packages/apex/apex-nslu2-16mb-1.5.13/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/asus730/.mtn2git_empty
+++ b/packages/apex/apex-nslu2-16mb-1.5.13/.mtn2git_empty
diff --git a/packages/apex/apex-nslu2-16mb-1.5.13/defconfig b/packages/apex/apex-nslu2-16mb-1.5.13/defconfig
new file mode 100644
index 0000000000..420e0a61fd
--- /dev/null
+++ b/packages/apex/apex-nslu2-16mb-1.5.13/defconfig
@@ -0,0 +1,164 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 
+# Mon Dec 24 15:00:01 2007
+#
+CONFIG_ARM=y
+CONFIG_CPU_ARMV5=y
+CONFIG_CPU_XSCALE=y
+# CONFIG_ARCH_LH7952X is not set
+# CONFIG_ARCH_LH7A40X is not set
+CONFIG_ARCH_IXP42X=y
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_MX3 is not set
+CONFIG_EXPERIMENTAL=y
+# CONFIG_SMALL is not set
+
+#
+# General Setup
+#
+CONFIG_TARGET_DESCRIPTION="SlugOS NSLU2/BE (16MiB Flash)"
+CONFIG_CROSS_COMPILE=""
+CONFIG_AEABI=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SPEED is not set
+# CONFIG_CC_NO_OPTIMIZATION is not set
+CONFIG_STARTUP_UART=y
+# CONFIG_DEBUG_LL is not set
+CONFIG_SPINNER=y
+CONFIG_ATAG=y
+CONFIG_MMU=y
+# CONFIG_FORCE_WRITETHROUGH_DCACHE is not set
+CONFIG_DISABLE_MMU_AT_BOOT=y
+# CONFIG_INTERRUPTS is not set
+CONFIG_SDRAMBOOT_REPORT=y
+CONFIG_STACK_SIZE=0x1000
+CONFIG_STACKLIMIT=y
+# CONFIG_BOOTSTRAP_MEMTEST is not set
+CONFIG_ATAG_PHYS=0x00000100
+CONFIG_ARCH_NUMBER=597
+CONFIG_APEX_VMA=0x00200000
+CONFIG_KERNEL_LMA=0x00008000
+# CONFIG_USE_RAMDISK is not set
+CONFIG_SDRAM_BANK0=y
+# CONFIG_SDRAM_BANK1 is not set
+CONFIG_NOR_BUSWIDTH=16
+CONFIG_NOR_BANK0=y
+CONFIG_NOR_BANK0_START=0x50000000
+CONFIG_NOR_BANK0_LENGTH=0x01000000
+CONFIG_MACH="ixp42x"
+CONFIG_MACH_NSLU2=y
+# CONFIG_MACH_NAS100D is not set
+# CONFIG_MACH_DSMG600 is not set
+# CONFIG_MACH_FSG3 is not set
+# CONFIG_MACH_AVILA2347 is not set
+# CONFIG_USER_DEFAULTENDIAN is not set
+# CONFIG_USER_BIGENDIAN is not set
+# CONFIG_USER_LITTLEENDIAN is not set
+
+#
+# Platform Setup
+#
+CONFIG_SDRAM_BANK_LENGTH=0x02000000
+# CONFIG_DISABLE_SECOND_UART_INIT is not set
+CONFIG_ARCH_IXP420=y
+
+#
+# Commands
+#
+CONFIG_ALLHELP=y
+CONFIG_ALPHABETIZE_COMMANDS=y
+CONFIG_DEL_IS_BS=y
+CONFIG_ANSI_KEYS=y
+CONFIG_COMMAND_HISTORY=y
+CONFIG_COMMAND_EDITING=y
+# CONFIG_TIME_COMMANDS is not set
+CONFIG_CMD_ALIAS=y
+CONFIG_CMD_CHECKSUM=y
+CONFIG_CMD_COPY=y
+CONFIG_CMD_COMPARE=y
+CONFIG_CMD_DRVINFO=y
+CONFIG_CMD_DUMP=y
+CONFIG_CMD_ENV=y
+CONFIG_CMD_SETENV=y
+CONFIG_CMD_ERASE=y
+CONFIG_CMD_FILL=y
+CONFIG_CMD_GO=y
+CONFIG_CMD_INFO=y
+# CONFIG_CMD_PAUSE is not set
+CONFIG_CMD_WAIT=y
+CONFIG_CMD_XRECEIVE=y
+CONFIG_CMD_MEMLIMIT=y
+CONFIG_CMD_MEMSCAN=y
+CONFIG_CMD_MEMTEST=y
+
+#
+# Generic Drivers
+#
+# CONFIG_DRIVER_FAT is not set
+# CONFIG_DRIVER_EXT2 is not set
+# CONFIG_DRIVER_JFFS2 is not set
+CONFIG_DRIVER_FIS=y
+CONFIG_DRIVER_FIS_BLOCKDEVICE="nor:0xfe0000+4k"
+CONFIG_DRIVER_NOR_CFI=y
+# CONFIG_DRIVER_NOR_CFI_NO_BUFFERED is not set
+# CONFIG_DRIVER_NOR_CFI_USE_CACHE is not set
+CONFIG_DRIVER_NOR_CFI_TYPE_INTEL=y
+# CONFIG_DRIVER_NOR_CFI_TYPE_SPANSION is not set
+# CONFIG_DRIVER_ONENAND is not set
+# CONFIG_DRIVER_IXP4XX_NPE_ETH is not set
+CONFIG_USES_NOR_CFI=y
+CONFIG_USES_PATHNAME_PARSER=y
+CONFIG_USES_IXP4XX_NPE_ETH=y
+
+#
+# Environment
+#
+CONFIG_ENV=y
+CONFIG_ENV_LINK=y
+CONFIG_ENV_MUTABLE=y
+CONFIG_ENV_REGION="nor:0x7c000+15k"
+# CONFIG_ENV_SAVEATONCE is not set
+CONFIG_ENV_CHECK_LEN=1024
+CONFIG_VARIATIONS=y
+CONFIG_VARIATION_SUFFIX="-alt"
+# CONFIG_NO_BOOTSTRAP is not set
+CONFIG_NOR_BOOT=y
+# CONFIG_NAND_BOOT is not set
+# CONFIG_ONENAND_BOOT is not set
+# CONFIG_COMPANION_EVT1_BOOT is not set
+# CONFIG_COMPANION_EVT2_BOOT is not set
+
+#
+#    Default Startup
+#
+CONFIG_AUTOBOOT=y
+CONFIG_AUTOBOOT_DELAY=10
+CONFIG_ENV_STARTUP_KERNEL_COPY=y
+# CONFIG_ENV_REGION_KERNEL_SWAP is not set
+# CONFIG_ENV_STARTUP_PREFIX_P is not set
+
+#
+#    Regions
+#
+CONFIG_ENV_REGION_KERNEL="fis://kernel"
+CONFIG_ENV_REGION_KERNEL_ALT_P=y
+CONFIG_ENV_REGION_KERNEL_ALT="fis://kernel"
+
+#
+#    Overrides
+#
+CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y
+CONFIG_ENV_DEFAULT_CMDLINE="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
+CONFIG_ENV_DEFAULT_CMDLINE_ALT_P=y
+CONFIG_ENV_DEFAULT_CMDLINE_ALT="root=/dev/mtdblock4 rootfstype=jffs2 console=ttyS0,115200"
+# CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set
+# CONFIG_ENV_DEFAULT_STARTUP_ALT_P is not set
+CONFIG_USES_NOR_BOOTFLASH=y
+CONFIG_RELOCATE_SIMPLE=y
+CONFIG_INLINE_PLATFORM_INITIALIZATION=y
+CONFIG_INLINE_PLATFORM_INITIALIZATION_SDRAM_PRE_OVERRIDE=y
+# CONFIG_BIGENDIAN is not set
+# CONFIG_LITTLEENDIAN is not set
+CONFIG_CLEAR_STACKS=y
+CONFIG_ALIASES=y
diff --git a/packages/linux/linux-handhelds-2.6/aximx50/.mtn2git_empty b/packages/apex/apex-nslu2-16mb-1.5.8/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/aximx50/.mtn2git_empty
+++ b/packages/apex/apex-nslu2-16mb-1.5.8/.mtn2git_empty
diff --git a/packages/apex/files/defconfig-16mb b/packages/apex/apex-nslu2-16mb-1.5.8/defconfig
index c9688e3d75..c9688e3d75 100644
--- a/packages/apex/files/defconfig-16mb
+++ b/packages/apex/apex-nslu2-16mb-1.5.8/defconfig
diff --git a/packages/apex/apex-nslu2-16mb_1.5.13.bb b/packages/apex/apex-nslu2-16mb_1.5.13.bb
new file mode 100644
index 0000000000..5fc835fc00
--- /dev/null
+++ b/packages/apex/apex-nslu2-16mb_1.5.13.bb
@@ -0,0 +1,63 @@
+DESCRIPTION = "APEX Boot Loader"
+SECTION = ""
+PRIORITY = "optional"
+HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
+	   file://defconfig"
+S = ${WORKDIR}/apex-${PV}
+
+CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}"
+
+CMDLINE_ROOT  ?= "root=/dev/mtdblock4 rootfstype=jffs2 rw"
+
+CMDLINE_DEBUG ?= ""
+
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
+
+oe_runmake() {
+	oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@"
+	make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed"
+}
+
+# Set the correct CONFIG_USER_xxx_ENDIAN and CONFIG_CMDLINE at the head
+# of the .config file and remove any settings in defconfig then append
+# defconfig to .config
+do_configure() {
+	rm -f ${S}/.config
+	. ${CONFIG_SITE}
+	if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
+	  sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \
+	      -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \
+	      -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/BE (16MiB Flash)\"/' \
+	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
+	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE_ALT=|CONFIG_ENV_DEFAULT_CMDLINE_ALT=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
+		${WORKDIR}/defconfig > ${S}/.config
+	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
+	  sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \
+	      -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \
+	      -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/LE (16MiB Flash)\"/' \
+	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
+	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE_ALT=|CONFIG_ENV_DEFAULT_CMDLINE_ALT=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
+		${WORKDIR}/defconfig > ${S}/.config
+	else
+	  oefatal do_configure cannot determine endianess
+	fi
+	oe_runmake oldconfig
+}
+
+DEPENDS += "devio-native"
+
+do_populate_staging() {
+	install -d ${STAGING_LOADER_DIR}
+	. ${CONFIG_SITE}
+	if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
+		cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin
+	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
+		devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex-nslu2-16mb.bin 'xp $,4'
+	else
+		oefatal do_populate_staging cannot determine endianess
+	fi
+}
diff --git a/packages/apex/apex-nslu2-16mb_1.5.8.bb b/packages/apex/apex-nslu2-16mb_1.5.8.bb
index 48b8412088..6289d7c104 100644
--- a/packages/apex/apex-nslu2-16mb_1.5.8.bb
+++ b/packages/apex/apex-nslu2-16mb_1.5.8.bb
@@ -3,10 +3,10 @@ SECTION = ""
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
-	   file://defconfig-16mb"
+	   file://defconfig"
 S = ${WORKDIR}/apex-${PV}
 
 CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}"
@@ -33,13 +33,13 @@ do_configure() {
 	      -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \
 	      -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/BE (16MiB Flash)\"/' \
 	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
-		${WORKDIR}/defconfig-16mb > ${S}/.config
+		${WORKDIR}/defconfig > ${S}/.config
 	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
 	  sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \
 	      -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \
 	      -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/LE (16MiB Flash)\"/' \
 	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
-		${WORKDIR}/defconfig-16mb > ${S}/.config
+		${WORKDIR}/defconfig > ${S}/.config
 	else
 	  oefatal do_configure cannot determine endianess
 	fi
diff --git a/packages/apex/apex-nslu2_1.5.13.bb b/packages/apex/apex-nslu2_1.5.13.bb
new file mode 100644
index 0000000000..ac3858f3a5
--- /dev/null
+++ b/packages/apex/apex-nslu2_1.5.13.bb
@@ -0,0 +1,63 @@
+DESCRIPTION = "APEX Boot Loader"
+SECTION = ""
+PRIORITY = "optional"
+HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
+	   file://defconfig"
+S = ${WORKDIR}/apex-${PV}
+
+CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}"
+
+CMDLINE_ROOT  ?= "root=/dev/mtdblock4 rootfstype=jffs2 rw"
+
+CMDLINE_DEBUG ?= ""
+
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
+
+oe_runmake() {
+	oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@"
+	make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed"
+}
+
+# Set the correct CONFIG_USER_xxx_ENDIAN and CONFIG_CMDLINE at the head
+# of the .config file and remove any settings in defconfig then append
+# defconfig to .config
+do_configure() {
+	rm -f ${S}/.config
+	. ${CONFIG_SITE}
+	if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
+	  sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \
+	      -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \
+	      -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/BE (8MiB Flash)\"/' \
+	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
+	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE_ALT=|CONFIG_ENV_DEFAULT_CMDLINE_ALT=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
+		${WORKDIR}/defconfig > ${S}/.config
+	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
+	  sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \
+	      -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \
+	      -e 's/.*CONFIG_TARGET_DESCRIPTION.*/CONFIG_TARGET_DESCRIPTION=\"OpenEmbedded NSLU2\/LE (8MiB Flash)\"/' \
+	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
+	      -e 's|CONFIG_ENV_DEFAULT_CMDLINE_ALT=|CONFIG_ENV_DEFAULT_CMDLINE_ALT=\"${CMDLINE_CONSOLE} ${CMDLINE_ROOT} ${CMDLINE_DEBUG}\"|' \
+		${WORKDIR}/defconfig > ${S}/.config
+	else
+	  oefatal do_configure cannot determine endianess
+	fi
+	oe_runmake oldconfig
+}
+
+DEPENDS += "devio-native"
+
+do_populate_staging() {
+	install -d ${STAGING_LOADER_DIR}
+	. ${CONFIG_SITE}
+	if [ "x$ac_cv_c_bigendian" = "xyes" -o "x$ac_cv_c_littleendian" = "xno" ]; then
+		cp src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex-nslu2.bin
+	elif [ "x$ac_cv_c_littleendian" = "xyes" -o "x$ac_cv_c_bigendian" = "xno" ]; then
+		devio '<<'src/arch-arm/rom/apex.bin >${STAGING_LOADER_DIR}/apex-nslu2.bin 'xp $,4'
+	else
+		oefatal do_populate_staging cannot determine endianess
+	fi
+}
diff --git a/packages/apex/files/find-apex-partition.patch b/packages/apex/files/find-apex-partition.patch
new file mode 100644
index 0000000000..3aa62a186a
--- /dev/null
+++ b/packages/apex/files/find-apex-partition.patch
@@ -0,0 +1,34 @@
+*** usr/link.cc.orig	Sun Dec 23 20:31:49 2007
+--- usr/link.cc	Sun Dec 23 20:32:46 2007
+***************
+*** 278,285 ****
+     fixed-up env_link structure, scanning for the environment variables
+     and their defaults, and opening the flash instance of the
+     environment.  It first looks for the "Loader" partition.  If there
+!    is none, it uses the first partition with the assumption that APEX
+!    may be the primary boot loader.
+  
+  */
+  
+--- 278,286 ----
+     fixed-up env_link structure, scanning for the environment variables
+     and their defaults, and opening the flash instance of the
+     environment.  It first looks for the "Loader" partition.  If there
+!    is none, it then looks for the "apex" partition.  If there is none,
+!    it uses the first partition with the assumption that APEX  may be
+!    the primary boot loader.
+  
+  */
+  
+***************
+*** 289,294 ****
+--- 290,298 ----
+    MTDPartition mtd = MTDPartition::find ("Loader");
+  
+    if (!mtd.is ())
++     mtd = MTDPartition::find ("apex");
++ 
++   if (!mtd.is ())
+      mtd = MTDPartition::first ();
+  
+    bool fFound = mtd.is () && open_apex (mtd);
diff --git a/packages/bluez/bluez-utils/hciattach-ti-bts.patch b/packages/bluez/bluez-utils/hciattach-ti-bts.patch
index 217c32619d..1b208f7979 100644
--- a/packages/bluez/bluez-utils/hciattach-ti-bts.patch
+++ b/packages/bluez/bluez-utils/hciattach-ti-bts.patch
@@ -1,6 +1,6 @@
 --- bluez-utils-3.1/tools/hciattach.c.orig	2006-07-23 14:02:14.000000000 +0200
 +++ bluez-utils-3.1/tools/hciattach.c	2006-07-23 14:06:29.000000000 +0200
-@@ -58,6 +58,8 @@
+@@ -60,6 +60,8 @@
  #define HCI_UART_3WIRE	2
  #define HCI_UART_H4DS	3
  
@@ -9,15 +9,15 @@
  struct uart_t {
  	char *type;
  	int  m_id;
-@@ -67,6 +69,7 @@
- 	int  speed;
+@@ -70,6 +72,7 @@
  	int  flags;
+ 	char *bdaddr;
  	int  (*init) (int fd, struct uart_t *u, struct termios *ti);
 +	char *bts;	/* bluetooth script */
  };
  
  #define FLOW_CTL	0x0001
-@@ -256,6 +259,114 @@
+@@ -279,6 +282,114 @@
  	return 0;
  }
  
@@ -132,29 +132,17 @@
  static int texas(int fd, struct uart_t *u, struct termios *ti)
  {
  	struct timespec tm = {0, 50000};
-@@ -296,15 +407,26 @@
- 	} while (resp[4] != cmd[1] && resp[5] != cmd[2]);
- 
- 	/* Verify manufacturer */
--	if ((resp[11] & 0xFF) != 0x0d)
-+	if (resp[11] != 0x0d)
- 		fprintf(stderr,"WARNING : module's manufacturer is not Texas Instrument\n");
- 
- 	/* Print LMP version */
--	fprintf(stderr, "Texas module LMP version : 0x%02x\n", resp[10] & 0xFF);
-+	fprintf(stderr, "TI module LMP version : 0x%02x\n", resp[10]);
- 
+@@ -328,6 +439,17 @@
  	/* Print LMP subversion */
--	fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14] & 0xFF, resp[13] & 0xFF);
-+	fprintf(stderr, "TI module LMP sub-version : 0x%02x%02x\n", resp[14], resp[13]);
+ 	fprintf(stderr, "Texas module LMP sub-version : 0x%02x%02x\n", resp[14] & 0xFF, resp[13] & 0xFF);
+ 
 +	if ((resp[14] >> 2) == 3) {
++		/* BRF6150 */
 +		int err;
++
 +		nanosleep(&tm, NULL);
- 
-+		/* BRF6150 */
-+		if ((err=brf6150( fd, u, ti )) != 0) {
-+			fprintf( stderr, "TI script failed (err=%d)\n",
-+				err );
++		if ((err = brf6150(fd, u, ti)) != 0) {
++			fprintf(stderr, "Texas module script failed (err=%d)\n", err);
 +			return -1;
 +		}
 +	}
@@ -162,16 +150,16 @@
  	nanosleep(&tm, NULL);
  	return 0;
  }
-@@ -1103,7 +1225,7 @@
+@@ -1204,7 +1326,7 @@
  {
  	printf("hciattach - HCI UART driver initialization utility\n");
  	printf("Usage:\n");
--	printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow]\n");
-+	printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] <tty> <type | id> [speed] [flow|noflow]\n");
+-	printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
++	printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
  	printf("\thciattach -l\n");
  }
  
-@@ -1118,11 +1240,12 @@
+@@ -1219,11 +1341,12 @@
  	struct sigaction sa;
  	struct pollfd p;
  	char dev[PATH_MAX];
@@ -185,7 +173,7 @@
  		switch(opt) {
  		case 'b':
  			send_break = 1;
-@@ -1144,6 +1267,10 @@
+@@ -1245,6 +1368,10 @@
  			init_speed = atoi(optarg);
  			break;
  
@@ -196,7 +184,7 @@
  		case 'l':
  			for (i = 0; uart[i].type; i++) {
  				printf("%-10s0x%04x,0x%04x\n", uart[i].type,
-@@ -1215,6 +1342,8 @@
+@@ -1320,6 +1447,8 @@
  	if (init_speed)
  		u->init_speed = init_speed;
  
@@ -205,17 +193,6 @@
  	memset(&sa, 0, sizeof(sa));
  	sa.sa_flags   = SA_NOCLDSTOP;
  	sa.sa_handler = sig_alarm;
---- bluez-utils-3.1/tools/Makefile.am.orig	2006-07-23 14:06:59.000000000 +0200
-+++ bluez-utils-3.1/tools/Makefile.am	2006-07-23 14:07:18.000000000 +0200
-@@ -37,7 +37,7 @@
- 
- noinst_PROGRAMS = hcisecfilter ppporc
- 
--hciattach_SOURCES = hciattach.c hciattach_st.c
-+hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c
- 
- hciconfig_SOURCES = hciconfig.c csr.h csr.c
- hciconfig_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
 --- bluez-utils-3.1/tools/ti_bts.h.orig	2006-07-23 14:07:26.000000000 +0200
 +++ bluez-utils-3.1/tools/ti_bts.h	2006-07-23 14:07:46.000000000 +0200
 @@ -0,0 +1,116 @@
@@ -487,3 +464,14 @@
 +    }
 +}
 +
+--- bluez-utils-3.1/tools/Makefile.am.orig	2006-07-23 14:06:59.000000000 +0200
++++ bluez-utils-3.1/tools/Makefile.am	2006-07-23 14:07:18.000000000 +0200
+@@ -45,7 +45,7 @@
+ 
+ noinst_PROGRAMS = hcisecfilter ppporc
+ 
+-hciattach_SOURCES = hciattach.c hciattach_st.c
++hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c
+ hciattach_LDADD = @BLUEZ_LIBS@
+ 
+ hciconfig_SOURCES = hciconfig.c csr.h csr.c
diff --git a/packages/bluez/bluez-utils3.inc b/packages/bluez/bluez-utils3.inc
index 8f787292ba..97a604aaea 100644
--- a/packages/bluez/bluez-utils3.inc
+++ b/packages/bluez/bluez-utils3.inc
@@ -8,10 +8,10 @@ RREPLACES = "bluez-utils-dbus"
 RCONFLICTS_${PN} = "bluez-utils-nodbus"
 LICENSE = "GPL"
 
-# ti patch doesn't apply, people using it should rediff it and send it upstream
+# ti patch should be sent it upstream!
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
-           file://hcid.conf "
-#           file://hciattach-ti-bts.patch;patch=1 \
+           file://hcid.conf \
+           file://hciattach-ti-bts.patch;patch=1"
 
 S = "${WORKDIR}/bluez-utils-${PV}"
 
diff --git a/packages/bluez/bluez-utils_3.23.bb b/packages/bluez/bluez-utils_3.23.bb
index 48f147aa69..f96d1f2ba4 100644
--- a/packages/bluez/bluez-utils_3.23.bb
+++ b/packages/bluez/bluez-utils_3.23.bb
@@ -1,4 +1,5 @@
 require bluez-utils3.inc
+PR = "r1"
 
 # see bluez-utils3.inc for the explanation of these option
 EXTRA_OECONF = " \
diff --git a/packages/efl1/epdf/fix-plugin-path-check.patch b/packages/efl1/epdf/fix-plugin-path-check.patch
index dd5469c286..b218fffb7a 100644
--- a/packages/efl1/epdf/fix-plugin-path-check.patch
+++ b/packages/efl1/epdf/fix-plugin-path-check.patch
@@ -2,18 +2,18 @@ Index: epdf/configure.in
 ===================================================================
 --- epdf.orig/configure.in
 +++ epdf/configure.in
-@@ -27,8 +27,8 @@ PKG_CHECK_MODULES(EWL,
-   [
-    have_ewl="yes"
-    requirements="$requirements ewl"
--   EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`"
--   EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`"
-+   EWL_TEST_LIBS_DIR="/usr/lib/ewl/tests/"
-+   EWL_TEST_SOURCE_DIR="/usr/share/ewl/examples/"
-    AC_SUBST(EWL_TEST_LIBS_DIR)
-    AC_SUBST(EWL_TEST_SOURCE_DIR)
-   ],
-@@ -55,7 +55,7 @@ PKG_CHECK_MODULES(EPSILON,
+@@ -95,8 +95,8 @@
+      [
+       have_ewl="yes"
+       requirements="$requirements ewl"
+-      EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`"
+-      EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`"
++      EWL_TEST_LIBS_DIR="/usr/lib/ewl/tests/"
++      EWL_TEST_SOURCE_DIR="/usr/share/ewl/examples/"
+       AC_SUBST(EWL_TEST_LIBS_DIR)
+       AC_SUBST(EWL_TEST_SOURCE_DIR)
+      ],
+@@ -144,7 +144,7 @@
    [
     have_epsilon="yes"
     requirements="$requirements epsilon imlib2"
diff --git a/packages/efl1/epdf_cvs.bb b/packages/efl1/epdf_cvs.bb
index 8426b75a17..7ca33bf9d8 100644
--- a/packages/efl1/epdf_cvs.bb
+++ b/packages/efl1/epdf_cvs.bb
@@ -1,8 +1,7 @@
 DESCRIPTION = "Epdf is the glue between EFL and libpoppler"
 LICENSE = "BSD"
-DEPENDS = "poppler0.6 evas ecore etk ewl"
+DEPENDS = "poppler evas ecore etk ewl"
 PV = "0.1.0+cvs${SRCDATE}"
-
 PR = "r1"
 
 inherit efl_library
diff --git a/packages/efl1/etk_cvs.bb b/packages/efl1/etk_cvs.bb
index ad959edef6..238d640a68 100644
--- a/packages/efl1/etk_cvs.bb
+++ b/packages/efl1/etk_cvs.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foun
 DEPENDS = "evas ecore edje"
 LICENSE = "MIT"
 PV = "0.1.0+cvs${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 inherit efl_library
 
@@ -15,3 +15,4 @@ FILES_${PN}-engines = "${libdir}/etk/engines/*.so ${datadir}"
 FILES_${PN}-dev += "${libdir}/etk/engines/*.a ${libdir}/etk/engines/*.la"
 FILES_${PN}-dbg += "${libdir}/etk/engines/.debug/"
 
+RRECOMMENDS_${PN} = "${PN}-engines"
diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc
index 179f03b0d8..608c897295 100644
--- a/packages/efl1/evas.inc
+++ b/packages/efl1/evas.inc
@@ -35,3 +35,17 @@ FILES_${PN}-dbg += "${libdir}/evas/modules/*/*/*/.debug/"
 FILES_${PN} = "${libdir}/libevas*.so*"
 
 PACKAGES_DYNAMIC = "libevas-engine-* libevas-loader-* libevas-saver-*"
+
+RRECOMMENDS_${PN} = "\
+  libevas-engine-buffer \
+  libevas-engine-fb \
+  libevas-engine-software-generic \
+  libevas-engine-software-x11 \
+  libevas-engine-software-16 \
+  libevas-engine-xrender-x11 \
+  \
+  libevas-loader-png \
+  libevas-loader-jpeg \
+  libevas-loader-eet \
+  libevas-loader-svg \
+"
diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb
index 1bacbe3d1c..e386d307ad 100644
--- a/packages/efl1/evas_cvs.bb
+++ b/packages/efl1/evas_cvs.bb
@@ -1,5 +1,5 @@
 require evas.inc
-PR = "r3"
+PR = "r4"
 
 EXTRA_OECONF = "\
 		--x-includes=${STAGING_INCDIR}/X11  \
diff --git a/packages/efl1/ewl_cvs.bb b/packages/efl1/ewl_cvs.bb
index 8fb8521d62..193efcbe18 100644
--- a/packages/efl1/ewl_cvs.bb
+++ b/packages/efl1/ewl_cvs.bb
@@ -2,10 +2,9 @@ DESCRIPTION = "The Enlightened Widget Library, \
 a simple-to-use general purpose widget library \
 based on the enlightenment foundation libraries."
 DEPENDS = "evas ecore edje emotion efreet epsilon"
-RSUGGESTS_${PN} += "ewl-themes"
 LICENSE = "MIT"
 PV = "0.5.1+cvs${SRCDATE}"
-PR = "r1"
+PR = "r2"
 
 inherit efl_library
 
@@ -31,3 +30,5 @@ FILES_${PN}-dbg += "${libdir}/ewl/*/.debug"
 
 FILES_${PN}-engines = "${libdir}/ewl/engines/*.so*"
 FILES_${PN}-plugins = "${libdir}/ewl/plugins/*.so*"
+
+RRECOMMENDS_${PN} = "${PN}-engines ${PN}-plugins ewl-themes"
diff --git a/packages/emacs/emacs-x11_20060801.bb b/packages/emacs/emacs-x11_20060801.bb
index 8b598bf21f..3878c42536 100644
--- a/packages/emacs/emacs-x11_20060801.bb
+++ b/packages/emacs/emacs-x11_20060801.bb
@@ -1,3 +1,5 @@
 require emacs-x11_cvs.bb
-SRCDATE = "${PV}"
+
+SRCDATE = "20060801"
+
 DEFAULT_PREFERENCE = "0"
diff --git a/packages/emacs/emacs-x11_cvs.bb b/packages/emacs/emacs-x11_cvs.bb
index 8fdba95742..809176a3c3 100644
--- a/packages/emacs/emacs-x11_cvs.bb
+++ b/packages/emacs/emacs-x11_cvs.bb
@@ -1,5 +1,8 @@
 require emacs_cvs.bb
+
 # full X (non-diet) is needed for X support
 DEPENDS += "libx11"
+
 EXTRA_OECONF = "--without-sound"
+
 RREPLACES = "emacs"
diff --git a/packages/emacs/emacs_20060801.bb b/packages/emacs/emacs_20060801.bb
index aa72944eca..834e5b6239 100644
--- a/packages/emacs/emacs_20060801.bb
+++ b/packages/emacs/emacs_20060801.bb
@@ -1,3 +1,3 @@
 require emacs_cvs.bb
-SRCDATE = "${PV}"
+SRCDATE = "20060801"
 DEFAULT_PREFERENCE = "0"
diff --git a/packages/emacs/emacs_cvs.bb b/packages/emacs/emacs_cvs.bb
index ef58dfa5b6..e8f263d1a9 100644
--- a/packages/emacs/emacs_cvs.bb
+++ b/packages/emacs/emacs_cvs.bb
@@ -7,7 +7,9 @@ DEPENDS += "qemu-native"
 #NOTE: I have found that this only works with qemu-0.8.0. If I use 0.8.1 or 0.8.2
 # the build gets hung up on compiling certain .el files
 
-PR = "r7"
+PV = "22.0.50+cvs${SRCDATE}" 
+PE = "1"
+PR = "r9"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -17,14 +19,14 @@ S = "${WORKDIR}/emacs"
 
 inherit autotools
 
-PACKAGES = "${PN}-el ${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
+PACKAGES =+ "${PN}-el"
 
-FILES_${PN}-el = "${datadir}/emacs/22.0.50/*/*.el.gz \
-                  ${datadir}/emacs/22.0.50/*/*/*.el.gz"
+FILES_${PN}-el = "${datadir}/emacs/*/*/*.el.gz \
+                  ${datadir}/emacs/*/*/*/*.el.gz"
 
 FILES_${PN} += "${datadir}/emacs"
 
-QEMU = "qemu-arm -L ${STAGING_DIR}/${TARGET_SYS}"
+QEMU = "qemu-${TARGET_ARCH} -L ${STAGING_DIR}/${TARGET_SYS}"
 LDFLAGS += "-L${CROSS_DIR}/${TARGET_SYS}/lib"
 
 EXTRA_OECONF = "--without-sound --without-x"
diff --git a/packages/linux/linux-handhelds-2.6/eteng500/.mtn2git_empty b/packages/fmtools/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/eteng500/.mtn2git_empty
+++ b/packages/fmtools/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/ghi270/.mtn2git_empty b/packages/fmtools/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/ghi270/.mtn2git_empty
+++ b/packages/fmtools/files/.mtn2git_empty
diff --git a/packages/fmtools/files/makefile.patch b/packages/fmtools/files/makefile.patch
new file mode 100644
index 0000000000..41c0086b82
--- /dev/null
+++ b/packages/fmtools/files/makefile.patch
@@ -0,0 +1,11 @@
+--- fmtools-1.0.2/Makefile	2002-08-17 06:05:09.000000000 +0200
++++ fmtools-1.0.2p/Makefile	2007-12-22 21:45:28.000000000 +0100
+@@ -1,8 +1,5 @@
+ # fmtools Makefile - just the basics for now
+ 
+-CC	= gcc
+-CFLAGS	= -Wall -O2
+-
+ INSTALL	= /usr/bin/install
+ 
+ # Since fmtools doesn't use configure, these paths are provided here
diff --git a/packages/fmtools/fmtools_1.0.2.bb b/packages/fmtools/fmtools_1.0.2.bb
new file mode 100644
index 0000000000..a1f9fb0f39
--- /dev/null
+++ b/packages/fmtools/fmtools_1.0.2.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "fmtools - programs for Video for Linux radio cards"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.stanford.edu/~blp/fmtools/fmtools-1.0.2.tar.gz \
+           file://makefile.patch;patch=1"
+
+inherit autotools
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 ${S}/fm ${D}${bindir}/fm
+    install -m 0755 ${S}/fmscan ${D}${bindir}/fmscan
+}
+
diff --git a/packages/fstests/fstests.bb b/packages/fstests/fstests.bb
index a84237f263..027a990200 100644
--- a/packages/fstests/fstests.bb
+++ b/packages/fstests/fstests.bb
@@ -3,7 +3,9 @@ HOMEPAGE = "http://www.o-hand.com"
 SECTION = "devel"
 LICENSE = "GPL"
 PV = "0.0+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
+
+DEPENDS = "gtk+"
 
 inherit autotools
 
diff --git a/packages/gammu/gammu_1.13.0.bb b/packages/gammu/gammu_1.17.0.bb
index fc7adb1b79..fc7adb1b79 100644
--- a/packages/gammu/gammu_1.13.0.bb
+++ b/packages/gammu/gammu_1.17.0.bb
diff --git a/packages/images/base-image.bb b/packages/images/base-image.bb
index 36760ec499..9afa682d2c 100644
--- a/packages/images/base-image.bb
+++ b/packages/images/base-image.bb
@@ -17,22 +17,28 @@
 # image is intended to be distro-agnostic.
 
 DISTRO_SSH_DAEMON ?= "dropbear"
+
 DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"
 
+# FIXME: We need a distro-indendent way of specifying feed configs.
+# Once the RFC for the DISTRO_FEED_CONFIGS variable name is approved,
+# we can remove this default definition and set it in the distro config.
+DISTRO_FEED_CONFIGS ?= "${ANGSTROM_FEED_CONFIGS}"
+
 DEPENDS = "\
 	task-boot \
-	task-distro-base task-machine-base \
 	${DISTRO_SSH_DAEMON} \
 	${DISTRO_PACKAGE_MANAGER} \
+	${DISTRO_FEED_CONFIGS} \
 	${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
 	${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
 	"
 
 IMAGE_INSTALL = "\
 	task-boot \
-	task-distro-base task-machine-base \
 	${DISTRO_SSH_DAEMON} \
 	${DISTRO_PACKAGE_MANAGER} \
+	${DISTRO_FEED_CONFIGS} \
 	${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
 	${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
 	"
diff --git a/packages/images/minimal-gpe-image.bb b/packages/images/minimal-gpe-image.bb
index 3f475567d2..64583741cd 100644
--- a/packages/images/minimal-gpe-image.bb
+++ b/packages/images/minimal-gpe-image.bb
@@ -6,7 +6,7 @@ XSERVER ?= "xserver-kdrive-fbdev"
 
 export IMAGE_BASENAME = "minimalist-gpe-image"
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "task-boot"
 IMAGE_INSTALL = "\
@@ -14,6 +14,7 @@ IMAGE_INSTALL = "\
     task-boot \
     gpe-dm gpe-session-scripts gpe-login \
     matchbox-wm \
+    gpe-terminal \
     angstrom-feed-configs \
     ipkg \
     "
diff --git a/packages/images/nas-server-image.bb b/packages/images/nas-server-image.bb
new file mode 100644
index 0000000000..ca8f94e749
--- /dev/null
+++ b/packages/images/nas-server-image.bb
@@ -0,0 +1,53 @@
+# This image is intended to provide a configuration
+# for a network attached storage server device.
+
+# Key features are:
+# 
+# 1) Must be able to mount attached storage devices like
+# internal disks, external USB disks, etc.  Should support
+# various filesystem choices, but ext2 at a minimum.
+#
+# 2) Must be able to boot from internal flash, or directly
+# from a filesystem stored on the attached storage.
+#
+# 3) Must be able to share that storage across the network
+# using various protocols like Samba, NFS, etc.
+#
+# 4) Bonus points for being able to support other central
+# network services like a central gateway machine might.
+
+# Although it is tested with the Angstrom distro, it is
+# intended to be distro-agnostic.
+
+DISTRO_SSH_DAEMON ?= "dropbear"
+DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"
+
+DEPENDS = "\
+	task-boot \
+	${@base_contains('MACHINE_FEATURES', 'apex', 'task-base-apex', '', d)} \
+	task-distro-base task-machine-base \
+	${DISTRO_SSH_DAEMON} \
+	${DISTRO_PACKAGE_MANAGER} \
+	${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
+	${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
+	task-nas-server-everything \
+	"
+
+IMAGE_INSTALL_TASKS = "\
+	task-nas-server-everything \
+	"
+
+IMAGE_INSTALL = "\
+	task-boot \
+	${@base_contains('MACHINE_FEATURES', 'apex', 'task-base-apex', '', d)} \
+	${DISTRO_SSH_DAEMON} \
+	${DISTRO_PACKAGE_MANAGER} \
+	${@base_contains('MACHINE_FEATURES', 'ext2', 'task-base-ext2', '', d)} \
+	${@base_contains('MACHINE_FEATURES', 'usbhost', 'task-base-usbhost', '', d)} \
+	${IMAGE_INSTALL_TASKS} \
+	"
+
+export IMAGE_BASENAME = "nas-server-image"
+IMAGE_LINGUAS = ""
+
+inherit image
diff --git a/packages/kismet/kismet_2007-10-R1.bb b/packages/kismet/kismet_2007-10-R1.bb
index 1c78d468d7..1a53c6f78f 100644
--- a/packages/kismet/kismet_2007-10-R1.bb
+++ b/packages/kismet/kismet_2007-10-R1.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, an
 HOMEPAGE = "http://www.kismetwireless.net/"
 SECTION = "console/network"
 LICENSE = "GPLv2"
-DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2"
-PR = "r1"
+DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2 libpcap"
+PR = "r2"
 
 SRC_URI = "http://www.kismetwireless.net/code/kismet-${PV}.tar.gz"
 
diff --git a/packages/linux/linux-handhelds-2.6/h1910/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h1910/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h2200/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/asus620/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h2200/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/asus620/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/asus620/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig
index 04946541d5..6a2bc0475b 100644
--- a/packages/linux/linux-handhelds-2.6/asus620/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:42 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:12 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/h3600/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/asus730/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h3600/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/asus730/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/asus730/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig
index afd7de8af5..f6c7789570 100644
--- a/packages/linux/linux-handhelds-2.6/asus730/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:43 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:12 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/h3800/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h3800/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/aximx50/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig
index 3a610fa2a2..89bfc0908a 100644
--- a/packages/linux/linux-handhelds-2.6/aximx50/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:43 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:13 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/h3900/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h3900/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/eteng500/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig
index 4c1a93ad73..b1f87fb443 100644
--- a/packages/linux/linux-handhelds-2.6/eteng500/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:44 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:13 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/h4000/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/ghi270/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h4000/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/ghi270/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h5000/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h1910/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/h5000/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h1910/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h1910/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig
index 2e57a63702..902434149b 100644
--- a/packages/linux/linux-handhelds-2.6/h1910/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:44 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:14 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/htcalpine/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcalpine/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h2200/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
index 667f4f478e..1d53dfd987 100644
--- a/packages/linux/linux-handhelds-2.6/h2200/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:45 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:14 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -510,8 +510,8 @@ CONFIG_BT_HCIUART_BCSP=y
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_WIRELESS_EXT=y
@@ -1710,7 +1710,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6/htcapache/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h3600/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcapache/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3600/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h3600/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig
index d30992b494..a8012cc460 100644
--- a/packages/linux/linux-handhelds-2.6/h3600/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:45 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:15 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/htcbeetles/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h3800/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcbeetles/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3800/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h3800/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig
index ffcb91eb32..d110b3f223 100644
--- a/packages/linux/linux-handhelds-2.6/h3800/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:46 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:15 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/htcblueangel/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h3900/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcblueangel/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3900/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h3900/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig
index dd88630b2d..fe9fa52b84 100644
--- a/packages/linux/linux-handhelds-2.6/h3900/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:46 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:16 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/htchimalaya/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h4000/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htchimalaya/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h4000/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h4000/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig
index f04dad63cb..d0b8f08fbb 100644
--- a/packages/linux/linux-handhelds-2.6/h4000/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:47 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:17 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -506,7 +506,12 @@ CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIBLUECARD is not set
 # CONFIG_BT_HCIBTUART is not set
 # CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_SOFTMAC is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -1456,7 +1461,7 @@ CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_TEA is not set
@@ -1464,7 +1469,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6/htcsable/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/h5000/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcsable/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h5000/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/h5000/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig
index 004c26cf3b..a293dfea57 100644
--- a/packages/linux/linux-handhelds-2.6/h5000/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:47 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:17 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/htcuniversal/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcuniversal/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcalpine/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig
index ad409c78b0..0733574b59 100644
--- a/packages/linux/linux-handhelds-2.6/htcalpine/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:49 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:19 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/htcwallaby/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/htcwallaby/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcapache/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig
index 8ffb03322b..04c849d5b8 100644
--- a/packages/linux/linux-handhelds-2.6/htcapache/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:49 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:19 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -445,7 +445,12 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_SOFTMAC is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -1327,7 +1332,7 @@ CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_TEA is not set
@@ -1335,7 +1340,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6/hx4700/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/hx4700/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcbeetles/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig
index db1f76fbfa..c295e2a1c6 100644
--- a/packages/linux/linux-handhelds-2.6/htcbeetles/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:50 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:20 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/looxc550/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/looxc550/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig
index edf57d037b..61f84a4588 100644
--- a/packages/linux/linux-handhelds-2.6/htcblueangel/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:50 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:20 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -470,7 +470,12 @@ CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIBLUECARD is not set
 # CONFIG_BT_HCIBTUART is not set
 # CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_SOFTMAC is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -1483,7 +1488,7 @@ CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_TEA is not set
@@ -1491,7 +1496,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6/magician/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/magician/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htchimalaya/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
index d67400b02b..507d5e4541 100644
--- a/packages/linux/linux-handhelds-2.6/htchimalaya/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:51 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:21 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6/rx1950/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/rx1950/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcsable/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig
index d81cb02201..9ee6a3cdd3 100644
--- a/packages/linux/linux-handhelds-2.6/htcsable/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:51 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:21 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -449,7 +449,12 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_SOFTMAC is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -1354,7 +1359,7 @@ CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_TEA is not set
@@ -1362,7 +1367,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6/rx3000/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-handhelds-2.6/rx3000/.mtn2git_empty
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig
index c8ee782d61..9da03d8f2e 100644
--- a/packages/linux/linux-handhelds-2.6/htcuniversal/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:52 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:22 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -456,7 +456,12 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_SOFTMAC is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -1363,7 +1368,7 @@ CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_TEA is not set
@@ -1371,7 +1376,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig
index 13038ab67e..d69e574934 100644
--- a/packages/linux/linux-handhelds-2.6/htcwallaby/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:52 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:22 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/hx4700/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig
index 9a4f7cb072..97403f4a22 100644
--- a/packages/linux/linux-handhelds-2.6/hx4700/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:48 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:18 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -518,8 +518,8 @@ CONFIG_BT_HCIUART_BCSP=y
 CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_IEEE80211_CRYPT_WEP=m
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-# CONFIG_IEEE80211_CRYPT_TKIP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_WIRELESS_EXT=y
@@ -1727,7 +1727,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/looxc550/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig
index 48eee4b67f..83aff689f4 100644
--- a/packages/linux/linux-handhelds-2.6/looxc550/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:53 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:23 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/magician/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/magician/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/magician/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/magician/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig
index 47a436084a..477ae6ead4 100644
--- a/packages/linux/linux-handhelds-2.6/magician/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:48 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:18 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/rx1950/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig
index 2f5423c28a..f717a91179 100644
--- a/packages/linux/linux-handhelds-2.6/rx1950/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:53 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:23 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/.mtn2git_empty
diff --git a/packages/linux/linux-handhelds-2.6/rx3000/defconfig b/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig
index 0100f9b641..af0393df6b 100644
--- a/packages/linux/linux-handhelds-2.6/rx3000/defconfig
+++ b/packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.21-hh19
-# Thu Dec 13 13:04:54 2007
+# Linux kernel version: 2.6.21-hh20
+# Sat Dec 22 21:02:24 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -445,7 +445,12 @@ CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 # CONFIG_BT_HCIVHCI is not set
-# CONFIG_IEEE80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+# CONFIG_IEEE80211_CRYPT_WEP is not set
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_IEEE80211_SOFTMAC is not set
 CONFIG_WIRELESS_EXT=y
 
 #
@@ -1398,7 +1403,7 @@ CONFIG_CRYPTO_PCBC=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_AES is not set
+CONFIG_CRYPTO_AES=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
 # CONFIG_CRYPTO_TEA is not set
@@ -1406,7 +1411,7 @@ CONFIG_CRYPTO_ARC4=m
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_MICHAEL_MIC=m
 # CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_TEST is not set
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb
deleted file mode 100644
index 275602762d..0000000000
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh16.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
-LICENSE = "GPL"
-PR = "r2"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-           file://defconfig"
-
-require linux-handhelds-2.6.inc
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
index ae3741e872..a9dd604d8f 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh17.bb
@@ -5,6 +5,10 @@ PR = "r3"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
            file://defconfig"
 
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
index b34d4630a0..cb6e7efc13 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh18.bb
@@ -5,6 +5,10 @@ PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
            file://defconfig"
 
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
deleted file mode 100644
index ae3741e872..0000000000
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh19.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
-LICENSE = "GPL"
-PR = "r3"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
-           file://defconfig"
-
-require linux-handhelds-2.6.inc
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
index b34d4630a0..48f3f224e2 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
@@ -1,10 +1,14 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
-PR = "r0"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
            file://defconfig"
 
diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb
index 4e008f5b6e..89cb68548f 100644
--- a/packages/linux/linux-handhelds-2.6_cvs.bb
+++ b/packages/linux/linux-handhelds-2.6_cvs.bb
@@ -6,10 +6,14 @@ PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
 
+# Override where to look for defconfigs and patches,
+# we have per-kernel-release sets.
+FILESPATH = "${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21/${MACHINE}:${FILE_DIRNAME}/linux-handhelds-2.6-2.6.21"
+
 K_MAJOR = "2"
 K_MINOR = "6"
 K_MICRO = "21"
-HHV     = "14"
+HHV     = "20"
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26  \
            file://defconfig"
diff --git a/packages/meta/meta-nas-server.bb b/packages/meta/meta-nas-server.bb
new file mode 100644
index 0000000000..3deb44c2bd
--- /dev/null
+++ b/packages/meta/meta-nas-server.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Meta-package for a network attached storage server"
+LICENSE = "MIT"
+PR = "r0"
+
+RDEPENDS = "\
+	task-nas-server-everything \
+	"
+
+inherit meta
+
diff --git a/packages/meta/unslung-binary-kernel-packages.bb b/packages/meta/unslung-binary-kernel-packages.bb
deleted file mode 100644
index eb95b847fd..0000000000
--- a/packages/meta/unslung-binary-kernel-packages.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Packages that are compatible with the Unslung binary kernel firmware"
-LICENSE = "MIT"
-PR = "r2"
-COMPATIBLE_MACHINE = "nslu2"
-
-ALLOW_EMPTY = "1"
-PACKAGES = "${PN}"
-
-inherit meta
-
-UNSLUNG_PACKAGES = "\
-	"
-
-BROKEN_PACKAGES = "\
-	"
-
-DEPENDS = 'unslung-image \
-	${UNSLUNG_PACKAGES} \
-	package-index'
diff --git a/packages/navit/navit.inc b/packages/navit/navit.inc
new file mode 100644
index 0000000000..3754e1580a
--- /dev/null
+++ b/packages/navit/navit.inc
@@ -0,0 +1,11 @@
+DESCRIPTION = "Navit is a car navigation system with routing engine."
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 gtk+"
+RRECOMMENDS = "gpsd speechd flite"
+
+inherit autotools
+
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
+FILES_${PN}-dev += "${libdir}/${PN}/*/*.so"
diff --git a/packages/navit/navit_0.0.1.bb b/packages/navit/navit_0.0.1.bb
index 2db71a3e87..f96a04ec16 100644
--- a/packages/navit/navit_0.0.1.bb
+++ b/packages/navit/navit_0.0.1.bb
@@ -1,13 +1,8 @@
-DESCRIPTION = "Navit is a car navigation system with routing engine."
-LICENSE = "GPL"
-DEPENDS = "glib-2.0 gtk+"
-PR = "r2"
+require navit.inc
 
-inherit autotools 
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \
            file://compile-fix.patch;patch=1"
 
 EXTRA_OECONF = "--disable-gui-sdl --disable-binding-python --enable-avoid-unaligned --enable-avoid-float"
-
-FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
diff --git a/packages/navit/navit_0.0.2.bb b/packages/navit/navit_0.0.2.bb
index ce34ee835b..794f901db5 100644
--- a/packages/navit/navit_0.0.2.bb
+++ b/packages/navit/navit_0.0.2.bb
@@ -1,13 +1,7 @@
-DESCRIPTION = "Navit is a car navigation system with routing engine."
-LICENSE = "GPL"
-DEPENDS = "glib-2.0 gtk+"
-PR = "r0"
+require navit.inc
 
-inherit autotools 
+PR = "r2"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \
-           file://compile-fix.patch;patch=1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz" 
 
-EXTRA_OECONF = "--disable-gui-sdl --disable-binding-python --enable-avoid-unaligned --enable-avoid-float"
-
-FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
+EXTRA_OECONF = "--disable-gui-sdl --disable-binding-python --disable-samplemap --enable-avoid-unaligned --enable-avoid-float"
diff --git a/packages/navit/navit_0.0.3.bb b/packages/navit/navit_0.0.3.bb
new file mode 100644
index 0000000000..d0c1c553d6
--- /dev/null
+++ b/packages/navit/navit_0.0.3.bb
@@ -0,0 +1,7 @@
+require navit.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz"
+
+EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
diff --git a/packages/navit/navit_cvs.bb b/packages/navit/navit_cvs.bb
index 8f158d4f79..8b10c908ec 100644
--- a/packages/navit/navit_cvs.bb
+++ b/packages/navit/navit_cvs.bb
@@ -1,19 +1,13 @@
-DESCRIPTION = "Navit is a car navigation system with routing engine."
-LICENSE = "GPL"
-DEPENDS = "glib-2.0 gtk+"
-PV = "0.0.2+cvs${SRCDATE}"
+require navit.inc
+
+PV = "0.0.3+cvs${SRCDATE}"
 PR = "r0"
 
-inherit autotools
 S = "${WORKDIR}/navit"
 
-SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit \
-          "
+SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit"
 
 EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
-#--enable-shared
 
 EXTRA_AUTORECONF = " -I m4"
 
-FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
-
diff --git a/packages/octave/octave_3.0.0.bb b/packages/octave/octave_3.0.0.bb
new file mode 100644
index 0000000000..b92a181754
--- /dev/null
+++ b/packages/octave/octave_3.0.0.bb
@@ -0,0 +1,27 @@
+require octave.inc
+
+SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
+           file://configure.patch;patch=1"
+
+PR = "r0"
+
+PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \
+	     libcruft-dev liboctave-dev liboctinterp-dev \
+             libcruft-dbg liboctave-dbg liboctinterp-dbg"
+
+FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*"
+FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so"
+FILES_libcruft-dbg += "${libdir}/${PN}-${PV}/.debug/libcruft*"
+
+FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*"
+FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so"
+FILES_liboctave-dbg += "${libdir}/${PN}-${PV}/.debug/liboctave*"
+
+FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*"
+FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so"
+FILES_liboctinterp-dbg += "${libdir}/${PN}-${PV}/.debug/liboctinterp*"
+
+# octave-oct provides subroutines in .oct file format
+FILES_${PN}-oct = "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/*.oct"
+
+FILES_${PN}-dbg += "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug"
diff --git a/packages/poppler/poppler0.6_cvs.bb b/packages/poppler/poppler0.6_cvs.bb
deleted file mode 100644
index 15f94a775a..0000000000
--- a/packages/poppler/poppler0.6_cvs.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require poppler.inc
-PV = "0.5.9+cvs${SRCDATE}"
-PR = "r1"
-
-SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/poppler;module=poppler"
-S = "${WORKDIR}/poppler"
diff --git a/packages/python/python-gammu_0.21.bb b/packages/python/python-gammu_0.24.bb
index f8989d9181..f8989d9181 100644
--- a/packages/python/python-gammu_0.21.bb
+++ b/packages/python/python-gammu_0.24.bb
diff --git a/packages/roadmap/files/qt/roadmap.desktop.patch b/packages/roadmap/files/roadmap.desktop.patch
index 98d5b06130..98d5b06130 100644
--- a/packages/roadmap/files/qt/roadmap.desktop.patch
+++ b/packages/roadmap/files/roadmap.desktop.patch
diff --git a/packages/roadmap/roadmap-gtk2-1.0.12/.mtn2git_empty b/packages/roadmap/roadmap-gtk2-1.0.12/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/roadmap/roadmap-gtk2-1.0.12/.mtn2git_empty
diff --git a/packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch b/packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch
new file mode 100644
index 0000000000..8f79b5503f
--- /dev/null
+++ b/packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch
@@ -0,0 +1,11 @@
+--- src/qt/ipkg/zroadgps.desktop.old	2007-12-24 19:35:34.000000000 -0600
++++ src/qt/ipkg/zroadgps.desktop	2007-12-24 19:37:12.000000000 -0600
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Comment=RoadMap
+ Exec=roadgps
+-Icon=zroadgps
++Icon=roadgps
+ Type=Application
+ Name=RoadMapGPS
++Categories=Graphics;Viewer;GTK;
diff --git a/packages/roadmap/roadmap-gtk2_1.0.12.bb b/packages/roadmap/roadmap-gtk2_1.0.12.bb
new file mode 100644
index 0000000000..e2ce5f2316
--- /dev/null
+++ b/packages/roadmap/roadmap-gtk2_1.0.12.bb
@@ -0,0 +1,44 @@
+require roadmap.inc
+
+DEPENDS = "gtk+"
+PR = "r0"
+
+SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \
+           file://roadmap.desktop.patch;patch=1 \
+           file://roadgps.desktop.patch;patch=1 \
+	   http://www.roadmap.digitalomaha.net/maps-1.0.12/usdir.rdm.tgz \
+           file://zroadgps.png "
+
+S = "${WORKDIR}/roadmap-${PV}/src"
+
+DESKTOP = "GTK2"
+CFLAGS += " -I${STAGING_INCDIR}/atk-1.0 -I${STAGING_INCDIR}/cairo  -I${STAGING_INCDIR}/pango-1.0 \
+            -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/gtk-2.0 -I${STAGING_LIBDIR}/gtk-2.0/include -I${S} "
+
+do_compile() {
+        oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a
+	cd gtk2 && oe_runmake
+}
+
+do_install() {
+        install -d ${D}${bindir}
+        install -d ${D}${datadir}/applications
+        install -d ${D}${datadir}/pixmaps
+        install -d ${D}${datadir}/roadmap
+
+        install -m 0755 gtk2/gtkroadmap ${D}${bindir}/roadmap
+        install -m 0755 gtk2/gtkroadgps ${D}${bindir}/roadgps
+
+        install -m 0644 icons/*png ${D}${datadir}/pixmaps/
+        install -m 0644 roadmap.png ${D}${datadir}/pixmaps/
+        install -m 0644 ${WORKDIR}/zroadgps.png ${D}${datadir}/pixmaps/roadgps.png
+        
+        install -m 0644 roadmap.desktop ${D}${datadir}/applications/
+        install -m 0644 qt/ipkg/zroadgps.desktop ${D}${datadir}/applications/roadgps.desktop
+        
+        install -m 0644 sprites schema preferences ${D}${datadir}/roadmap/
+	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
+}
+
+FILES_${PN} += "${datadir}/roadmap"
+
diff --git a/packages/roadmap/roadmap-gtk2_1.1.0.bb b/packages/roadmap/roadmap-gtk2_1.1.0.bb
new file mode 100644
index 0000000000..f638cf1fdd
--- /dev/null
+++ b/packages/roadmap/roadmap-gtk2_1.1.0.bb
@@ -0,0 +1,46 @@
+require roadmap.inc
+
+DEPENDS = "agg expat gtk+"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \
+           file://cross.patch;patch=1;pnum=2 \
+           file://roadmap.desktop.patch;patch=1 \
+	   http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
+           file://zroadgps.png"
+
+S = "${WORKDIR}/roadmap-${PV}/src"
+
+DESKTOP = "GTK2"
+POPT = "NO"
+AGG = "rgba32"
+CFLAGS += " -I${STAGING_INCDIR}/atk-1.0 -I${STAGING_INCDIR}/cairo  -I${STAGING_INCDIR}/pango-1.0 \
+            -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/gtk-2.0 -I${STAGING_LIBDIR}/gtk-2.0/include -I${S} "
+
+do_compile() {
+        oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a
+        oe_runmake -C gpx libgpx.a
+        oe_runmake -C unix libosroadmap.a
+	oe_runmake -C gtk2 gtkroadmap gtkroadgps
+}
+
+do_install() {
+        install -d ${D}${bindir}
+        install -d ${D}${datadir}/applications
+        install -d ${D}${datadir}/pixmaps
+        install -d ${D}${datadir}/roadmap
+
+        install -m 0755 gtk2/gtkroadmap ${D}${bindir}/roadmap
+        install -m 0755 gtk2/gtkroadgps ${D}${bindir}/roadgps
+
+        install -m 0644 icons/*png ${D}${datadir}/pixmaps/
+        install -m 0644 ${WORKDIR}/zroadgps.png ${D}${datadir}/pixmaps/roadgps.png
+        
+        install -m 0644 roadmap.desktop ${D}${datadir}/applications/
+        
+        install -m 0644 sprites preferences ${D}${datadir}/roadmap/
+	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
+}
+
+FILES_${PN} += "${datadir}/roadmap"
+
diff --git a/packages/roadmap/roadmap-gtk2_cvs.bb b/packages/roadmap/roadmap-gtk2_cvs.bb
index 557c4a1096..2ece0de929 100644
--- a/packages/roadmap/roadmap-gtk2_cvs.bb
+++ b/packages/roadmap/roadmap-gtk2_cvs.bb
@@ -1,22 +1,26 @@
 require roadmap.inc
 
-DEPENDS = "expat gtk+"
-PV = "1.0.12+cvs${SRCDATE}"
-PR = "r1"
+DEPENDS = "agg expat gtk+"
+PV = "1.1.0+cvs${SRCDATE}"
+PR = "r0"
 
 SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
            file://cross.patch;patch=1;pnum=2 \
 	   http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
-           "
+           file://zroadgps.png"
 
 S = "${WORKDIR}/roadmap/src"
 
-CFLAGS += " -I${S} "
-
+DESKTOP = "GTK2"
+AGG = "rgba32"
+CFLAGS += " -I${STAGING_INCDIR}/atk-1.0 -I${STAGING_INCDIR}/cairo  -I${STAGING_INCDIR}/pango-1.0 \
+            -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/gtk-2.0 -I${STAGING_LIBDIR}/gtk-2.0/include -I${S} "
 
 do_compile() {
-        oe_runmake
-	oe_runmake gtk2
+        oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a
+        oe_runmake -C gpx libgpx.a
+        oe_runmake -C unix libosroadmap.a
+	oe_runmake -C gtk2 gtkroadmap gtkroadgps
 }
 
 do_install() {
@@ -25,11 +29,15 @@ do_install() {
         install -d ${D}${datadir}/pixmaps
         install -d ${D}${datadir}/roadmap
 
-        install -m 0755 gtk2/gtkroad* ${D}${bindir}
+        install -m 0755 gtk2/gtkroadmap ${D}${bindir}/roadmap
+        install -m 0755 gtk2/gtkroadgps ${D}${bindir}/roadgps
 
-        install -m 0644 icons/*png ${D}${datadir}/pixmaps
+        install -m 0644 icons/*png ${D}${datadir}/pixmaps/
+        install -m 0644 ${WORKDIR}/zroadgps.png ${D}${datadir}/pixmaps/roadgps.png
+        
+        install -m 0644 roadmap.desktop ${D}${datadir}/applications/
         
-        install -m 0644 sprites preferences ${D}${datadir}/roadmap
+        install -m 0644 sprites preferences ${D}${datadir}/roadmap/
 	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
 }
 
diff --git a/packages/roadmap/roadmap.inc b/packages/roadmap/roadmap.inc
index 43577badb9..e9598df178 100644
--- a/packages/roadmap/roadmap.inc
+++ b/packages/roadmap/roadmap.inc
@@ -3,5 +3,6 @@ PRIORITY = "optional"
 AUTHOR = "Pascal Martin <pascal.martin@iname.com>"
 HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html"
 LICENSE = "GPL"
+RRECOMMENDS = "gpsd flite"
 
 PARALLEL_MAKE = ""
diff --git a/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch b/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch
deleted file mode 100644
index 24fe1c9bdb..0000000000
--- a/packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-
-#
-# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de>
-#
-
---- src/qt/qt_main.cc~qt2-fixes-r1.patch
-+++ src/qt/qt_main.cc
-@@ -137,7 +137,7 @@
-       switch (orientation[0]) {
-          case 't':
-          case 'T': break;
--
-+#ifndef QWS
-          case 'b':
-          case 'B': moveDockWindow (toolBar, DockBottom); break;
- 
-@@ -146,7 +146,7 @@
- 
-          case 'r':
-          case 'R': moveDockWindow (toolBar, DockRight); break;
--
-+#endif
-          default: roadmap_log (ROADMAP_FATAL,
-                         "Invalid toolbar orientation %s", orientation);
-       }
---- src/qt/Makefile~qt2-fixes-r1.patch
-+++ src/qt/Makefile
-@@ -19,7 +19,7 @@
- 
- ifeq ($(DESKTOP),QPE)
-    CFLAGS += -I$(QTDIR)/include -DQWS
--   LIBS += -lqte -lqpe
-+   LIBS += -lqpe
-    INSTALLDIR=$(QTDIR)
- endif
- 
diff --git a/packages/roadmap/zroadmap_1.0.12.bb b/packages/roadmap/zroadmap_1.0.12.bb
index 9a7b73d1a1..c7fc851d0d 100644
--- a/packages/roadmap/zroadmap_1.0.12.bb
+++ b/packages/roadmap/zroadmap_1.0.12.bb
@@ -4,8 +4,9 @@ PR = "r1"
 
 SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \
            file://qt2-fixes.patch;pnum=2;patch=1 \
-           http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
+           http://www.roadmap.digitalomaha.net/maps-1.0.12/usdir.rdm.tgz \
            file://zroadgps.png"
+
 S = "${WORKDIR}/roadmap-${PV}/src"
 
 EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \
@@ -21,13 +22,17 @@ do_install() {
         install -d ${D}${palmtopdir}/bin
 	install -d ${D}${palmtopdir}/apps/Applications
 	install -d ${D}${palmtopdir}/pics
+        install -d ${D}${palmtopdir}/share/roadmap
+
         install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap
 	install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps
+
         install -m 0644 icons/*.png ${D}${palmtopdir}/pics/
 	install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png
 	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
+
         install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/
-	install -d ${D}${palmtopdir}/share/roadmap/
+	
         install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/
 	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
 }
diff --git a/packages/roadmap/zroadmap_1.1.0.bb b/packages/roadmap/zroadmap_1.1.0.bb
index 42184ce62b..bafcc7c27d 100644
--- a/packages/roadmap/zroadmap_1.1.0.bb
+++ b/packages/roadmap/zroadmap_1.1.0.bb
@@ -1,7 +1,7 @@
 require zroadmap.inc
 
-DEPENDS += "expat"
-PR = "r0"
+DEPENDS = "expat"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \
            file://cross.patch;patch=1;pnum=2 \
@@ -9,9 +9,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \
            file://qt/qt_canvas.patch;patch=1 \
            file://qt/qt_main.patch;patch=1 \
            file://qt/roadmap_main.patch;patch=1 \
-           file://qt/roadmap.desktop.patch;patch=1 \
+           file://roadmap.desktop.patch;patch=1 \
            http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \
            file://zroadgps.png"
+
 S = "${WORKDIR}/roadmap-${PV}/src"
 
 EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} POPT=NO \
@@ -29,12 +30,16 @@ do_install() {
         install -d ${D}${palmtopdir}/bin
 	install -d ${D}${palmtopdir}/apps/Applications
 	install -d ${D}${palmtopdir}/pics
+        install -d ${D}${palmtopdir}/share/roadmap
+
         install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap
 	install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps
+
 	install -m 0644 icons/*.png ${D}${palmtopdir}/pics/
 	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
+
         install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/
-	install -d ${D}${palmtopdir}/share/roadmap/
+	
         install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/
 	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
 }
diff --git a/packages/roadmap/zroadmap_cvs.bb b/packages/roadmap/zroadmap_cvs.bb
index 5b39faf071..cb81756041 100644
--- a/packages/roadmap/zroadmap_cvs.bb
+++ b/packages/roadmap/zroadmap_cvs.bb
@@ -1,19 +1,15 @@
 require zroadmap.inc
 
-DEPENDS += "expat"
-SRCDATE = "20071212"
-PV = "1.1.0+cvs-${SRCDATE}"
-PR = "r0"
+DEPENDS = "expat"
+PV = "1.1.0+cvs${SRCDATE}"
+PR = "r1"
 
 SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
            file://cross.patch;patch=1;pnum=2 \
            file://qt/qt2-fixes.patch;patch=1 \
-           file://qt/qt_canvas.patch;patch=1 \
-#upstream  file://qt/qt_main.patch;patch=1 \
-           file://qt/roadmap_main.patch;patch=1 \
-#upstream  file://qt/roadmap.desktop.patch;patch=1 \
            http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \
            file://zroadgps.png"
+
 S = "${WORKDIR}/roadmap/src"
 
 EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \
@@ -31,12 +27,16 @@ do_install() {
         install -d ${D}${palmtopdir}/bin
 	install -d ${D}${palmtopdir}/apps/Applications
 	install -d ${D}${palmtopdir}/pics
+        install -d ${D}${palmtopdir}/share/roadmap
+
         install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap
 	install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps
+
 	install -m 0644 icons/*.png ${D}${palmtopdir}/pics/
 	install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png
+
         install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/
-	install -d ${D}${palmtopdir}/share/roadmap/
+	
         install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/
 	install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/
 }
diff --git a/packages/slugos-init/slugos-init_4.8.bb b/packages/slugos-init/slugos-init_4.8.bb
new file mode 100644
index 0000000000..49c3e1fee6
--- /dev/null
+++ b/packages/slugos-init/slugos-init_4.8.bb
@@ -0,0 +1,149 @@
+DESCRIPTION = "SlugOS initial network config via sysconf"
+SECTION = "base"
+PRIORITY = "required"
+LICENSE = "GPL"
+DEPENDS = "base-files devio"
+RDEPENDS = "busybox devio"
+PR = "r0"
+
+SRC_URI = "file://boot/flash \
+	   file://boot/disk \
+	   file://boot/nfs \
+	   file://boot/ram \
+	   file://boot/kexec \
+	   file://boot/network \
+	   file://boot/udhcpc.script \
+	   file://initscripts/fixfstab \
+	   file://initscripts/syslog.buffer \
+	   file://initscripts/syslog.file \
+	   file://initscripts/syslog.network \
+	   file://initscripts/zleds \
+	   file://initscripts/leds_startup \
+	   file://initscripts/rmrecovery \
+	   file://initscripts/sysconfsetup \
+	   file://initscripts/umountinitrd.sh \
+	   file://initscripts/loadmodules.sh \
+	   file://functions \
+	   file://modulefunctions \
+	   file://conffiles \
+	   file://sysconf \
+	   file://leds \
+	   file://turnup \
+	   "
+
+SBINPROGS = ""
+USRSBINPROGS = ""
+CPROGS = "${USRSBINPROGS} ${SBINPROGS}"
+SCRIPTS = "turnup leds sysconf"
+BOOTSCRIPTS = "flash disk nfs ram kexec network udhcpc.script"
+INITSCRIPTS = "syslog.buffer syslog.file syslog.network zleds\
+	leds_startup rmrecovery sysconfsetup umountinitrd.sh\
+	fixfstab loadmodules.sh"
+
+# This just makes things easier...
+S="${WORKDIR}"
+
+do_compile() {
+	set -ex
+	for p in ${CPROGS}
+	do
+		${CC} ${CFLAGS} -o $p $p.c
+	done
+	set +ex
+}
+
+do_install() {
+	set -ex
+
+	# Directories
+        install -d ${D}${sysconfdir} \
+                   ${D}${sysconfdir}/default \
+                   ${D}${sysconfdir}/init.d \
+		   ${D}${sysconfdir}/modutils \
+                   ${D}${sysconfdir}/udev \
+		   ${D}${sbindir} \
+		   ${D}${base_sbindir} \
+		   ${D}/initrd \
+		   ${D}/boot
+
+	# linuxrc
+	rm -f ${D}/linuxrc
+	ln -s boot/flash ${D}/linuxrc
+
+	# C programs
+	for p in ${USRSBINPROGS}
+	do
+		install -m 0755 $p ${D}${sbindir}/$p
+	done
+	for p in ${SBINPROGS}
+	do
+		install -m 0755 $p ${D}${base_sbindir}/$p
+	done
+
+	# Shell scripts
+	for p in ${SCRIPTS}
+	do
+		install -m 0755 $p ${D}${base_sbindir}/$p
+	done
+
+	#
+	# Init scripts
+	install -m 0644 functions ${D}${sysconfdir}/default
+	install -m 0644 modulefunctions ${D}${sysconfdir}/default
+	for s in ${INITSCRIPTS}
+	do
+		install -m 0755 initscripts/$s ${D}${sysconfdir}/init.d/
+	done
+
+	#
+	# Boot scripts
+	for p in ${BOOTSCRIPTS}
+	do
+		install -m 0755 boot/$p ${D}/boot
+	done
+
+	# Configuration files
+	install -m 0644 conffiles ${D}${sysconfdir}/default
+
+	set +ex
+}
+
+# If the package is installed on an NSLU2 $D will be empty, in that
+# case it is normal to run 'start' and 'stop', but because the conf
+# files installed don't actually start or stop anything this is
+# unnecessary, so the package postfoo handling is simplified here.
+#NB: do not use '08' (etc) for the first argument after start/stop,
+# the value is interpreted as an octal number if there is a leading
+# zero.
+pkg_postinst_slugos-init() {
+	opt=
+	test -n "$D" && opt="-r $D"
+	update-rc.d $opt hwclock.sh		start  8 S . start 45 0 6 .
+	update-rc.d $opt umountinitrd.sh	start  9 S .
+	update-rc.d $opt fixfstab		start 10 S .
+	update-rc.d $opt syslog.buffer		start 11 S . start 49 0 6 .
+	update-rc.d $opt sysconfsetup		start 12 S .
+	update-rc.d $opt loadmodules.sh		start 21 S .
+	update-rc.d $opt syslog.file		start 39 S . start 47 0 6 .
+	update-rc.d $opt syslog.network		start 44 S . start 39 0 6 .
+	update-rc.d $opt zleds			start 99 S 1 2 3 4 5 . start 89 0 6 . stop  5 0 1 2 3 4 5 6 .
+	update-rc.d $opt rmrecovery             start 99 1 2 3 4 5 .
+	# bug fix for startup
+	update-rc.d $opt leds_startup		start  1 1 2 3 4 5 .
+}
+
+pkg_postrm_slugos-init() {
+	opt=
+	test -n "$D" && opt="-r $D"
+	for s in ${INITSCRIPTS}
+	do
+		update-rc.d $opt "$s" remove
+	done
+}
+
+PACKAGES = "${PN}"
+FILES_${PN} = "/"
+
+# It is bad to overwrite /linuxrc as it puts the system back to
+# a flash boot (and the flash has potentially not been upgraded!)
+CONFFILES_${PN} = "/linuxrc ${sysconfdir}/default/conffiles"
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 41f940858a..da1fdf97cd 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r53"
+PR = "r54"
 
 inherit task
 
diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb
index 0435c2aa62..5663ff5a3d 100644
--- a/packages/tasks/task-boot.bb
+++ b/packages/tasks/task-boot.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Basic task to get a device booting"
-PR = "r42"
+PR = "r43"
 
 inherit task
 
diff --git a/packages/tasks/task-nas-server.bb b/packages/tasks/task-nas-server.bb
new file mode 100644
index 0000000000..bfecfc8822
--- /dev/null
+++ b/packages/tasks/task-nas-server.bb
@@ -0,0 +1,94 @@
+DESCRIPTION = "Tasks for a Network Attached Storage server"
+LICENSE = "MIT"
+PROVIDES = "task-nas-server-everything"
+PR = "r0"
+
+inherit task
+
+PACKAGES = "\
+	task-nas-server-everything \
+	${NAS_SERVER_PACKAGES} \
+"
+
+NAS_SERVER_PACKAGES = "\
+	task-nas-server-base \
+	task-nas-server-samba \
+	task-nas-server-dnsmasq \
+	task-nas-server-iptables \
+	task-nas-server-tzdata \
+	task-nas-server-nfs \
+	task-nas-server-vfat \
+	task-nas-server-ntfs \
+	task-nas-server-ext3 \
+	task-nas-server-reiserfs \
+"
+
+RDEPENDS_task-nas-server-everything = "${NAS_SERVER_PACKAGES}"
+
+DESCRIPTION_task-nas-server-base = "NAS-Server: Base Packages"
+RDEPENDS_task-nas-server-base = "\
+"
+RRECOMMENDS_task-nas-server-base = "\
+"
+
+DESCRIPTION_task-nas-server-samba = "NAS-Server: Samba Server"
+RDEPENDS_task-nas-server-samba = "\
+	samba swat \
+"
+RRECOMMENDS_task-nas-server-samba = "\
+"
+
+DESCRIPTION_task-nas-server-dnsmasq = "NAS-Server: DNS/DHCP Server"
+RDEPENDS_task-nas-server-dnsmasq = "\
+	dnsmasq \
+"
+RRECOMMENDS_task-nas-server-dnsmasq = "\
+"
+
+DESCRIPTION_task-nas-server-iptables = "NAS-Server: Netfilter/Iptables Support"
+RDEPENDS_task-nas-server-iptables = "\
+	iptables \
+"
+RRECOMMENDS_task-nas-server-iptables = "\
+	kernel-module-iptable-nat \
+	kernel-module-iptable-mangle \
+	kernel-module-ipt-masquerade \
+"
+
+DESCRIPTION_task-nas-server-tzdata = "NAS-Server: Timezone Support"
+RDEPENDS_task-nas-server-tzdata = "\
+	tzdata \
+"
+RRECOMMENDS_task-nas-server-tzdata = "\
+"
+
+DESCRIPTION_task-nas-server-nfs = "NAS-Server: NFS Server"
+RDEPENDS_task-nas-server-nfs = "\
+	nfs-utils portmap \
+"
+RRECOMMENDS_task-nas-server-nfs = "\
+"
+
+DESCRIPTION_task-nas-server-vfat = "NAS-Server: FAT Filesystem"
+RDEPENDS_task-nas-server-vfat = "\
+"
+RRECOMMENDS_task-nas-server-vfat = "\
+"
+
+DESCRIPTION_task-nas-server-ntfs = "NAS-Server: NTFS Filesystem"
+RDEPENDS_task-nas-server-ntfs = "\
+"
+RRECOMMENDS_task-nas-server-ntfs = "\
+"
+
+DESCRIPTION_task-nas-server-ext3 = "NAS-Server: EXT3 Filesystem"
+RDEPENDS_task-nas-server-ext3 = "\
+"
+RRECOMMENDS_task-nas-server-ext3 = "\
+"
+
+DESCRIPTION_task-nas-server-reiserfs = "NAS-Server: ReiserFS Filesystem"
+RDEPENDS_task-nas-server-reiserfs = "\
+"
+RRECOMMENDS_task-nas-server-reiserfs = "\
+"
diff --git a/packages/tzdata/tzdata_2007e.bb b/packages/tzdata/tzdata_2007e.bb
index 46d941c269..d873bfd0d6 100644
--- a/packages/tzdata/tzdata_2007e.bb
+++ b/packages/tzdata/tzdata_2007e.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "optional"
 DEPENDS = "tzcode-native"
 
-PR = "r0"
+PR = "r1"
 
 PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \
             tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \
@@ -126,6 +126,9 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu     \
                 ${datadir}/zoneinfo/Asia/Bankok          \
                 ${datadir}/zoneinfo/Asia/Hong_Kong       \
                 ${datadir}/zoneinfo/Asia/Tokyo           \
+                ${datadir}/zoneinfo/Australia/Darwin     \
+                ${datadir}/zoneinfo/Australia/Adelaide   \
+                ${datadir}/zoneinfo/Australia/Brisbane   \
                 ${datadir}/zoneinfo/Australia/Sydney     \
                 ${datadir}/zoneinfo/Pacific/Noumea       \
                 ${datadir}/zoneinfo/CET                  \
diff --git a/packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch
new file mode 100644
index 0000000000..a935bc57de
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch
@@ -0,0 +1,13 @@
+--- xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c.old	2007-12-24 04:54:13.000000000 -0600
++++ xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c	2007-12-25 01:13:27.000000000 -0600
+@@ -357,10 +357,7 @@ fbdevMapFramebuffer (KdScreenInfo *scree
+     KdMouseMatrix	m;
+     FbdevPriv		*priv = screen->card->driver;
+ 
+-    if (scrpriv->randr != RR_Rotate_0 || priv->Have18Bpp)
+ 	scrpriv->shadow = TRUE;
+-    else
+-	scrpriv->shadow = FALSE;
+     
+     KdComputeMouseMatrix (&m, scrpriv->randr, screen->width, screen->height);
+     
diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 368b421650..4367e40adf 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-PR = "r21"
+PR = "r23"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
@@ -29,6 +29,9 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
         file://03-xglamo-no-vesa.patch;patch=1 \
 "
 
+SRC_URI_append_tosa = "file://tosa-fbdev.patch;patch=1"
+PACKAGE_ARCH_xserver-kdrive-fbdev_tosa = "${MACHINE_ARCH}"
+
 S = "${WORKDIR}/xorg-server-${PV}"
 
 W100_OECONF = "--disable-w100"
diff --git a/packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch b/packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch
new file mode 100644
index 0000000000..723d8bd956
--- /dev/null
+++ b/packages/xscreensaver/xscreensaver-4.22/configure.in-includedir.patch
@@ -0,0 +1,72 @@
+--- xscreensaver-4.22/configure.in.orig	2007-12-23 18:33:43.000000000 +0000
++++ xscreensaver-4.22/configure.in	2007-12-23 18:35:33.000000000 +0000
+@@ -944,9 +944,6 @@
+ #
+ AC_DEFUN(AC_CHECK_X_HEADER, [
+   ac_save_CPPFLAGS="$CPPFLAGS"
+-  if test \! -z "$includedir" ; then 
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+   AC_CHECK_HEADER([$1],[$2],[$3],[$4])
+   CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -955,9 +952,6 @@
+ #
+ AC_DEFUN(AC_EGREP_X_HEADER, [
+   ac_save_CPPFLAGS="$CPPFLAGS"
+-  if test \! -z "$includedir" ; then 
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+   AC_EGREP_HEADER([$1], [$2], [$3], [$4])
+   CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -966,9 +960,6 @@
+ #
+ AC_DEFUN(AC_TRY_X_COMPILE, [
+   ac_save_CPPFLAGS="$CPPFLAGS"
+-  if test \! -z "$includedir" ; then 
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+   AC_TRY_COMPILE([$1], [$2], [$3], [$4])
+   CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -982,9 +973,6 @@
+   ac_save_LDFLAGS="$LDFLAGS"
+ #  ac_save_LIBS="$LIBS"
+ 
+-  if test \! -z "$includedir" ; then 
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   # note: $X_CFLAGS includes $x_includes
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ 
+@@ -1005,9 +993,6 @@
+ #
+ AC_DEFUN(AC_TRY_X_RUN, [
+   ac_save_CPPFLAGS="$CPPFLAGS"
+-  if test \! -z "$includedir" ; then 
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+   AC_TRY_RUN([$1], [$2], [$3], [$4])
+   CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -2763,9 +2748,6 @@
+ EOF
+ 
+          ac_save_CPPFLAGS="$CPPFLAGS"
+-         if test \! -z "$includedir" ; then 
+-           CPPFLAGS="$CPPFLAGS -I$includedir"
+-         fi
+          CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ 
+          mglv=`(eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC | grep configure:`
+@@ -3395,9 +3377,6 @@
+ DEPEND_DEFINES=
+ 
+ 
+-if test \! -z "$includedir" ; then 
+-  INCLUDES="$INCLUDES -I$includedir"
+-fi
+ 
+ if test \! -z "$libdir" ; then
+   LDFLAGS="$LDFLAGS -L$libdir"
diff --git a/packages/xscreensaver/xscreensaver_4.22.bb b/packages/xscreensaver/xscreensaver_4.22.bb
index 6c2776d6aa..cac3776724 100644
--- a/packages/xscreensaver/xscreensaver_4.22.bb
+++ b/packages/xscreensaver/xscreensaver_4.22.bb
@@ -8,9 +8,12 @@ SECTION = "x11-misc"
 LICENSE = "BSD"
 DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade"
 
+PR = "r1"
+
 SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \
            file://fixes.patch;patch=1 \
            file://configure.in.patch;patch=1 \
+	   file://configure.in-includedir.patch;patch=1 \
            file://XScreenSaver"
 
 # xscreensaver-demo is a glade app
@@ -35,6 +38,8 @@ FILES_xscreensaver-extra="${bindir}/xscreensaver-getimage*"
 
 do_configure_prepend() {
 	sed -i 's:GTK_DATADIR="$GTK_DATADIR/share":GTK_DATADIR="${datadir}":' ${S}/configure.in
+	
+	export includedir="/lib"
 }
 
 do_compile() {
diff --git a/packages/xserver-common/files/unbreak-simpad.patch b/packages/xserver-common/files/unbreak-simpad.patch
new file mode 100644
index 0000000000..7f557c317d
--- /dev/null
+++ b/packages/xserver-common/files/unbreak-simpad.patch
@@ -0,0 +1,18 @@
+--- xserver-common-1.18/X11/Xinit.d/12keymap.org	2007-08-24 14:14:31.000000000 +0300
++++ xserver-common-1.18/X11/Xinit.d/12keymap	2007-12-22 15:06:52.000000000 +0200
+@@ -15,14 +15,11 @@
+         "Sharp-Collie")
+                 xmodmap - < /etc/X11/collie.xmodmap
+                 ;;
+-	"Simpad")
+-		xmodmap - < /etc/X11/simpad.xmodmap
+-		;;
+ 	"HP iPAQ h6300")
+ 		xmodmap - < /etc/X11/h6300.xmodmap
+ 		;;
+ 	# All the rest of keyboardless PDA machines use common buttonmap
+-	"HP iPAQ"* | "Asus MyPal"*)
++	"Simpad" | "HP iPAQ"* | "Asus MyPal"*)
+ 		xmodmap - < /etc/X11/keyboardless.xmodmap
+ 		;;
+ esac
diff --git a/packages/xserver-common/xserver-common_1.18.bb b/packages/xserver-common/xserver-common_1.18.bb
index a30a37c893..bf7b049939 100644
--- a/packages/xserver-common/xserver-common_1.18.bb
+++ b/packages/xserver-common/xserver-common_1.18.bb
@@ -2,14 +2,14 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r0"
+PR = "r1"
 
 PACKAGE_ARCH = "all"
 
 # we are using a gpe-style Makefile
 inherit gpe
 
-SRC_URI_append = " file://setDPI.sh "
+SRC_URI_append = " file://unbreak-simpad.patch;patch=1 file://setDPI.sh "
 
 do_install_append() {
 	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
diff --git a/packages/zaurus-updater/zaurus-updater.bb b/packages/zaurus-updater/zaurus-updater.bb
index f98ece35d7..fb4d6e2584 100644
--- a/packages/zaurus-updater/zaurus-updater.bb
+++ b/packages/zaurus-updater/zaurus-updater.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Encrypted shellscript for the Zaurus ROM update"
 DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
-PR = "r18"
+PR = "r19"
 
 PACKAGES = ""
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -11,6 +11,10 @@ SRC_URI = "file://updater.sh \
            file://gnu-tar.gz"
 S = "${WORKDIR}"
 
+do_configure() {
+	sed -i "s/ZAURUS_UPDATER_VERSION/${PR}/" "${S}/updater.sh"
+}
+
 do_compile() {
 	encdec-updater -e updater.sh
 }
diff --git a/packages/zaurus-updater/zaurus-updater/updater.sh b/packages/zaurus-updater/zaurus-updater/updater.sh
index 2efa946f6c..ed558be941 100644
--- a/packages/zaurus-updater/zaurus-updater/updater.sh
+++ b/packages/zaurus-updater/zaurus-updater/updater.sh
@@ -34,6 +34,11 @@
 # - Reformatted file - please use spaces not tabs
 # - "version check" is only on Tosa and Poodle - breaks other machines
 #
+# 2007.12.23 Matthias 'CoreDump' Hentges
+# - Fix kernel install on spitz machines
+# - Unify format of do_flashing()...
+# - Display ${PR} of zaurus-updater.bb to the user
+# - Polish HDD installer messages
 
 DATAPATH=$1
 TMPPATH=/tmp/update
@@ -120,16 +125,19 @@ check_for_tar()
 do_rootfs_extraction()
 {
     UNPACKED_ROOTFS=1
-    echo 'HDD root file system'
+    echo 'Installing HDD root file system'
     if [ ! -f /hdd1/NotAvailable ]; then
         umount /hdd1
     fi
-    echo 'Now formatting...'
+    echo -n '* Now formatting...'
     mke2fs $MKE2FSOPT /dev/${IDE1}1 > /dev/null 2>&1
     e2fsck -p /dev/${IDE1}1 > /dev/null
     if [ "$?" != "0" ]; then
+    	echo "FAILED"
         echo "Error: Unable to create filesystem on microdrive!"
         exit "$?"
+    else 
+    	echo "Done"
     fi
 
     mount -t $LINUXFMT -o noatime /dev/${IDE1}1 /hdd1
@@ -139,14 +147,17 @@ do_rootfs_extraction()
     fi
 
     cd /hdd1
-    echo 'Now extracting...'
+    echo -n '* Now extracting (this can take over 5m)...'
     gzip -dc $DATAPATH/$TARGETFILE | $TARBIN xf -
     if [ "$?" != "0" ]; then
+    	echo "FAILED"
         echo "Error: Unable to extract root filesystem archive!"
         exit "$?"
+    else
+    	echo "Done"
     fi
 
-    echo 'Done.'
+    echo 'HDD Installation Finished.'
 
     # remount as RO
     cd /
@@ -156,60 +167,67 @@ do_rootfs_extraction()
 
 do_flashing()
 {
-    if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ]
-    then
-        echo "Error: File is too big to flash!"
-        echo "$FLASH_TYPE: [$DATASIZE] > [`printf "%d" ${MTD_PART_SIZE}`]"
-        return
-    fi
-
-    if [ "$ZAURUS" = "tosa" ] || [ "$ZAURUS" = "poodle" ]
-    then
-        #check version
-        /sbin/bcut -s 6 -o $TMPDATA $TMPHEAD
-        if [ `cat $TMPDATA` != "SHARP!" ] > /dev/null 2>&1
-        then
-            #no version info...
-            rm -f $TMPHEAD > /dev/null 2>&1
-            DATAPOS=0
-        fi
-    fi
-
-    if [ $ISFORMATTED = 0 ]
-    then
-        /sbin/eraseall $TARGET_MTD > /dev/null 2>&1
-        ISFORMATTED=1
-    fi
-
-    echo ''
-    echo '0%                   100%'
-    PROGSTEP=`expr $DATASIZE / $ONESIZE + 1`
-    PROGSTEP=`expr 25 / $PROGSTEP`
-    if [ $PROGSTEP = 0 ]
-    then
-        PROGSTEP=1
-    fi
-
-    if [ -e $TMPHEAD ]
-    then
-        VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp'
-        MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp'
-        /sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
-        /sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
-
-        /sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
-        /sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
-    fi
-
-        # Looks like Akita is quite unique when it comes to kernel flashing
+	if [ $DATASIZE -gt `printf "%d" $MTD_PART_SIZE` ]
+	then
+		echo "Error: File is too big to flash!"
+		echo "$FLASH_TYPE: [$DATASIZE] > [`printf "%d" ${MTD_PART_SIZE}`]"
+		return
+	fi
+
+	if [ "$ZAURUS" = "tosa" ] || [ "$ZAURUS" = "poodle" ]
+	then
+		#check version
+		/sbin/bcut -s 6 -o $TMPDATA $TMPHEAD
+		
+		if [ `cat $TMPDATA` != "SHARP!" ] > /dev/null 2>&1
+		then
+		    #no version info...
+		    rm -f $TMPHEAD > /dev/null 2>&1
+		    DATAPOS=0
+		fi
+	fi
+
+	if [ $ISFORMATTED = 0 ]
+	then
+		/sbin/eraseall $TARGET_MTD > /dev/null 2>&1
+		ISFORMATTED=1
+	fi
+
+	if [ -e $TMPHEAD ]
+	then
+		VTMPNAME=$TMPPATH'/vtmp'`date '+%s'`'.tmp'
+		MTMPNAME=$TMPPATH'/mtmp'`date '+%s'`'.tmp'
+		/sbin/nandlogical $LOGOCAL_MTD READ $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
+		/sbin/nandlogical $LOGOCAL_MTD READ $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
+
+		/sbin/verchg -v $VTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
+		/sbin/verchg -m $MTMPNAME $TMPHEAD $MODULEID $MTD_PART_SIZE > /dev/null 2>&1
+	fi
+
+        # Looks like Akita and Spitz are unique when it comes to kernel flashing
         
-        if [ "$ZAURUS" = "akita" ] && [ $FLASH_TYPE = kernel ]; then 
-                echo $TARGETFILE':'$DATASIZE'bytes'
-                echo '                ' > /tmp/data
-                /sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1
-                /sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1
-                /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1     
-        else
+       	if [ "$ZAURUS" = "akita" -o "$ZAURUS" = "c3x00" ] && [ "$FLASH_TYPE" = "kernel" ]
+	then 
+#               	echo $TARGETFILE':'$DATASIZE'bytes'
+		echo ""
+		echo -n "Installing SL-Cxx00 kernel..."
+               	echo '                ' > /tmp/data
+               	 test "$ZAURUS" = "akita" && /sbin/nandlogical $LOGOCAL_MTD WRITE 0x60100 16 /tmp/data > /dev/null 2>&1
+               	/sbin/nandlogical $LOGOCAL_MTD WRITE 0xe0000 $DATASIZE $TARGETFILE > /dev/null 2>&1
+               	 test "$ZAURUS" = "akita" && /sbin/nandlogical $LOGOCAL_MTD WRITE 0x21bff0 16 /tmp/data > /dev/null 2>&1     
+		 echo "Done"
+	else	
+	
+		echo ''
+		echo '0%                   100%'
+		PROGSTEP=`expr $DATASIZE / $ONESIZE + 1`
+		PROGSTEP=`expr 25 / $PROGSTEP`
+		
+		if [ $PROGSTEP = 0 ]
+		then
+			PROGSTEP=1
+		fi	
+			
                 #loop
                 while [ $DATAPOS -lt $DATASIZE ]
                 do
@@ -246,27 +264,29 @@ do_flashing()
                         done
                 done
         fi
-    echo ''
-
-    #finish
-    rm -f $TMPPATH/*.bin > /dev/null 2>&1
-
-    if [ $RESULT = 0 ]
-    then
-        if [ -e $VTMPNAME ]
-        then
-            /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
-            rm -f $VTMPNAME > /dev/null 2>&1
-        fi
-        if [ -e $MTMPNAME ]
-        then
-            /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
-            rm -f $MTMPNAME > /dev/null 2>&1
-        fi
-        echo 'Done.'
-    else
-        echo 'Error!'
-    fi
+	echo ''
+
+	#finish
+	rm -f $TMPPATH/*.bin > /dev/null 2>&1
+
+	if [ $RESULT = 0 ]
+	then
+		if [ -e $VTMPNAME ]
+		then
+		    /sbin/nandlogical $LOGOCAL_MTD WRITE $VERBLOCK 0x4000 $VTMPNAME > /dev/null 2>&1
+		    rm -f $VTMPNAME > /dev/null 2>&1
+		fi
+
+		if [ -e $MTMPNAME ]
+		then
+		    /sbin/nandlogical $LOGOCAL_MTD WRITE $MVRBLOCK 0x4000 $MTMPNAME > /dev/null 2>&1
+		    rm -f $MTMPNAME > /dev/null 2>&1
+		fi
+	
+		[ "$FLASH_TYPE" != "kernel" ] && echo 'Done.'
+	else
+		echo 'Error!'
+	fi
 }
 
 ### Check model ###
@@ -300,6 +320,8 @@ case "$MODEL" in
         ;;
 esac
 
+clear
+echo "---- Universal Zaurus Updater ZAURUS_UPDATER_VERSION ----"
 echo 'MODEL: '$MODEL' ('$ZAURUS')'
 
 mkdir -p $TMPPATH > /dev/null 2>&1
diff --git a/packages/zaurusd/files/zaurus-hinge.bl-off b/packages/zaurusd/files/zaurus-hinge.bl-off
index ec3cefb2ca..ba6746ce1b 100644
--- a/packages/zaurusd/files/zaurus-hinge.bl-off
+++ b/packages/zaurusd/files/zaurus-hinge.bl-off
@@ -6,13 +6,14 @@
 # Filename: zaurus-hinge.bl-off
 # Date: 04-Jun-06
 
-#test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin"
-#${ZD_BINDIR}/bl off
-
-
-STEP=5
 DRIVER="`ls /sys/class/backlight/|head -n 1`"
 BRIGHTNESS_FILE="/sys/class/backlight/$DRIVER/brightness"
 
-cat "$BRIGHTNESS_FILE" > /var/run/display_brightness.tmp
-echo 0 > "$BRIGHTNESS_FILE"
+if mkdir /var/run/display_brightness.lock
+then
+	cat "$BRIGHTNESS_FILE" > /var/run/display_brightness.tmp
+	echo 0 > "$BRIGHTNESS_FILE"
+	rm -rf /var/run/display_brightness.lock
+else
+	echo "BRIGHTNESS IS LOCKED"
+fi
diff --git a/packages/zaurusd/files/zaurus-hinge.bl-on b/packages/zaurusd/files/zaurus-hinge.bl-on
index 61598155f2..58227e8c5a 100644
--- a/packages/zaurusd/files/zaurus-hinge.bl-on
+++ b/packages/zaurusd/files/zaurus-hinge.bl-on
@@ -7,24 +7,39 @@
 # Date: 04-Jun-06
 
 test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin"
-${ZD_BINDIR}/bl on
+test -x ${ZD_BINDIR}/bl && ${ZD_BINDIR}/bl on
 
-# If the backlight does not come back on after a suspend, the driver is 
-# still "on" (hence "bl on" does nothing) with a brightness of "0"
 
-( if test "`bl | awk '{print $2}'`" = "0"
-then
-	x=0
-	while test "$x" != 4
-	do
-		bl 10
-		usleep 10
-		bl 50
-		usleep 10
-		
-		let x=$x+1
-	done
+BL="fakeBl"
+
+fakeBl() {
+
+	
+	case "$1" in
+	on)	test -n "$2" && echo "$2" > "$BL_DRIVER" ;;
+	"")	echo "on `cat "$BL_DRIVER"`";;	
+	*)	echo "$1" > "$BL_DRIVER" ;;
+	esac
 	
+}
+
+for dir in `ls -1 /sys/class/backlight/`
+do
+	if test -e /sys/class/backlight/$dir/brightness
+	then
+		echo "Using [$dir] backlight driver"
+		BL_DRIVER="/sys/class/backlight/$dir/brightness"
+		break
+	fi
+done
+
+
+echo "### `$BL` ###"
+( if test "`$BL | awk '{print $2}'`" = "0"
+then
+
+	$BL 20
+
 	if mkdir /var/run/display_brightness.lock
 	then
 		if test -e /var/run/display_brightness.tmp
@@ -34,12 +49,8 @@ then
 
 			if test "$OLD_VALUE" -gt 1
 			then
-				STEP=5
-				DRIVER="`ls /sys/class/backlight/|head -n 1`"
-				BRIGHTNESS_FILE="/sys/class/backlight/$DRIVER/brightness"
-
 				echo "SETTING $OLD_VALUE!"
-				echo "$OLD_VALUE" > "$BRIGHTNESS_FILE"
+				$BL "$OLD_VALUE"
 				rm /var/run/display_brightness.tmp
 				echo "FINISH!"
 			fi
diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb
index 8bc0b2ba58..8801974fc9 100644
--- a/packages/zaurusd/zaurusd_svn.bb
+++ b/packages/zaurusd/zaurusd_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "tslib"
 RDEPENDS = "procps"
 PV = "0.0+svn${SRCDATE}"
-PR = "r14"
+PR = "r15"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
            file://zaurus-hinge.in \
author	Michael Lauer <mickey@vanille-media.de>	2007-12-25 13:46:47 +0000
committer	Michael Lauer <mickey@vanille-media.de>	2007-12-25 13:46:47 +0000
commit	58d08348e701f6efb483546e39e029f3cb8df429 (patch)
tree	497d2d05fe75c3303145da0c487f508aa917ee26 /packages
parent	28923e28feb20034efc37bb64132ed07679cc272 (diff)
parent	d7f9aa1735c0b9d589c11638cdf60d56267d431e (diff)