merge of d23a51fd3de55ab7bd14228f1701651fb28530e6

     and e399d3faf8861b253531bf4ec2dbec4e5ea1af2b

29 files changed, 183 insertions, 106 deletions

diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb
index 7b62414d1c..3bda946415 100644
--- a/packages/altboot/altboot_0.0.0.bb
+++ b/packages/altboot/altboot_0.0.0.bb
@@ -13,7 +13,6 @@ RRECOMMENDS_append_c7x0 = " kexec-tools"
 
 PR = "r41"
 
-
 SRC_URI = "file://altboot-menu \
 	   file://altboot.rc \
 	   file://altboot.func \	 
diff --git a/packages/altboot/altboot_1.0.7-rc1.bb b/packages/altboot/altboot_1.0.7-rc2.bb
index 5f76d1b516..18ba022a71 100644
--- a/packages/altboot/altboot_1.0.7-rc1.bb
+++ b/packages/altboot/altboot_1.0.7-rc2.bb
@@ -19,7 +19,7 @@ RRECOMMENDS_append_c7x0 = " kexec-tools"
 
 ######################################################################################
 
-PR = "r1"
+PR = "r0"
 
 ######################################################################################
 
diff --git a/packages/altboot/files/akita/altboot-2.6.cfg b/packages/altboot/files/akita/altboot-2.6.cfg
index 2254a35552..c763f8b953 100644
--- a/packages/altboot/files/akita/altboot-2.6.cfg
+++ b/packages/altboot/files/akita/altboot-2.6.cfg
@@ -14,8 +14,8 @@ ENABLE_IMAGECONF="yes"
 SD_DEVICE="/dev/mmcblk0p1"
 SD_KERNEL_MODULE=""
 
-USB_HOST_AVAILABLE="no"
-USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage"
+USB_HOST_AVAILABLE="yes"
+USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod"
 USB_STORAGE_PARTITION="/dev/sda1"
 USB_STORAGE_WAIT="4"
 
diff --git a/packages/altboot/files/altboot-menu/15-bootSD b/packages/altboot/files/altboot-menu/15-bootSD
index 7123491000..0476a5ce0f 100644
--- a/packages/altboot/files/altboot-menu/15-bootSD
+++ b/packages/altboot/files/altboot-menu/15-bootSD
@@ -7,11 +7,6 @@
 
 M_TITLE="Boot SD card"
 
-die() {
-	echo "ERROR: $1" >/dev/tty0
-	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-}
-
 # This function is activated by init.altboot by calling this script with the "run" option
 run_module() {
 	
diff --git a/packages/altboot/files/altboot-menu/20-bootCF b/packages/altboot/files/altboot-menu/20-bootCF
index 3a3f4fbafe..36d6b8245f 100644
--- a/packages/altboot/files/altboot-menu/20-bootCF
+++ b/packages/altboot/files/altboot-menu/20-bootCF
@@ -7,11 +7,6 @@
 
 M_TITLE="Boot CF card"
 
-die() {
-	echo "ERROR: $1" >/dev/tty0
-	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-}
-
 # This function is activated by init.altboot by calling this script with the "run" option
 run_module() {
 	
diff --git a/packages/altboot/files/altboot-menu/99-ownScripts-example b/packages/altboot/files/altboot-menu/99-ownScripts-example
index b1b444f2d1..7566416b87 100644
--- a/packages/altboot/files/altboot-menu/99-ownScripts-example
+++ b/packages/altboot/files/altboot-menu/99-ownScripts-example
@@ -20,14 +20,6 @@ exit 0
 # The "title" parameter is implemented at the end of this script so it will never be reached
 # and the script will simply be ignored by altboot.
 
-
-# The die() function aborts the boot if something goes wrong and sets STDIN / STDERR / STDOUT
-# correctly.
-die() {
-	echo "ERROR: $1" >/dev/tty0
-	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-}
-
 # This function is activated by init.altboot by calling this script with the "run" option
 run_module() {
 
diff --git a/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick b/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick
index 3cf8c506b0..b573e7a10c 100644
--- a/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick
+++ b/packages/altboot/files/altboot-menu/Advanced/30-bootUSB-Stick
@@ -8,12 +8,7 @@
 M_TITLE="Boot USB Storage"
 
 test "$USB_HOST_AVAILABLE" = "yes" || exit 0
-
-die() {
-	echo "ERROR: $1" >/dev/tty0
-	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-}
-
+       
 # This function is activated by init.altboot by calling this script with the "run" option
 run_module() {
 	
diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
index 352b29ed07..9a36b8ed01 100644
--- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
+++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
@@ -9,11 +9,6 @@
 
 M_TITLE="Boot from NFS"
 
-die() {
-	echo -e "ERROR: $1" >/dev/tty0
-	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-}
-
 # This function is activated by init.altboot by calling this script with the "run" option
 run_module() {
 
@@ -24,9 +19,7 @@ run_module() {
 			
 	nfs_host="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'|sed -n "s/\(.*\)\:\(.*\)/\1/p" `"
 	nfs_mounts="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'`"
-	nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`"	
-	
-	WLAN_NIC="`iwconfig 2>/dev/null | grep ESSID | awk '{print $1}'`"
+	nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`"			
 		
 	start_networking "$nfs_host"	
 	
diff --git a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz
index 2ee92cd27e..cb8b2722d5 100644
--- a/packages/altboot/files/altboot-menu/Advanced/70-install-tgz
+++ b/packages/altboot/files/altboot-menu/Advanced/70-install-tgz
@@ -2,11 +2,6 @@
 
 M_TITLE="Install RootFS from tar.gz"
 
-# die() {
-# 	echo "ERROR: $1" >/dev/tty0
-# 	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-# }
-
 run_module(){
 	test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!"	
 	
diff --git a/packages/altboot/files/altboot-menu/Advanced/70-setKernel b/packages/altboot/files/altboot-menu/Advanced/70-setKernel
index a2c1efa81b..6192232a73 100644
--- a/packages/altboot/files/altboot-menu/Advanced/70-setKernel
+++ b/packages/altboot/files/altboot-menu/Advanced/70-setKernel
@@ -40,11 +40,13 @@ run_module() {
 			
 			get_pref "kexec_klist" "$junk" KEXEC_SELECTED_KERNEL && break
 
-		done
-		
-		echo "Using [$KEXEC_SELECTED_KERNEL]"
+		done		
+	else
+		KEXEC_SELECTED_KERNEL="`ls -1 $KEXEC_KERNEL_DIR/zImage* | grep -v "kexec.cfg" `"
 	fi
 	
+	echo -e "\nUsing [$KEXEC_SELECTED_KERNEL]"
+	
 	if ! test -e "$KEXEC_SELECTED_KERNEL.kexec.cfg" 
 	then
 		echo -e "\nWARNING: This kernel has not been configured."
diff --git a/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec b/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec
index 27b6a871a6..e294df683f 100644
--- a/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec
+++ b/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec
@@ -38,11 +38,13 @@ run_module() {
 			
 			get_pref "kexec_klist" "$junk" KEXEC_KERNEL && break
 
-		done
-		
-		echo "Using [$KEXEC_KERNEL]"
+		done				
+	else
+		KEXEC_KERNEL="`ls -1 $KEXEC_KERNEL_DIR/zImage* | grep -v "kexec.cfg" `"
 	fi
 	
+	echo -e "\nUsing [$KEXEC_KERNEL]"
+	
 	configure_rootdev
 	configure_roottype
 	configure_verbose
diff --git a/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs b/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs
index 13f98a0d41..af6bd38c1d 100644
--- a/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs
+++ b/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs
@@ -4,11 +4,6 @@ M_TITLE="Copy rootfs to SD/CF"
 # Unfinished script.
 exit 0
 
-die() {
-	echo "ERROR: $1" >/dev/tty0
-	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
-}
-
 ask_target() {
 	available_disks="`mount | grep "/media" | grep -v ram | awk '{print $3}'`"
 	
diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func
index 5b587c453a..13ee515d6a 100644
--- a/packages/altboot/files/altboot.func
+++ b/packages/altboot/files/altboot.func
@@ -1,4 +1,12 @@
 #! /bin/sh
+
+C_RED="\033[31m"
+C_YELLOW="\033[35m"
+C_BLUE="\033[34m"
+C_WHITE="\033[38m"
+C_RESET="\033[0m"
+
+
 # This function checks for the presence of a real filesystem and loop-images on the target
 # $1 = folder of rootfs, $2 = runlevel (defaults to 5)
 # $2 = name of calling module
@@ -231,7 +239,8 @@ do_pivot(){
 		boot_new_rootfs_splash		
 		echo "Calling INIT"
 			
-		exec /usr/sbin/chroot . /sbin/init $2 >/dev/tty0 2>&1
+		exec /usr/sbin/chroot . $REAL_INIT $2 >/dev/tty0 2>&1
+		#exec /usr/sbin/chroot . /sbin/init $2 >/dev/tty0 2>&1
 	else
 		echo "FAILED"
 		die "* * * pivot_root failed! * * *" 
@@ -281,7 +290,7 @@ image_conf(){
 		while true
 		do
 			echo -e "Wasting RAM is never a good idea.\nOnly say Y if your rootfs is very small in size"
-			echo -n "Do you want to store ipkg package data in RAM? [N|y] "
+			echo -en "Do you want to store ipkg package data\nin RAM? [N|y] "
 			read junk
 			
 			if test "$junk" = "" -o "$junk" = n -o "$junk" = N
@@ -301,7 +310,7 @@ image_conf(){
 	then						
 		while true
 		do
-			echo -n "Do you want to keep the SD, CF and /home ipkg install targets? [N|y] "
+			echo -en "Do you want to keep the SD, CF and /home\nipkg install targets? [N|y] "
 			read junk
 			
 			if test "$junk" = "" -o "$junk" = n -o "$junk" = N
@@ -557,7 +566,7 @@ show_menu() {
 }
 
 mdie() {
-	echo "ERROR: $1" >/dev/tty0
+	echo -e "${C_RED}ERROR:${C_RESET}${C_WHITE} $1${C_RESET}" >/dev/tty0
 	
 	echo -e "\nPress <ENTER> to return to the menu"
 	read junk
@@ -612,8 +621,14 @@ get_pref() {
 	test -n "$data_value" && return 0
 }
 
+debug_echo() {
+	test "$ENABLE_DEBUG" = "yes" && echo -e "${C_YELLOW}DEBUG:${C_RESET}${C_WHITE} $1 ${C_RESET}" >/dev/tty0 2>&1
+}
+
 start_networking() {
 
+	test -z "$1" && mdie "No remote host configured, check /etc/fstab for NFS hosts"
+	
 	if test "$USB_NETWORKING_AVAILABLE" = "yes"
 	then
 		echo ""
@@ -636,7 +651,7 @@ start_networking() {
 			junk="`cat /etc/.altboot-lanselect.last`"
 			test -z "$junk" && junk=1
 			
-			echo -n "Connection Type: $junk (autoboot)"
+			echo "Connection Type: $junk (autoboot)"
 		fi
 			
 		case "$junk" in
@@ -669,12 +684,16 @@ start_networking() {
 
 		if test -x /etc/init.d/pcmcia
 		then
+			echo -e "\nRunning cardctl to setup networking..."
 			/etc/init.d/pcmcia start >/dev/null 2>&1 || die "/etc/init.d/pcmcia start failed!"
+			sleep 1
 		else	
 			# With kernel 2.6.16+ udev is used 
-			ps ax| grep -v grep | grep -q udevd || /etc/init.d/udev start >/dev/null 2>&1 || die "/etc/init.d/udev start failed!"
+			echo -e "\nRunning udevd to setup networking..."
+			ps ax | grep -v grep | grep -q udevd || /etc/init.d/udev start >/dev/null 2>&1 || die "/etc/init.d/udev start failed!"
 
-			/etc/init.d/udev stop
+			# Stop udev to work around some very ugly (yet harmless) error messages on boot
+			/etc/init.d/udev stop >/dev/null 2>&1
 		fi
 	fi
 	
@@ -695,9 +714,19 @@ start_networking() {
 			
 		ifup "$USB_NW_DEVICE"
 	fi
+
+	WLAN_NIC="`iwconfig 2>/dev/null | grep ESSID | grep -v wifi | awk '{print $1}'`"
+
+	if test -z "$WLAN_NIC"
+	then
+		debug_echo "WARNING: WLAN_NIC is empty!\n" 
+		debug_echo "Filter result: [$WLAN_NIC]"
+		debug_echo "iwconfig: [`iwconfig`]"
+		mdie "No network interface found"
+	fi
 	
 	# WLAN with DHCP needs some time to get a lease, set up the routing, etc.	
-	echo -n "Waiting for Network."
+	echo -n "Waiting for host [$1] on [$WLAN_NIC]."
 	cnt=0
 	while true
 	do
diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index a987918760..3dc7c60240 100644
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -27,16 +27,31 @@ esac
 test -e "$ALTBOOT_CFG_FILE" && . "$ALTBOOT_CFG_FILE" || echo "WARNING: No $ALTBOOT_CFG_FILE found! Check your installation of Altboot!" > /dev/tty1
 
 C_RED="\033[31m"
+C_YELLOW="\033[33m"
 C_BLUE="\033[34m"
 C_WHITE="\033[37m"
 C_RESET="\033[0m"
 
 
 die() {
-	echo -e "ERROR: $1" >/dev/tty0
+	echo -e "${C_RED}ERROR: $1${C_RESET}" >/dev/tty0
 	exec $SH_SHELL </dev/tty0 >/dev/tty0 2>&1
 }
 
+debug_shell() {		
+	# VT 2 = Opie, VT 3 = GPE
+	test -z "$1" && VT=4 || VT=$1
+	
+	echo -e "\033c" > /dev/tty$VT
+
+	echo -en "\nPress <ENTER> to activate the debug shell." > /dev/tty$VT
+	read junk </dev/tty$VT
+		
+	echo "" > /dev/tty$VT	
+	/bin/sh  </dev/tty$VT >/dev/tty$VT 2>&1
+	
+	#openvt -lf -c$VT -- /bin/sh </dev/tty$VT >/dev/tty$VT 2>&1
+}
 
 # This function prints the boot-menu
 # $1: Directory containing the scripts for the menu-items
@@ -299,6 +314,13 @@ wait_for_input() {
 # Note: this is positively ugly. If someone knows a better way to detect wheter
 # we are already booted into a runlevel _without_ reading /var and / or using `runlevel`
 # PLEASE let me know.
+
+if ( echo "$VERSION" |  egrep -iq "(snapshot|-rc)" )
+then
+	ENABLE_DEBUG="yes"
+	debug_shell 4 >/dev/null 2>&1 &
+fi
+
 if test -f /proc/cmdline -a "`ps ax|wc -l|tr -d " "`" -gt 30 -a "$1" != "-force"
 then
 	echo "altboot: Using real init [$REAL_INIT] [$*] [`ps ax|wc -l|tr -d " "`] *" >/dev/tty1
diff --git a/packages/base-files/base-files/h2200/.mtn2git_empty b/packages/base-files/base-files/h2200/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/base-files/base-files/h2200/.mtn2git_empty
diff --git a/packages/base-files/base-files/h2200/fstab b/packages/base-files/base-files/h2200/fstab
new file mode 100644
index 0000000000..397da6c123
--- /dev/null
+++ b/packages/base-files/base-files/h2200/fstab
@@ -0,0 +1,6 @@
+/dev/mtdblock3	/		jffs2	defaults	1  1		
+proc            /proc		proc    defaults        0  0
+sys             /sys		sysfs	defaults        0  0
+tmpfs		/var		tmpfs	defaults	0  0
+/dev/hda1	/media/cf	auto	defaults,sync,noauto,noatime,exec,suid	0  0
+/dev/mmcblk0p1	/media/card	auto	defaults,sync,noauto,noatime,exec,suid	0  0
diff --git a/packages/busybox/busybox-1.01/slugos/sysctl.conf b/packages/busybox/busybox-1.01/slugos/sysctl.conf
index 20d573c124..cfaa3c7f92 100644
--- a/packages/busybox/busybox-1.01/slugos/sysctl.conf
+++ b/packages/busybox/busybox-1.01/slugos/sysctl.conf
@@ -29,4 +29,4 @@ net/ipv4/icmp_echo_ignore_broadcasts=0
 #net/ipv6/ip_forward=1
 
 # This sets the app to run on a hotplug event
-sys/kernel/hotplug=/sbin/udevsend
+kernel/hotplug=/sbin/udevsend
diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb
index cbef98d992..7df9d5ad02 100644
--- a/packages/busybox/busybox_1.01.bb
+++ b/packages/busybox/busybox_1.01.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://udhcppidfile.patch;patch=1 \
diff --git a/packages/gbluezconf/.mtn2git_empty b/packages/gbluezconf/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gbluezconf/.mtn2git_empty
diff --git a/packages/gbluezconf/gbluezconf_00.10.bb b/packages/gbluezconf/gbluezconf_00.10.bb
new file mode 100644
index 0000000000..2b0f210954
--- /dev/null
+++ b/packages/gbluezconf/gbluezconf_00.10.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "GTK panel applet to control bluetooth stuff"
+LICENSE = "GPLv2"
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+
+DEPENDS = "bluez-utils-dbus libglade dbus libnotify popt gtk+"
+SRC_URI = "http://www.cin.ufpe.br/~ckt/gbluezconf/${P}.tar.gz"
+
+inherit autotools pkgconfig
+
+
+
+
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
new file mode 100644
index 0000000000..6a373cbd4b
--- /dev/null
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.67.bb
@@ -0,0 +1,35 @@
+inherit gpe
+
+DESCRIPTION = "GPE session startup scripts"
+LICENSE = "GPL"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+RDEPENDS_${PN} = "matchbox matchbox-panel (>= 0.9.2-r12) matchbox-desktop (>= 0.9.1-r1) matchbox-common (>= 0.9.1-r2) gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo xserver-common"
+# more rdepends: keylaunch ipaq-sleep apmd blueprobe
+DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo xserver-common"
+
+SRC_URI += "file://matchbox-session \
+	file://disable-composite.xsettings"
+
+#apply a patch to set the fontsize for bigdpi (200+) devices to 5
+SRC_URI_append_ipaq-pxa270 = " file://highdpifontfix.patch;patch=1"
+SRC_URI_append_spitz = " file://highdpifontfix.patch;patch=1"
+SRC_URI_append_akita = " file://highdpifontfix.patch;patch=1"
+SRC_URI_append_c7x0 = " file://highdpifontfix.patch;patch=1"
+SRC_URI_append_nokia770 = " file://highdpifontfix.patch;patch=1"
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
+	if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
+		echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar
+	fi
+	install -d ${D}${sysconfdir}/matchbox
+	install ${WORKDIR}/matchbox-session ${D}${sysconfdir}/matchbox/session
+
+	install -d ${D}${sysconfdir}/gpe/xsettings-default.d
+	install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite
+}
+
+# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/linux/ixp4xx-kernel/2.6.16/96-nas100d-leds.patch b/packages/linux/ixp4xx-kernel/2.6.16/96-nas100d-leds.patch
index ceb4b8b2f8..60b6bbd4c9 100644
--- a/packages/linux/ixp4xx-kernel/2.6.16/96-nas100d-leds.patch
+++ b/packages/linux/ixp4xx-kernel/2.6.16/96-nas100d-leds.patch
@@ -6,17 +6,17 @@ Signed-off-by: John Bowler <jbowler@acm.org>
  arch/arm/mach-ixp4xx/nas100d-setup.c |   43 ++++++++++++++++++++++++++++++++++-
  1 file changed, 42 insertions(+), 1 deletion(-)
 
---- linux-ixp4xx.orig/arch/arm/mach-ixp4xx/nas100d-setup.c	2006-02-21 01:40:40.000000000 +0100
-+++ linux-ixp4xx/arch/arm/mach-ixp4xx/nas100d-setup.c	2006-02-21 01:53:48.000000000 +0100
-@@ -16,6 +16,7 @@
- #include <linux/serial.h>
- #include <linux/serial_8250.h>
+--- linux-ixp4xx.orig/arch/arm/mach-ixp4xx/nas100d-setup.c	2006-03-27 13:45:22.000000000 +0200
++++ linux-ixp4xx/arch/arm/mach-ixp4xx/nas100d-setup.c	2006-03-27 13:46:00.000000000 +0200
+@@ -18,6 +18,7 @@
  #include <linux/mtd/mtd.h>
+ #include <linux/netdevice.h>
+ #include <linux/etherdevice.h>
 +#include <linux/leds.h>
  
- #include <asm/setup.h>
- #include <asm/memory.h>
-@@ -42,6 +43,36 @@ static struct platform_device nas100d_fl
+ #include <asm/mach-types.h>
+ #include <asm/mach/arch.h>
+@@ -41,6 +42,36 @@ static struct platform_device nas100d_fl
  	.resource		= &nas100d_flash_resource,
  };
  
@@ -35,7 +35,7 @@ Signed-off-by: John Bowler <jbowler@acm.org>
 +		.flags		= IXP4XX_GPIO_LOW,
 +	},
 +	{
-+		.name		= "disk-1", /* yellow led */
++		.name		= "disk",   /* yellow led */
 +		.start		= 3,
 +		.end		= 3,
 +		.flags		= IXP4XX_GPIO_LOW,
@@ -53,7 +53,7 @@ Signed-off-by: John Bowler <jbowler@acm.org>
  static struct ixp4xx_i2c_pins nas100d_i2c_gpio_pins = {
  	.sda_pin		= NAS100D_SDA_PIN,
  	.scl_pin		= NAS100D_SCL_PIN,
-@@ -100,7 +131,6 @@ static struct platform_device nas100d_ua
+@@ -99,7 +130,6 @@ static struct platform_device nas100d_ua
  static struct platform_device *nas100d_devices[] __initdata = {
  	&nas100d_i2c_controller,
  	&nas100d_flash,
@@ -61,7 +61,7 @@ Signed-off-by: John Bowler <jbowler@acm.org>
  };
  
  static void nas100d_power_off(void)
-@@ -160,7 +190,18 @@ static void __init nas100d_init(void)
+@@ -187,7 +217,18 @@ static void __init nas100d_init(void)
  
  	pm_power_off = nas100d_power_off;
  
diff --git a/packages/linux/ixp4xx-kernel/2.6.16/defconfig b/packages/linux/ixp4xx-kernel/2.6.16/defconfig
index 8548ed54b0..1b190e290d 100644
--- a/packages/linux/ixp4xx-kernel/2.6.16/defconfig
+++ b/packages/linux/ixp4xx-kernel/2.6.16/defconfig
@@ -593,13 +593,13 @@ CONFIG_ATA_OVER_ETH=m
 # SCSI device support
 #
 # CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=m
+CONFIG_SCSI=y
 CONFIG_SCSI_PROC_FS=y
 
 #
 # SCSI support type (disk, tape, CD-ROM)
 #
-CONFIG_BLK_DEV_SD=m
+CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=m
 # CONFIG_CHR_DEV_OSST is not set
 CONFIG_BLK_DEV_SR=m
@@ -637,7 +637,7 @@ CONFIG_ISCSI_TCP=m
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_SAS is not set
-CONFIG_SCSI_SATA=m
+CONFIG_SCSI_SATA=y
 # CONFIG_SCSI_SATA_AHCI is not set
 # CONFIG_SCSI_SATA_SVW is not set
 # CONFIG_SCSI_ATA_PIIX is not set
@@ -655,7 +655,7 @@ CONFIG_SCSI_SATA=m
 # CONFIG_SCSI_SATA_VITESSE is not set
 # CONFIG_SCSI_PATA_ALI is not set
 # CONFIG_SCSI_PATA_AMD is not set
-CONFIG_SCSI_PATA_ARTOP=m
+CONFIG_SCSI_PATA_ARTOP=y
 # CONFIG_SCSI_PATA_ATIIXP is not set
 # CONFIG_SCSI_PATA_CMD64X is not set
 # CONFIG_SCSI_PATA_CS5520 is not set
@@ -686,7 +686,7 @@ CONFIG_SCSI_PATA_ARTOP=m
 # CONFIG_SCSI_PATA_TRIFLEX is not set
 # CONFIG_SCSI_PATA_VIA is not set
 # CONFIG_SCSI_PATA_WINBOND is not set
-CONFIG_SCSI_PATA_IXP4XX=m
+CONFIG_SCSI_PATA_IXP4XX=y
 # CONFIG_SCSI_DMX3191D is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 # CONFIG_SCSI_IPS is not set
@@ -1024,7 +1024,6 @@ CONFIG_I2C_IXP4XX=y
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
-# CONFIG_SCx200_ACB is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
 # CONFIG_I2C_SIS96X is not set
@@ -1100,6 +1099,7 @@ CONFIG_HWMON=m
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT8231 is not set
@@ -1302,14 +1302,14 @@ CONFIG_USB_DEVICEFS=y
 #
 # USB Host Controller Drivers
 #
-CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_SPLIT_ISO=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 # CONFIG_USB_ISP116X_HCD is not set
-CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OHCI_BIG_ENDIAN is not set
 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_SL811_HCD is not set
 
 #
@@ -1326,7 +1326,7 @@ CONFIG_USB_PRINTER=m
 #
 # may also be needed; see USB_STORAGE Help for more information
 #
-CONFIG_USB_STORAGE=m
+CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
 # CONFIG_USB_STORAGE_FREECOM is not set
@@ -1484,6 +1484,7 @@ CONFIG_USB_EZUSB=y
 #
 # Real Time Clock
 #
+CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
diff --git a/packages/linux/ixp4xx-kernel_2.6.16.bb b/packages/linux/ixp4xx-kernel_2.6.16.bb
index ba9a2522f7..7d48711d8b 100644
--- a/packages/linux/ixp4xx-kernel_2.6.16.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.16.bb
@@ -3,12 +3,12 @@
 # Increment PR_CONFIG for changes to the ixp4xx-kernel specific
 # defconfig (do *NOT* increment anything in here for changes
 # to other kernel configs!)
-PR_CONFIG = "1"
+PR_CONFIG = "2"
 #
 # Increment the number below (i.e. the digits after PR) when
 # making changes within this file or for changes to the patches
 # applied to the kernel.
-PR = "r1.${PR_CONFIG}"
+PR = "r2.${PR_CONFIG}"
 
 include ixp4xx-kernel.inc
 
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 217aefb976..92013b8344 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -30,7 +30,6 @@ SLUGOS_PACKAGES = "\
 	binutils \
 	bison \
 	bluez-utils-nodbus \
-	bogofilter \
 	boost \
 	bridge-utils \
 	bwmon \
@@ -114,7 +113,7 @@ SLUGOS_PACKAGES = "\
 	netpbm \
 	nmap \
 	ntp \
-	obexftp openobex-apps ircp \
+	openobex-apps ircp \
 	openldap \
 	openntpd \
 	openssh \
@@ -165,7 +164,7 @@ SLUGOS_PACKAGES = "\
 SLUGOS_BROKEN_PACKAGES = "\
 	icecast \
 	irssi \
-	openobex \
+	obexftp openobex \
 	pvrusb2-mci \
 	setpwc \
 	watchdog \
@@ -187,6 +186,7 @@ UCLIBC_UNSUPPORTABLE_PACKAGES = "\
 # These packages work with glibc, but break on uclibc.
 UCLIBC_BROKEN_PACKAGES = "\
 	alsa-utils \
+	bogofilter \
 	"
 
 # Packages which build only with glibc (some of these use internal
diff --git a/packages/slugos-init/files/leds b/packages/slugos-init/files/leds
index 433467b96f..f5011f8bad 100644
--- a/packages/slugos-init/files/leds
+++ b/packages/slugos-init/files/leds
@@ -50,18 +50,20 @@ led_set(){
 				echo -n timer
 
 				case "$setting" in
-				flash)	echo -n 0.6;;
-				blink)	echo -n 0.6;;
-				slow)	echo -n 1;;
-				fast)	echo -n 3;;
-				panic)	echo -n 6;;
-				esac >"$1/frequency"
+				flash)	echo -n 60;;
+				blink)	echo -n 540;;
+				slow)	echo -n 500;;
+				fast)	echo -n 1500;;
+				panic)	echo -n 3000;;
+				esac >"$1/delay_on"
 
 				case "$setting" in
-				flash)	echo -n 10;;
-				blink)	echo -n 90;;
-				*)	echo -n 50;;
-				esac >"$1/duty";;
+				flash)	echo -n 540;;
+				blink)	echo -n 60;;
+				slow)	echo -n 500;;
+				fast)	echo -n 1500;;
+				panic)	echo -n 3000;;
+				esac >"$1/delay_off";;
 
 		cpu-idle)	echo -n cpu
 				# these settings work well on NSLU2
diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup
index b365a49dda..0a51e1abf7 100644
--- a/packages/slugos-init/files/turnup
+++ b/packages/slugos-init/files/turnup
@@ -84,7 +84,10 @@ get_flash() {
 		return 1
 	}
 
-	ffsdev="$(mtblockdev Flashdisk)"
+	case "$(machine)" in
+	nas100d)	ffsdev="$(mtblockdev filesystem)";;
+	*)		ffsdev="$(mtblockdev Flashdisk)";;
+	esac
 	umountflash "$ffsdev" &&
 	mountflash "$ffsdev" "$ffsdir" "$@"
 }
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index 971f6cf288..182d204b15 100644
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r58"
+PR = "r59"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \
diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index d15afdfa23..e33e9e8728 100644
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 LICENSE = "GPL"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-PR = "r22"
+PR = "r23"
 
 # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.
@@ -17,6 +17,7 @@ FILES_${PN}-inittab = "${sysconfdir}/inittab"
 CONFFILES_${PN}-inittab = "${sysconfdir}/inittab"
 
 USE_VT ?= "1"
+SYSVINIT_ENABLED_GETTYS ?= "1"
 
 SRC_URI = "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-2.85.tar.gz \
 	   file://sysvinit-2.86.patch;patch=1 \
@@ -72,11 +73,14 @@ do_install () {
 # Format:
 #  <id>:<runlevels>:<action>:<process>
 #
-1:2345:respawn:${base_sbindir}/getty 38400 tty1
-# 2:23:respawn:${base_sbindir}/getty 38400 tty2
-# 3:23:respawn:${base_sbindir}/getty 38400 tty3
-# 4:23:respawn:${base_sbindir}/getty 38400 tty4
+
 EOF
+
+		for n in ${SYSVINIT_ENABLED_GETTYS}
+		do
+			echo "$n:2345:respawn:${base_sbindir}/getty 38400 tty$n" >> ${D}${sysconfdir}/inittab
+		done
+		echo "" >> ${D}${sysconfdir}/inittab
 	fi
 	install -m 0644    ${WORKDIR}/rcS-default	${D}${sysconfdir}/default/rcS
 	install -m 0755    ${WORKDIR}/rc		${D}${sysconfdir}/init.d