Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into tim.rpsys.net:/usr/oe/openembedded

2005/01/22 23:37:51+00:00 rpsys.net!RP
Create /dev/input and add qte defines for openzaurus-pxa-2.6

BKrev: 41f2e3e2FB7EYAtJokAIIEzfVH9D9A

diff --git a/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/devices b/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/devices
index e69de29..e483dea 100644 (file)
--- a/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/devices
+++ b/packages/initscripts/initscripts-1.0/openzaurus-pxa-2.6/devices
@@ -0,0 +1,62 @@
+#!/bin/sh
+#
+# 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
+
+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/sound/dsp /dev/dsp
+       ln -s /dev/sound/mixer /dev/mixer
+
+       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/msys
+       mkdir -p dev/pts
+       mkdir -p dev/input
+       ln -sf /dev/sharp_ts /dev/ts
+        ln -sf /dev/sharp_fl /dev/fl
+       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
+
+## enable (working) suspend/resume via power button on c7x0
+echo 1 >/proc/power_key_off
+
+exit 0

diff --git a/packages/qte/qte_2.3.7.bb b/packages/qte/qte_2.3.7.bb
index 38439b8..8148a83 100644 (file)
--- a/packages/qte/qte_2.3.7.bb
+++ b/packages/qte/qte_2.3.7.bb
@@ -27,6 +27,7 @@ SRC_URI_append_shepherd               = "file://kernel-keymap.patch;patch=1 "
 SRC_URI_append_husky           = "file://kernel-keymap.patch;patch=1 "
 SRC_URI_append_tosa            = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 "
 SRC_URI_append_beagle          = "file://beagle.patch;patch=1 "
+SRC_URI_append_openzaurus-pxa-2.6      = "file://kernel-keymap.patch;patch=1 "
 
 S = "${WORKDIR}/qt-${PV}"
 
@@ -70,6 +71,7 @@ EXTRA_DEFINES_corgi           = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS
 EXTRA_DEFINES_shepherd         = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
 EXTRA_DEFINES_husky            = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
 EXTRA_DEFINES_beagle           = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ   -DQT_QWS_BEAGLE"
+EXTRA_DEFINES_openzaurus-pxa-2.6       = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
 
 export SYSCONF_CC = "${CC}"
 export SYSCONF_CXX = "${CXX}"