merge of '355262927125dc01051bf0f6b36fc492b766c9d7'

     and '60557e20a6b9593541f74b8231f50e85bf385819'

3 files changed, 60 insertions, 24 deletions

diff --git a/packages/initscripts/initscripts-1.0/jornada7xx/devices b/packages/initscripts/initscripts-1.0/jornada7xx/devices
index 0e59229225..fc96ff62ee 100755
--- a/packages/initscripts/initscripts-1.0/jornada7xx/devices
+++ b/packages/initscripts/initscripts-1.0/jornada7xx/devices
@@ -3,35 +3,68 @@
 # Devfs handling script.  Since we arent running devfsd due to various reasons
 # which I will not lay out here, we need to create some links for compatibility.
 
+. /etc/default/rcS
+
 # exit without doing anything if udev is active
 if test -e /dev/.udevdb; then
-    exit 0
+	exit 0
 fi
 
-    test -n "$VERBOSE" && echo -n "Setting up device links for devfs: "
-    (
-    ln -s /dev/vc/0 /dev/tty0
-    ln -s /dev/vc/1 /dev/tty1
-    ln -s /dev/vc/2 /dev/tty2
-    ln -s /dev/vc/3 /dev/tty3
-    ln -s /dev/vc/4 /dev/tty4
-    ln -s /dev/vc/5 /dev/tty5
-    ln -s /dev/fb/0 /dev/fb0
-    # ln -s /dev/tts/0 /dev/ttySA0
-    # ln -s /dev/tts/1 /dev/ttySA1
-    # ln -s /dev/tts/2 /dev/ttySA2
-
-    ln -s /dev/sound/dsp /dev/dsp
-    ln -s /dev/sound/mixer /dev/mixer
+if test -e /dev/.devfsd
+then
+	if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi
+	ln -s /dev/touchscreen/0 /dev/ts
+	ln -s /dev/touchscreen/0raw /dev/tsraw
+	ln -s /dev/vc/0 /dev/tty0
+	ln -s /dev/vc/1 /dev/tty1
+	ln -s /dev/vc/2 /dev/tty2
+	ln -s /dev/vc/3 /dev/tty3
+	ln -s /dev/vc/4 /dev/tty4
+	ln -s /dev/vc/5 /dev/tty5
+	ln -s /dev/fb/0 /dev/fb0
+#	ln -s /dev/tts/0 /dev/ttySA0
+#	ln -s /dev/tts/1 /dev/ttySA1
+#	ln -s /dev/tts/2 /dev/ttySA2
 
-    ln -s /dev/v4l/video0 /dev/video0
-    ln -s /dev/v4l/video0 /dev/video
-    ln -s /dev/misc/rtc /dev/rtc
-    ln -s /dev/misc/apm_bios /dev/apm_bios
+	ln -s /dev/sound/dsp /dev/dsp
+	ln -s /dev/sound/mixer /dev/mixer
 
-    ## need this so that ppp will autoload the ppp modules
-    mknod /dev/ppp c 108 0
-    )  > /dev/null 2>&1
+	ln -s /dev/v4l/video0 /dev/video0
+	ln -s /dev/v4l/video0 /dev/video
+	ln -s /dev/misc/rtc /dev/rtc
 
+	## need this so that ppp will autoload the ppp modules
+	mknod /dev/ppp c 108 0
+        
+	if test "$VERBOSE" != "no"; then echo "done"; fi
+else
+	if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi
+	mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev
+	if test $? -ne 0; then
+		if test "$VERBOSE" != "no"; then echo "failed"; fi
+	else
+		if test "$VERBOSE" != "no"; then echo "done"; fi
+	fi
+	if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi
+	cd /
+	mkdir -p dev/input
+        mknod /dev/input/ts0 c 13 128
+	mknod /dev/ttySC1 c 9 204
+	mknod /dev/irda0  c 10 204
+	mkdir -p dev/msys
+	mkdir -p dev/pts
+	mkdir -p dev/vc
+	for i in 0 1 2 3 4 5 6 7 8 9; do
+		ln -s /dev/tty$i /dev/vc/$i
+	done
+	ln -sf /proc/self/fd /dev/fd
+	ln -sf /proc/kcore /dev/core
+	/sbin/makedevs -r / -D /etc/device_table
+	if test $? -ne 0; then
+		if test "$VERBOSE" != "no"; then echo "failed"; fi
+	else
+		if test "$VERBOSE" != "no"; then echo "done"; fi
+	fi
+fi
 
-    test -n "$VERBOSE" && echo "done"
+exit 0
diff --git a/packages/python/python-pyrex-native_0.9.3.bb b/packages/python/python-pyrex-native_0.9.3.bb
index 3a0d977dbb..f06f6388a6 100644
--- a/packages/python/python-pyrex-native_0.9.3.bb
+++ b/packages/python/python-pyrex-native_0.9.3.bb
@@ -1,6 +1,7 @@
 include python-pyrex_${PV}.bb
 inherit native
 DEPENDS = "python-native"
+RDEPENDS = ""
 
 do_stage() {
 	BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
diff --git a/packages/python/python-scons-native_0.96.90.bb b/packages/python/python-scons-native_0.96.90.bb
index bc6fc7992d..c106440ed7 100644
--- a/packages/python/python-scons-native_0.96.90.bb
+++ b/packages/python/python-scons-native_0.96.90.bb
@@ -1,5 +1,7 @@
 include python-scons_${PV}.bb
 inherit native
+DEPENDS = "python-native"
+RDEPENDS = ""
 
 do_stage() {
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \