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

into mnz66.mn-solutions.de:/usr/src/oe/p

2005/02/17 09:47:19+01:00 mn-solutions.de!schurig
changed Opie start script for MNCI "Ramses"

2005/02/17 09:45:22+01:00 mn-solutions.de!schurig
Adaptions of libqte2 towards MNCI "Ramses"

BKrev: 42145a2f4tW6O19CSnVGjOJLx3Akpg

diff --git a/packages/opie-taskbar/opie-taskbar/opie b/packages/opie-taskbar/opie-taskbar/opie
index 81f7a60..3a38718 100644 (file)
--- a/packages/opie-taskbar/opie-taskbar/opie
+++ b/packages/opie-taskbar/opie-taskbar/opie
@@ -62,9 +62,9 @@ case $1 in
 
 'stop')
     echo "Stopping Opie..."
-    killall qpe
-    killall opie-login
-    killall quicklauncher
+    killall qpe 2>/dev/null
+    killall opie-login 2>/dev/null
+    killall quicklauncher 2>/dev/null
 
     ;;
 

diff --git a/packages/opie-taskbar/opie-taskbar/ramses/opie b/packages/opie-taskbar/opie-taskbar/ramses/opie
index e69de29..f5887c4 100644 (file)
--- a/packages/opie-taskbar/opie-taskbar/ramses/opie
+++ b/packages/opie-taskbar/opie-taskbar/ramses/opie
@@ -0,0 +1,80 @@
+#!/bin/sh
+#
+[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
+[ -z $HOME ] && export HOME=/home/$LOGNAME
+
+export QTDIR=/opt/QtPalmtop
+export OPIEDIR=/opt/QtPalmtop
+export QPEDIR=/opt/QtPalmtop
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
+export PATH=$PATH:$OPIEDIR/bin
+# export QWS_KEYBOARD=KernelTTY
+
+if [ ! -x "$OPIEDIR/bin/qpe" ] ; then 
+    echo Opie not installed
+    exit 0 
+fi
+
+. /etc/profile
+
+if [ ! -e "$HOME/Settings/qpe.conf" ] ; then
+    echo "Copying default qpe.conf into $HOME/Settings/"
+    mkdir -p $HOME/Settings/
+    cat $OPIEDIR/etc/skel/qpe.conf >$HOME/Settings/qpe.conf
+fi
+
+if [ ! -e "$HOME/Settings/locale.conf" -a -e "$OPIEDIR/etc/skel/locale.conf" ] ; then
+    cat $OPIEDIR/etc/skel/locale.conf >$HOME/Settings/locale.conf
+fi
+
+if [ ! -e "$HOME/systeminfo/linkver" ] ; then
+    mkdir -p $HOME/systeminfo/
+    echo "1.13" >$HOME/systeminfo/linkver
+fi
+
+if [ ! -e "/opt/Qtopia" ] ; then
+    ln -sf /opt/QtPalmtop /opt/Qtopia
+fi
+
+case $1 in
+'start')
+    if [ -x "$OPIEDIR/bin/opie-login" ]; then
+            echo Starting Opie-login....
+            $OPIEDIR/bin/opie-login -terminal 2
+    else
+        $OPIEDIR/bin/opie-reorgfiles
+        if [ -x /usr/bin/ssh-agent ]; then
+             SSHAGENT=/usr/bin/ssh-agent
+        else
+             SSHAGENT=""
+        fi
+        
+        if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then
+            export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
+        fi           
+        echo Starting Opie....
+        $SSHAGENT $OPIEDIR/bin/qpe -terminal 2
+    fi
+
+    ;;
+
+'stop')
+    echo "Stopping Opie..."
+    killall qpe 2>/dev/null
+    killall opie-login 2>/dev/null
+    killall quicklauncher 2>/dev/null
+
+    ;;
+
+'restart')
+       $0 stop && $0 start
+
+       ;;
+
+*)
+    echo "usage: $0 { start | stop | restart }"
+
+    ;;
+
+esac
+

diff --git a/packages/qte/qte-2.3.10/ramses-keyboard.patch b/packages/qte/qte-2.3.10/ramses-keyboard.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/qte/qte-2.3.10/ramses-touchscreen.patch b/packages/qte/qte-2.3.10/ramses-touchscreen.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/qte/qte-2.3.10/ramses.patch b/packages/qte/qte-2.3.10/ramses.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/qte/qte_2.3.10.bb b/packages/qte/qte_2.3.10.bb
index f18bdda..f898cca 100644 (file)
--- a/packages/qte/qte_2.3.10.bb
+++ b/packages/qte/qte_2.3.10.bb
@@ -4,6 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL QPL"
 DEPENDS = "zlib libpng jpeg tslib uicmoc-native"
+DEPENDS_ramses = "zlib libpng jpeg uicmoc-native"
 PROVIDES = "virtual/qte virtual/libqte2"
 PR = "r3"
 
@@ -30,7 +31,10 @@ SRC_URI_append_tosa          = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-
 SRC_URI_append_beagle          = "file://beagle.patch;patch=1 "
 SRC_URI_append_jornada720       = "file://kernel-keymap.patch;patch=1 "
 SRC_URI_append_jornada56x       = "file://kernel-keymap.patch;patch=1 "
-SRC_URI_append_ramses           = "file://kernel-keymap.patch;patch=1 file://ramses.patch;patch=1 "
+SRC_URI_append_ramses           = "file://devfs.patch;patch=1 \
+                                   file://ramses.patch;patch=1 \
+                                   file://ramses-keyboard.patch;patch=1 \
+                                   file://ramses-touchscreen.patch;patch=1 "
 
 S = "${WORKDIR}/qt-${PV}"
 
@@ -69,7 +73,7 @@ EXTRA_DEFINES_jornada720      = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_simpad           = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ   -DQT_QWS_SIMPAD -DQT_QWS_DEVFS"
 EXTRA_DEFINES_c7x0             = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SLC700 -DQT_QWS_SL5XXX"
 EXTRA_DEFINES_beagle           = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ   -DQT_QWS_BEAGLE"
-EXTRA_DEFINES_ramses           = "-DQT_QWS_TSLIB                 -DQT_QWS_RAMSES"
+EXTRA_DEFINES_ramses           = "                               -DQT_QWS_RAMSES                 -DQT_QWS_DEVFS"
 
 export SYSCONF_CC = "${CC}"
 export SYSCONF_CXX = "${CXX}"
@@ -79,6 +83,7 @@ export SYSCONF_CFLAGS = "${CFLAGS}"
 export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -DNO_DEBUG ${EXTRA_DEFINES}"
 #export SYSCONF_CXXFLAGS = "${CXXFLAGS} -pipe -DQWS -fno-exceptions -fno-rtti -fvisibility=hidden -DGCC_SUPPORTS_VISIBILITY -DNO_DEBUG ${EXTRA_DEFINES}"
 export SYSCONF_LFLAGS = "${LDFLAGS} -lts"
+export SYSCONF_LFLAGS_ramses = "${LDFLAGS}"
 export SYSCONF_MOC = "${STAGING_BINDIR}/moc"
 export SYSCONF_UIC = "${STAGING_BINDIR}/uic"