merge of 19c9c34826590fe580ab36a128422e4fb4c3f6b8

     and f0b12dffc2020212cecbe63130285d68a1897b93

20 files changed, 132 insertions, 23 deletions

diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index c5c9f6868c..1063356217 100644
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -87,6 +87,15 @@ kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
 
+DEBIANSLUG_STANDARD_RDEPENDS += "\
+kernel-module-ehci-hcd \
+kernel-module-ohci-hcd \
+kernel-module-uhci-hcd \
+kernel-module-sd-mod \
+kernel-module-usb-storage \
+kernel-module-scsi-mod \
+"
+
 # This documents other file systems which are built but not installed
 # by default in the flash image.
 #
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 304cd6dcfa..09f3691b65 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -87,6 +87,15 @@ kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
 
+OPENSLUG_STANDARD_RDEPENDS += "\
+kernel-module-ehci-hcd \
+kernel-module-ohci-hcd \
+kernel-module-uhci-hcd \
+kernel-module-sd-mod \
+kernel-module-usb-storage \
+kernel-module-scsi-mod \
+"
+
 # This documents other file systems which are built but not installed
 # by default in the flash image.
 #
diff --git a/conf/distro/slugos-packages.conf b/conf/distro/slugos-packages.conf
index 0278789f0b..1e578c48ba 100644
--- a/conf/distro/slugos-packages.conf
+++ b/conf/distro/slugos-packages.conf
@@ -168,7 +168,6 @@ ${PKGDIR}/packages/obexftp/*.bb \
 ${PKGDIR}/packages/openjade/*.bb \
 ${PKGDIR}/packages/openldap/*.bb \
 ${PKGDIR}/packages/openntpd/*.bb \
-${PKGDIR}/packages/openobex-apps/*.bb \
 ${PKGDIR}/packages/openobex/*.bb \
 ${PKGDIR}/packages/opensp/*.bb \
 ${PKGDIR}/packages/openssh/*.bb \
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index 24ef6e6c33..bb6c6efa6a 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -19,6 +19,16 @@ UCSLUGC_EXTRA_BBFILES ?= ""
 # prefix UCSLUGC_ are used here to default the values of the corresponding NSLU2_
 # setting - either may be set in local.conf to override these values.
 UCSLUGC_EXTRA_RDEPENDS ?= ""
+
+UCSLUGC_STANDARD_RDEPENDS += "\
+kernel-module-ehci-hcd \
+kernel-module-ohci-hcd \
+kernel-module-uhci-hcd \
+kernel-module-sd-mod \
+kernel-module-usb-storage \
+kernel-module-scsi-mod \
+"
+
 #
 SLUGOS_EXTRA_RDEPENDS ?= "${UCSLUGC_EXTRA_RDEPENDS}"
 
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb
index 7d56cbd3a6..020546dd64 100644
--- a/packages/altboot/altboot_0.0.0.bb
+++ b/packages/altboot/altboot_0.0.0.bb
@@ -6,7 +6,7 @@ MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
 IGNORE_STRIP_ERRORS = "1"
 
-PR = "r26"
+PR = "r28"
 
 
 SRC_URI = "file://altboot-menu \
diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
index 3a41fccf79..baa426218b 100644
--- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
+++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
@@ -91,7 +91,20 @@ run_module() {
 		do
 			stty echo
 			echo -n "Boot NFS root: "
-			read junk < /dev/tty1
+			
+			if test "$AUTOBOOT" != "yes"
+			then
+				read junk < /dev/tty1
+			else
+				if test -e /etc/.altboot-bootNFS-source.last
+				then
+					junk="`cat /etc/.altboot-bootNFS-source.last`"
+					test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)"
+				else
+					read junk < /dev/tty1
+				fi
+			fi	
+				
 			
 			cnt=1
 			for nfs_mount in $nfs_mounts
@@ -99,6 +112,7 @@ run_module() {
 				if test "$junk" = "$cnt"
 				then
 					selection="$nfs_mount"
+					echo "$junk" > /etc/.altboot-bootNFS-source.last
 				fi
 				let cnt=$cnt+1
 			done			
@@ -115,10 +129,10 @@ run_module() {
 	mount -t nfs "$selection" /media/nfsroot && echo ok || die "mount -t nfs "$selection" /media/nfsroot failed!"
 	
 	# Use configured resolv.conf in the pivoted rootfs
-	echo -n "Copying resolv.conf..."
+	#echo -n "Copying resolv.conf..."
 	#cp /etc/resolv.conf /media/nfsroot/etc && echo ok || echo "FAILED"
 	
-	check_target "/media/nfsroot"
+	check_target "/media/nfsroot" bootNFS
 	
 }	
 
diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func
index c6af50a008..4389ff4ff8 100644
--- a/packages/altboot/files/altboot.func
+++ b/packages/altboot/files/altboot.func
@@ -1,6 +1,7 @@
 #! /bin/sh
 # 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
 check_target() {
 	# Check if there is a /sbin/init or /sbin/init.sysvinit on the card
 	if test -x $1/sbin/init -o -x $1/$REAL_INIT
@@ -31,11 +32,24 @@ check_target() {
 		while test -z "$ans"
 		do
 			echo -n "Your choice: "
-			read junk < /dev/tty1
+			
+			if test "$AUTOBOOT" != "yes"
+			then
+				read junk < /dev/tty1
+			else
+				if test -e /etc/.altboot-$2-real-or-loop.last
+				then
+					junk="`cat /etc/.altboot-$2-real-or-loop.last`"
+					test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)"
+				else
+					read junk < /dev/tty1
+				fi
+			fi	
 			
 			if test "$junk" = 1 -o "$junk" = 2
 			then
 				ans="$junk"
+				echo "$junk" > /etc/.altboot-$2-real-or-loop.last
 			fi
 		done
 		
@@ -62,7 +76,7 @@ check_target() {
 # This function pivot_root's into a real filesystem calling $newrootfs/sbin/init
 # $1 = The new rootfs
 pivot_realfs() {
-	test -z "$2" && RL="5" || RL="$2"
+	#test -z "$2" && RL="5" || RL="$2"
 	mkdir -p $1/media/ROM || die "mkdir -p $1/media/ROM failed"
 
 	mount -o remount,ro / >/dev/null 2>&1
@@ -73,7 +87,7 @@ pivot_realfs() {
 # This function loop-mounts an image-file and pivot_root's into it
 # $1: The new rootfs
 pivot_image() {
-	test -z "$2" && RL="5" || RL="$2"
+	#test -z "$2" && RL="5" || RL="$2"
 	cd $1/$IMAGE_PATH
 
 	# Check for rootfs images on the card
@@ -95,7 +109,18 @@ pivot_image() {
 		while test -z "$IMAGE_NAME"
 		do
 			echo -en "Please choose one of the above: "
-			read junk < /dev/tty1
+			if test "$AUTOBOOT" != "yes"
+			then
+				read junk < /dev/tty1
+			else
+				if test -e /etc/.altboot-loopimage.last
+				then
+					junk="`cat /etc/.altboot-loopimage.last`"
+					test -z "$junk" && read junk < /dev/tty1 || echo "$junk (autoboot)"
+				else
+					read junk < /dev/tty1
+				fi
+			fi	
 
 			x=0
 			for file in `ls *rootfs.bin`
@@ -103,7 +128,8 @@ pivot_image() {
 				let x=$x+1
 				if test "$x" = "$junk"
 				then
-					IMAGE_NAME="$file"						
+					IMAGE_NAME="$file"
+					echo "$junk" > /etc/.altboot-loopimage.last						
 				fi
 			done	
 		done
diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index 850912f20c..665b3fa4b5 100644
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -183,6 +183,13 @@ run_timer() {
 			echo -n "." >/dev/tty1
 			let cnt=$cnt+1
 		done
+		
+		if test "$launch_altboot" != "yes"
+		then
+			AUTOBOOT=yes
+		else
+			rm -f /etc/.altboot*.last
+		fi
 	else
 		launch_altboot=yes
 	fi
diff --git a/packages/altboot/files/tosa/.mtn2git_empty b/packages/altboot/files/tosa/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/altboot/files/tosa/.mtn2git_empty
diff --git a/packages/altboot/files/tosa/altboot-2.4.cfg b/packages/altboot/files/tosa/altboot-2.4.cfg
new file mode 100644
index 0000000000..edbaff8b87
--- /dev/null
+++ b/packages/altboot/files/tosa/altboot-2.4.cfg
@@ -0,0 +1,27 @@
+# Handled by /sbin/init.altboot
+# Allow booting images from SD or CF instead of booting
+# the ROM. 
+ENABLE_ALTBOOT="yes"
+TIMEOUT="4"
+REAL_INIT="/sbin/init.sysvinit"
+SH_SHELL="/bin/sh"
+
+IMAGE_PATH="boot-images"
+IMAGE_TYPE="ext2"
+FSCK_IMAGES="no"
+
+SD_DEVICE="/dev/mmcda1"
+SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o"
+
+USB_HOST_AVAILABLE="yes"
+USB_STORAGE_MODULES="usb_ohci_tc6393 usb-storage"
+USB_STORAGE_PARTITION="/dev/sda1"
+USB_STORAGE_WAIT="4"
+
+INIT_RUNLEVEL="5"
+NO_GUI_RL="2"
+MASTER_PASSWORD=""
+ASK_PW_ON_BOOT="no"
+
+SD_MOUNTPOINT="/media/card"
+CF_MOUNTPOINT="/media/cf"
diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb
index 5ba84e69ca..f1b479d47a 100644
--- a/packages/keymap-locales/keymap-locales.bb
+++ b/packages/keymap-locales/keymap-locales.bb
@@ -4,13 +4,17 @@ PRIORITY = "optional"
 MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
 LICENSE = "GPL"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "file://*.map"
 
 # If any python guru wants to setup PACKAGES_$machine with some code instead,
 # be my guet =)
 PACKAGES_akita = "keymap-extension-de"
+PACKAGES_spitz = "keymap-extension-de"
+PACKAGES_borzoi = "keymap-extension-de"
+PACKAGES_c7x0 = "keymap-extension-de"
+PACKAGES_collie = "keymap-extension-de"
 
 FILES_keymap-extension-de = "/etc/*-de.map"
 FILES_keymap-extension-fr = "/etc/*-fr.map"
diff --git a/packages/libxml/libxml2_2.6.10.bb b/packages/libxml/libxml2_2.6.10.bb
index 745ddacd18..9f789a499e 100644
--- a/packages/libxml/libxml2_2.6.10.bb
+++ b/packages/libxml/libxml2_2.6.10.bb
@@ -9,7 +9,7 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
 FILES_${PN}-dev += "${bindir}/xml-config"
 FILES_${PN}-utils += "${bindir}"
 
-SRC_URI = "http://xmlsoft.org/sources/old/libxml2-${PV}.tar.gz"
+SRC_URI = "http://xmlsoft.org/sources/libxml2/old/libxml2-${PV}.tar.gz"
 
 inherit autotools pkgconfig 
 
diff --git a/packages/libxml/libxml2_2.6.22.bb b/packages/libxml/libxml2_2.6.22.bb
index eb5f087df7..fae00a6063 100644
--- a/packages/libxml/libxml2_2.6.22.bb
+++ b/packages/libxml/libxml2_2.6.22.bb
@@ -8,9 +8,8 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
 FILES_${PN}-dev += "${bindir}/xml-config"
 FILES_${PN}-utils += "${bindir}"
 
-SRC_URI = "http://xmlsoft.org/sources/libxml2-${PV}.tar.gz \
+SRC_URI = "http://xmlsoft.org/sources/libxml2/libxml2-${PV}.tar.gz \
 		   file://no-testapi.patch;patch=1"
-
 inherit autotools pkgconfig 
 
 EXTRA_OECONF = "--without-python --without-debug --without-legacy --without-catalog --without-docbook --without-c14n"
diff --git a/packages/libxml/libxml2_2.6.7.bb b/packages/libxml/libxml2_2.6.7.bb
index fc04b5e9d3..b204351b7b 100644
--- a/packages/libxml/libxml2_2.6.7.bb
+++ b/packages/libxml/libxml2_2.6.7.bb
@@ -9,7 +9,7 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
 FILES_${PN}-dev += "${bindir}/xml-config"
 FILES_${PN}-utils += "${bindir}"
 
-SRC_URI = "http://xmlsoft.org/sources/old/libxml2-${PV}.tar.gz"
+SRC_URI = "http://xmlsoft.org/sources/libxml2/old/libxml2-${PV}.tar.gz"
 
 inherit autotools pkgconfig 
 
diff --git a/packages/libxml/libxml2_2.6.9.bb b/packages/libxml/libxml2_2.6.9.bb
index 745ddacd18..9f789a499e 100644
--- a/packages/libxml/libxml2_2.6.9.bb
+++ b/packages/libxml/libxml2_2.6.9.bb
@@ -9,7 +9,7 @@ PACKAGES = "${PN}-dev ${PN}-utils ${PN} ${PN}-doc ${PN}-locale"
 FILES_${PN}-dev += "${bindir}/xml-config"
 FILES_${PN}-utils += "${bindir}"
 
-SRC_URI = "http://xmlsoft.org/sources/old/libxml2-${PV}.tar.gz"
+SRC_URI = "http://xmlsoft.org/sources/libxml2/old/libxml2-${PV}.tar.gz"
 
 inherit autotools pkgconfig 
 
diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb
index cbb74fc823..e23bfd1d8f 100644
--- a/packages/meta/slugos-native.bb
+++ b/packages/meta/slugos-native.bb
@@ -5,7 +5,7 @@
 #
 DESCRIPTION = "Packages that are required for the SlugOS native build environment"
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
 INHIBIT_DEFAULT_DEPS = "1"
 EXCLUDE_FROM_WORLD = "1"
@@ -16,8 +16,7 @@ PROVIDES += "${SLUGOS_IMAGENAME}-native"
 # Run-time only (RDEPENDS) stuff - no package explicitly provides
 # these targets.
 SLUGOS_NATIVE_RT_prepend_linux = "\
-	glibc-extra-nss glibc-utils \
-	libc6 libc6-dev \
+	glibc-extra-nss glibc-utils glibc \
 	"
 SLUGOS_NATIVE_RT_prepend_linux-uclibc = "\
 	uclibc-dev uclibc-utils \
diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup
index f7fe0e7960..b365a49dda 100644
--- a/packages/slugos-init/files/turnup
+++ b/packages/slugos-init/files/turnup
@@ -403,6 +403,12 @@ boot_rootfs() {
 			return 1
 		};;
 	*)	{	echo '#!/bin/sh'
+			echo 'modprobe ehci-hcd'
+			echo 'modprobe ohci-hcd'
+			echo 'modprobe sd_mod'
+			echo 'modprobe usb-storage'
+			echo 'modprobe ext3'
+			echo 'sleep 5'
 			echo 'leds beep'
 			test "$sleep" -gt 0 && echo -n "sleep='$sleep' "
 			test -n "$uuid" && echo -n "UUID='$uuid' "
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index 3f1ab456ac..971f6cf288 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 = "r57"
+PR = "r58"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \
diff --git a/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch b/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch
index f4ef7c5aee..e2d56874c9 100644
--- a/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch
+++ b/packages/zaurusd/files/mbinputmgr-honor-user-prefs.patch
@@ -25,8 +25,8 @@
 +
 +  if ! test -e "/tmp/gpe-panel.session-$panel_user"
 +  then
-+    cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user"
-+    cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr
++    test -e /home/$panel_user/.matchbox/mbdock.session && cp /home/$panel_user/.matchbox/mbdock.session "/tmp/gpe-panel.session-$panel_user"
++    test -e "/tmp/gpe-panel.session-$panel_user" && cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr
 +  else
 +    cat "/tmp/gpe-panel.session-$panel_user" | grep -q panel || killproc @bindir@/mbinputmgr
 +    rm "/tmp/gpe-panel.session-$panel_user"
diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb
index 4f20dc23c5..52a7b353d3 100644
--- a/packages/zaurusd/zaurusd_svn.bb
+++ b/packages/zaurusd/zaurusd_svn.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 MAINTAINER = "Richard Purdie <rpurdie@openedhand.com>"
 DESCRIPTION = "Daemon to handle device specifc features."
 PV = "0.0+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
 DEPENDS = "tslib"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \